svn commit: r410722 - in head: math/py-pandas textproc/py-openpyxl1

[Antoine Brodin]

Author: antoine
Date: Wed Mar  9 19:34:03 2016
New Revision: 410722
URL: https://svnweb.freebsd.org/changeset/ports/410722

Log:
  - Remove OPENPYXL1 option from py-pandas
  - Set an EXPIRATION_DATE for py-openpyxl1 (deprecated since May 2014)

Modified:
  head/math/py-pandas/Makefile
  head/textproc/py-openpyxl1/Makefile

Modified: head/math/py-pandas/Makefile
==============================================================================
--- head/math/py-pandas/Makefile	Wed Mar  9 19:10:34 2016	(r410721)
+++ head/math/py-pandas/Makefile	Wed Mar  9 19:34:03 2016	(r410722)
@@ -35,14 +35,12 @@ TEST_DEPENDS:=	${RUN_DEPENDS} \
 # Note: we cannot include math/py-statsmodels in TEST_DEPENDS because it
 # depends upon us for BUILD and RUN.
 
-OPTIONS_DEFINE=		MPL SCIPY
+OPTIONS_DEFINE=		MPL OPENPYXL SCIPY
 OPTIONS_GROUP=		ACCEL STORAGE HTML EXCEL
 OPTIONS_GROUP_ACCEL=	BTLNCK NUMEXPR
 OPTIONS_GROUP_STORAGE=	BOTO TABLES SQL
 OPTIONS_GROUP_HTML=	LXML HTML5LIB
 OPTIONS_GROUP_EXCEL=	XLRD XLWT
-OPTIONS_RADIO=		OPYXL
-OPTIONS_RADIO_OPYXL=	OPENPYXL1 OPENPYXL2
 OPTIONS_DEFAULT=	BTLNCK NUMEXPR
 
 MPL_DESC=	Support graphical plotting output via math/py-matplotlib
@@ -54,15 +52,13 @@ TABLES_DESC=	Support HDF5-based storage 
 SQL_DESC=	Support SQL databases via databases/py-sqlalchemy
 LXML_DESC=	Parse HTML with devel/py-lxml and www/py-beautifulsoup
 HTML5LIB_DESC=	Parse HTML with www/py-html5lib and www/py-beautifulsoup
-OPENPYXL1_DESC=	Read/write MS Excel 2007+ with textproc/py-openpyxl1
-OPENPYXL2_DESC=	Read/write MS Excel 2007+ with textproc/py-openpyxl (EXPERIMENTAL)
+OPENPYXL_DESC=	Read/write MS Excel 2007+ with textproc/py-openpyxl
 XLRD_DESC=	Read MS Excel with textproc/py-xlrd
 XLWT_DESC=	Write MS Excel with textproc/py-xlwt
 ACCEL_DESC=	Computation Acceleration Add-ons
 STORAGE_DESC=	Data Storage Add-ons
 HTML_DESC=	HTML Parsing Add-ons
 EXCEL_DESC=	MS Excel I/O Add-ons
-OPYXL_DESC=	MS Excel I/O Add-ons (openpyxl alternatives)
 
 MPL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
 SCIPY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>0:${PORTSDIR}/science/py-scipy
@@ -74,8 +70,7 @@ SQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}
 
 LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml
 HTML5LIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}html5lib>0:${PORTSDIR}/www/py-html5lib
-OPENPYXL1_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openpyxl1<2.0.0:${PORTSDIR}/textproc/py-openpyxl1
-OPENPYXL2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openpyxl>=2.0.0:${PORTSDIR}/textproc/py-openpyxl
+OPENPYXL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openpyxl>=2.0.0:${PORTSDIR}/textproc/py-openpyxl
 XLRD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlrd>0:${PORTSDIR}/textproc/py-xlrd
 XLWT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xlwt>0:${PORTSDIR}/textproc/py-xlwt
 

Modified: head/textproc/py-openpyxl1/Makefile
==============================================================================
--- head/textproc/py-openpyxl1/Makefile	Wed Mar  9 19:10:34 2016	(r410721)
+++ head/textproc/py-openpyxl1/Makefile	Wed Mar  9 19:34:03 2016	(r410722)
@@ -14,6 +14,7 @@ COMMENT=	Python library to read/write Ex
 LICENSE=	MIT
 
 DEPRECATED=	Use textproc/py-openpyxl instead
+EXPIRATION_DATE=	2016-04-10
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}openpyxl-[0-9]*
 
 USES=		python