- Remove support for deprecated python bits from the ports

  framework. The following knobs are not supported anymore:

    USE_PYTHON=<yes|version+-|-version|version-version>
    USE_PYTHON_BUILD
    USE_PYTHON_RUN
    USE_PYDISTUTILS
    PYDISTUTILS_AUTOPLIST
    PYTHON_PY3K_PLIST_HACK
    PYDISTUTILS_NOEGGINFO
    PYTHON_CONCURRENT_INSTALL
    USE_PYTHON_PREFIX

PR: 196477
Differential Revision: https://reviews.freebsd.org/D1416
Exp-run: antoine
Reviewed by: antoine
Approved by: portmgr (antoine)
With hat: python

3 files changed, 9 insertions, 105 deletions

diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 378b7101f261..79b1f939c999 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -198,17 +198,6 @@
 # Deprecated variables, which exist for compatibility and will be removed
 # soon:
 #
-# USE_PYDISTUTILS	- Deprecated, use USE_PYTHON=distutils instead
-#
-# PYDISTUTILS_AUTOPLIST
-#			- Deprecated, use USE_PYTHON=autoplist instead
-#
-# PYTHON_PY3K_PLIST_HACK
-#			- Deprecated, use USE_PYTHON=py3kplist instead
-#
-# PYDISTUTILS_NOEGGINFO
-#			- Deprecated, use USE_PYTHON=noegginfo instead
-#
 # PYTHON_DEFAULT_VERSION
 # PYTHON2_DEFAULT_VERSION
 # PYTHON3_DEFAULT_VERSION
@@ -219,11 +208,6 @@
 #			- Deprecated, use PYTHON_PKGNAMEPREFIX instead
 #			  default: -py${PYTHON_SUFFIX}
 #
-# PYTHON_CONCURRENT_INSTALL
-#			- Deprecated, use USE_PYTHON=concurrent instead
-#
-# USE_PYTHON_PREFIX	- Deprecated, use USE_PYTHON=pythonprefix instead
-#
 # PYDISTUTILS_INSTALLNOSINGLE
 #			- Deprecated without replacement
 #
@@ -238,74 +222,6 @@ _PYTHON_PORTBRANCH=		2.7		# ${_PYTHON_VERSIONS:[1]}
 _PYTHON_BASECMD=		${LOCALBASE}/bin/python
 _PYTHON_RELPORTDIR=		${PORTSDIR}/lang/python
 
-# COMPAT KNOBS, remove them, once the tree is cleaned
-.undef _PY_COMPAT_OLD
-# We will reuse USE_PYTHON with a different meaning, so make sure that, while
-# we are in the transition phase from USE_PYTHON -> USES=python, it is mapped
-# and reassigned correctly
-.if defined(USE_PYTHON_BUILD) || defined(USE_PYTHON_RUN)
-# old style
-_PY_COMPAT_OLD= yes
-.elif defined(USE_PYTHON)
-.if ${USE_PYTHON} == "yes"
-# old style
-_PY_COMPAT_OLD= yes
-.elif ${USE_PYTHON:C/[-0-9.+]*//} == ""
-# old style X.Y, X.Y+, X.Y-, -X.Y, X.Y-Z.A
-_PY_COMPAT_OLD=	yes
-.endif # ${USE_PYTHON} == "yes" ...
-.endif # defined(USE_PYTHON_BUILD) || defined(USE_PYTHON_RUN)
-
-.if defined(_PY_COMPAT_OLD)
-.if defined(USE_PYTHON)
-.if ${USE_PYTHON} != "yes"
-python_ARGS:=	${USE_PYTHON}
-.endif
-.else
-.if defined(USE_PYTHON_BUILD)
-.if ${USE_PYTHON_BUILD} != "yes"
-python_ARGS=	${USE_PYTHON_BUILD},build
-.else
-python_ARGS=	build
-.endif
-.endif # defined(USE_PYTHON_BUILD)
-.if defined(USE_PYTHON_RUN)
-.if ${USE_PYTHON_RUN} != "yes"
-python_ARGS+=	${USE_PYTHON_RUN},run
-.else
-python_ARGS+=	run
-.endif
-.endif # defined(USE_PYTHON_RUN)
-.endif # defined(USE_PYTHON)
-# Everything passed to python_ARGS, undef USE_PYTHON, since we will reuse
-# it with a different meaning below
-.undef USE_PYTHON
-.endif # defined(_PY_COMPAT_OLD)
-.undef _PY_COMPAT_OLD
-
-.if !defined(USE_PYTHON)
-USE_PYTHON=
-.if defined(USE_PYDISTUTILS)
-USE_PYTHON+=	distutils
-.endif
-.if defined(PYDISTUTILS_AUTOPLIST)
-USE_PYTHON+=	autoplist
-.endif
-.if defined(PYTHON_PY3K_PLIST_HACK)
-USE_PYTHON+=	py3kplist
-.endif
-.if defined(PYTHON_CONCURRENT_INSTALL)
-USE_PYTHON+=	concurrent
-.endif
-.if defined(USE_PYTHON_PREFIX)
-USE_PYTHON+=	pythonprefix
-.endif
-.if defined(PYDISTUTILS_NOEGGINFO)
-USE_PYTHON+=	noegginfo
-.endif
-.endif # !defined(USE_PYTHON)
-# COMPAT KNOBS END
-
 # Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>
 .for var in ${USE_PYTHON}
 _PYTHON_FEATURE_${var:tu}=	yes
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 732717006e46..44e4b537ad49 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1416,10 +1416,6 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 .include "${PORTSDIR}/Mk/bsd.php.mk"
 .endif
 
-.if defined(USE_PYTHON) || defined(USE_PYTHON_BUILD) || defined(USE_PYTHON_RUN)
-USES+=	python
-.endif
-
 .if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL)
 .include "${PORTSDIR}/Mk/bsd.fpc.mk"
 .endif
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index 17a80a2599dc..cbf23fe9ab6b 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -101,10 +101,6 @@ DEV_WARNING+=	"MAN${a} macros are deprecated when using stage directory"
 DEV_WARNING+=	"MLINKS macros are deprecated when using stage directory"
 .endif
 
-.if defined(PYDISTUTILS_AUTOPLIST) && defined(PYTHON_PY3K_PLIST_HACK)
-DEV_WARNING+=	"PYDISTUTILS_AUTOPLIST features Python 3.x support, PYTHON_PY3K_PLIST_HACK is not required"
-.endif
-
 .if defined(_PREMKINCLUDED)
 DEV_ERROR+=	"you cannot include bsd.port[.pre].mk twice"
 .endif
@@ -123,30 +119,26 @@ DEV_WARNING+=	"LICENSE must not contain BSD, instead use BSD[234]CLAUSE"
 DEV_ERROR+=	"USE_PYDISTUTILS=easy_install is no longer supported, please use USE_PYDISTUTILS=yes"
 .endif
 
-.if defined(USE_PYDISTUTILS) && defined(PYDISTUTILS_AUTOPLIST) && defined(PYDISTUTILS_PKGNAME)
-DEV_WARNING+=	"PYDISTUTILS_PKGNAME has no effect for USE_PYDISTUTILS=yes and PYDISTUTILS_AUTOPLIST=yes"
-.endif
-
 .if defined(USE_PYTHON) && (${USE_PYTHON} == "yes" || ${USE_PYTHON:C/[-0-9.+]*//} == "")
 _PYTHON_VAL := ${USE_PYTHON}
 .if ${_PYTHON_VAL} != "yes"
-DEV_WARNING+=	"USE_PYTHON=${_PYTHON_VAL} is deprecated, please use USES=python:${_PYTHON_VAL}"
+DEV_ERROR+=	"USE_PYTHON=${_PYTHON_VAL} is no longer supported, please use USES=python:${_PYTHON_VAL}"
 .else
-DEV_WARNING+=	"USE_PYTHON=yes is deprecated, please use USES=python"
+DEV_ERROR+=	"USE_PYTHON=yes is no longer supported, please use USES=python"
 .endif
 .endif
 .if defined(USE_PYTHON_RUN)
 .if ${USE_PYTHON_RUN} != "yes"
-DEV_WARNING+=	"USE_PYTHON_RUN is deprecated, please use USES=python:${USE_PYTHON_RUN},run"
+DEV_ERROR+=	"USE_PYTHON_RUN is no longer supported, please use USES=python:${USE_PYTHON_RUN},run"
 .else
-DEV_WARNING+=	"USE_PYTHON_RUN is deprecated, please use USES=python:run"
+DEV_ERROR+=	"USE_PYTHON_RUN is no longer supported, please use USES=python:run"
 .endif
 .endif
 .if defined(USE_PYTHON_BUILD)
 .if ${USE_PYTHON_BUILD} != "yes"
-DEV_WARNING+=	"USE_PYTHON_BUILD is deprecated, please use USES=python:${USE_PYTHON_BUILD},build"
+DEV_ERROR+=	"USE_PYTHON_BUILD is no longer supported, please use USES=python:${USE_PYTHON_BUILD},build"
 .else
-DEV_WARNING+=	"USE_PYTHON_BUILD is deprecated, please use USES=python:build"
+DEV_ERROR+=	"USE_PYTHON_BUILD is no longer supported, please use USES=python:build"
 .endif
 .endif
 
@@ -162,10 +154,10 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \
 		USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \
 		USE_GETTEXT USE_GMAKE USE_SCONS USE_DRUPAL NO_INSTALL_MANPAGES \
-		INSTALLS_SHLIB
-SANITY_DEPRECATED=	USE_XZ USE_BZIP2 USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
+		INSTALLS_SHLIB USE_PYDISTUTILS PYTHON_CONCURRENT_INSTALL \
 		PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \
-		USE_PYTHON_PREFIX PYTHON_PKGNAMESUFFIX
+		USE_PYTHON_PREFIX
+SANITY_DEPRECATED=	USE_XZ USE_BZIP2 PYTHON_PKGNAMESUFFIX
 
 USE_OPENAL_ALT=		USES=openal
 USE_FAM_ALT=		USES=fam