public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass python-single-r1.eclass python-utils-r1.eclass
@ 2012-11-30 11:40 Michal Gorny (mgorny)
  0 siblings, 0 replies; 7+ messages in thread
From: Michal Gorny (mgorny) @ 2012-11-30 11:40 UTC (permalink / raw
  To: gentoo-commits

mgorny      12/11/30 11:40:15

  Modified:             ChangeLog python-r1.eclass python-single-r1.eclass
                        python-utils-r1.eclass
  Log:
  Make python-single-r1 stand-alone, and blocking python-r1.

Revision  Changes    Path
1.530                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.530&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.530&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.529&r2=1.530

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- ChangeLog	29 Nov 2012 17:56:39 -0000	1.529
+++ ChangeLog	30 Nov 2012 11:40:15 -0000	1.530
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.529 2012/11/29 17:56:39 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.530 2012/11/30 11:40:15 mgorny Exp $
+
+  30 Nov 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
+  python-single-r1.eclass, python-utils-r1.eclass:
+  Make python-single-r1 stand-alone, and blocking python-r1.
 
   29 Nov 2012; Julian Ospald <hasufell@gentoo.org> waf-utils.eclass:
   add verbosity to waf-utils.eclass wrt #444562



1.24                 eclass/python-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.23&r2=1.24

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-r1.eclass	26 Nov 2012 08:31:26 -0000	1.23
+++ python-r1.eclass	30 Nov 2012 11:40:15 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.23 2012/11/26 08:31:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.24 2012/11/30 11:40:15 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -42,18 +42,11 @@
 
 if [[ ! ${_PYTHON_R1} ]]; then
 
-inherit python-utils-r1
+if [[ ${_PYTHON_SINGLE_R1} ]]; then
+	die 'python-r1.eclass can not be used with python-single-r1.eclass.'
+fi
 
-# @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
-# @INTERNAL
-# @DESCRIPTION:
-# All supported Python implementations, most preferred last.
-_PYTHON_ALL_IMPLS=(
-	jython2_5
-	pypy1_8 pypy1_9
-	python3_1 python3_2 python3_3
-	python2_5 python2_6 python2_7
-)
+inherit python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT
 # @REQUIRED



1.5                  eclass/python-single-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.4&r2=1.5

Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-single-r1.eclass	26 Nov 2012 10:05:11 -0000	1.4
+++ python-single-r1.eclass	30 Nov 2012 11:40:15 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.4 2012/11/26 10:05:11 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.5 2012/11/30 11:40:15 mgorny Exp $
 
 # @ECLASS: python-single-r1
 # @MAINTAINER:
@@ -23,9 +23,10 @@
 # (using python-r1 eclass) can not depend on packages not supporting
 # them (using this eclass).
 #
-# Also, please note that python-single-r1 will always inherit python-r1
-# as well. Thus, all the variables defined there are relevant
-# to the packages using python-single-r1.
+# Please note that python-single-r1 will always inherit python-utils-r1
+# as well. Thus, all the functions defined there can be used
+# in the packages using python-single-r1, and there is no need ever
+# to inherit both.
 #
 # For more information, please see the python-r1 Developer's Guide:
 # http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml
@@ -44,7 +45,11 @@
 
 if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
 
-inherit python-r1
+if [[ ${_PYTHON_R1} ]]; then
+	die 'python-single-r1.eclass can not be used with python-r1.eclass.'
+fi
+
+inherit python-utils-r1
 
 fi
 
@@ -52,13 +57,89 @@
 
 if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
 
+# @ECLASS-VARIABLE: PYTHON_COMPAT
+# @REQUIRED
+# @DESCRIPTION:
+# This variable contains a list of Python implementations the package
+# supports. It must be set before the `inherit' call. It has to be
+# an array.
+#
+# Example:
+# @CODE
+# PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# @CODE
+if ! declare -p PYTHON_COMPAT &>/dev/null; then
+	die 'PYTHON_COMPAT not declared.'
+fi
+
+# @ECLASS-VARIABLE: PYTHON_REQ_USE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The list of USEflags required to be enabled on the chosen Python
+# implementations, formed as a USE-dependency string. It should be valid
+# for all implementations in PYTHON_COMPAT, so it may be necessary to
+# use USE defaults.
+#
+# Example:
+# @CODE
+# PYTHON_REQ_USE="gdbm,ncurses(-)?"
+# @CODE
+#
+# It will cause the Python dependencies to look like:
+# @CODE
+# python_single_target_pythonX_Y? ( dev-lang/python:X.Y[gdbm,ncurses(-)?] )
+# @CODE
+
+# @ECLASS-VARIABLE: PYTHON_DEPS
+# @DESCRIPTION:
+# This is an eclass-generated Python dependency string for all
+# implementations listed in PYTHON_COMPAT.
+#
+# The dependency string is conditional on PYTHON_SINGLE_TARGET.
+#
+# Example use:
+# @CODE
+# RDEPEND="${PYTHON_DEPS}
+#	dev-foo/mydep"
+# DEPEND="${RDEPEND}"
+# @CODE
+#
+# Example value:
+# @CODE
+# dev-python/python-exec
+# python_single_target_python2_6? ( dev-lang/python:2.6[gdbm] )
+# python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] )
+# @CODE
+
+# @ECLASS-VARIABLE: PYTHON_USEDEP
+# @DESCRIPTION:
+# This is an eclass-generated USE-dependency string which can be used to
+# depend on another Python package being built for the same Python
+# implementations.
+#
+# The generate USE-flag list is compatible with packages using python-r1,
+# python-single-r1 and python-distutils-ng eclasses. It must not be used
+# on packages using python.eclass.
+#
+# Example use:
+# @CODE
+# RDEPEND="dev-python/foo[${PYTHON_USEDEP}]"
+# @CODE
+#
+# Example value:
+# @CODE
+# python_targets_python2_7?,python_single_target_python2_7(+)?
+# @CODE
+
 _python_single_set_globals() {
+	local flags_mt=( "${PYTHON_COMPAT[@]/#/python_targets_}" )
 	local flags=( "${PYTHON_COMPAT[@]/#/python_single_target_}" )
-	local optflags=${flags[@]/%/(+)?}
+	local optflags=${flags_mt[@]/%/?}
+	optflags+=,${flags[@]/%/(+)?}
 
-	IUSE=${flags[*]}
-	REQUIRED_USE="^^ ( ${flags[*]} )"
-	PYTHON_USEDEP+=,${optflags// /,}
+	IUSE="${flags_mt[*]} ${flags[*]}"
+	REQUIRED_USE="|| ( ${flags_mt[*]} ) ^^ ( ${flags[*]} )"
+	PYTHON_USEDEP=${optflags// /,}
 
 	local usestr
 	[[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]"
@@ -88,6 +169,10 @@
 }
 _python_single_set_globals
 
+# @FUNCTION: python-single-r1_pkg_setup
+# @DESCRIPTION:
+# Determine what the selected Python implementation is and set EPYTHON
+# and PYTHON accordingly.
 python-single-r1_pkg_setup() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -102,19 +187,5 @@
 	done
 }
 
-# Incompatible python-r1 functions.
-
-python_copy_sources() {
-	die "${FUNCNAME} must not be used with python-single-r1 eclass."
-}
-
-python_foreach_impl() {
-	die "${FUNCNAME} must not be used with python-single-r1 eclass."
-}
-
-python_export_best() {
-	die "${FUNCNAME} must not be used with python-single-r1 eclass."
-}
-
 _PYTHON_SINGLE_R1=1
 fi



1.4                  eclass/python-utils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.3&r2=1.4

Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-utils-r1.eclass	26 Nov 2012 10:16:43 -0000	1.3
+++ python-utils-r1.eclass	30 Nov 2012 11:40:15 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.3 2012/11/26 10:16:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.4 2012/11/30 11:40:15 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -40,6 +40,17 @@
 
 inherit multilib
 
+# @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
+# @INTERNAL
+# @DESCRIPTION:
+# All supported Python implementations, most preferred last.
+_PYTHON_ALL_IMPLS=(
+	jython2_5
+	pypy1_8 pypy1_9
+	python3_1 python3_2 python3_3
+	python2_5 python2_6 python2_7
+)
+
 # @ECLASS-VARIABLE: PYTHON
 # @DESCRIPTION:
 # The absolute path to the current Python interpreter.





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass python-single-r1.eclass python-utils-r1.eclass
@ 2013-09-26 11:24 Michal Gorny (mgorny)
  0 siblings, 0 replies; 7+ messages in thread
From: Michal Gorny (mgorny) @ 2013-09-26 11:24 UTC (permalink / raw
  To: gentoo-commits

mgorny      13/09/26 11:24:30

  Modified:             ChangeLog python-r1.eclass python-single-r1.eclass
                        python-utils-r1.eclass
  Log:
  Fix EAPI=4 on python-exec:2 since that is what pkgcore will require (the only EAPI=4 consumer right now).

Revision  Changes    Path
1.988                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.988&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.988&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.987&r2=1.988

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -r1.987 -r1.988
--- ChangeLog	25 Sep 2013 15:18:28 -0000	1.987
+++ ChangeLog	26 Sep 2013 11:24:30 -0000	1.988
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.987 2013/09/25 15:18:28 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.988 2013/09/26 11:24:30 mgorny Exp $
+
+  26 Sep 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
+  python-single-r1.eclass, python-utils-r1.eclass:
+  Fix EAPI=4 on python-exec:2 since that is what pkgcore will require (the only
+  EAPI=4 consumer right now).
 
   25 Sep 2013; Christoph Junghans <ottxor@gentoo.org> texlive-module.eclass:
   Require EAPI>=2, add prefix support



1.62                 eclass/python-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.61&r2=1.62

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- python-r1.eclass	17 Sep 2013 13:33:55 -0000	1.61
+++ python-r1.eclass	26 Sep 2013 11:24:30 -0000	1.62
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.61 2013/09/17 13:33:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.62 2013/09/26 11:24:30 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -204,11 +204,11 @@
 	# 2) python-exec should be built with all targets forced anyway
 	# but if new targets were added, we may need to force a rebuild
 	# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
-	# just fix :0 for now since := deps are not supported.
+	# just fix :2 since := deps are not supported.
 	if [[ ${EAPI} != 4 ]]; then
 		PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]"
 	else
-		PYTHON_DEPS+="dev-python/python-exec:0[${PYTHON_USEDEP}]"
+		PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]"
 	fi
 }
 _python_set_globals



1.22                 eclass/python-single-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.21&r2=1.22

Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- python-single-r1.eclass	17 Sep 2013 13:33:55 -0000	1.21
+++ python-single-r1.eclass	26 Sep 2013 11:24:30 -0000	1.22
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.21 2013/09/17 13:33:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.22 2013/09/26 11:24:30 mgorny Exp $
 
 # @ECLASS: python-single-r1
 # @MAINTAINER:
@@ -31,12 +31,11 @@
 # http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml
 
 case "${EAPI:-0}" in
-	0|1|2|3|4)
+	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	5)
-		# EAPI=5 is required for meaningful USE default deps
-		# on USE_EXPAND flags
+	4|5)
+		# EAPI=4 is required for USE default deps on USE_EXPAND flags
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -194,11 +193,11 @@
 	# 2) python-exec should be built with all targets forced anyway
 	# but if new targets were added, we may need to force a rebuild
 	# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
-	# just fix :0 for now since := deps are not supported.
+	# just fix :2 since := deps are not supported.
 	if [[ ${EAPI} != 4 ]]; then
 		PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]"
 	else
-		PYTHON_DEPS+="dev-python/python-exec:0[${PYTHON_USEDEP}]"
+		PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]"
 	fi
 }
 _python_single_set_globals



1.41                 eclass/python-utils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.40&r2=1.41

Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- python-utils-r1.eclass	17 Sep 2013 19:40:56 -0000	1.40
+++ python-utils-r1.eclass	26 Sep 2013 11:24:30 -0000	1.41
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.40 2013/09/17 19:40:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.41 2013/09/26 11:24:30 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -21,7 +21,6 @@
 
 case "${EAPI:-0}" in
 	0|1|2|3|4|5)
-		# EAPI=4 makes die behavior clear
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -1010,8 +1009,8 @@
 _python_want_python_exec2() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	# EAPI 4 lacks slot operators, so just fix it on python-exec:0.
-	[[ ${EAPI} == 4 ]] && return 1
+	# EAPI 4 lacks slot operators, so just fix it on python-exec:2.
+	[[ ${EAPI} == 4 ]] && return 0
 
 	# Check if we cached the result, or someone put an override.
 	if [[ ! ${_PYTHON_WANT_PYTHON_EXEC2+1} ]]; then





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass python-single-r1.eclass python-utils-r1.eclass
@ 2013-10-30 19:14 Michal Gorny (mgorny)
  0 siblings, 0 replies; 7+ messages in thread
From: Michal Gorny (mgorny) @ 2013-10-30 19:14 UTC (permalink / raw
  To: gentoo-commits

mgorny      13/10/30 19:14:02

  Modified:             ChangeLog python-r1.eclass python-single-r1.eclass
                        python-utils-r1.eclass
  Log:
  Switch the eclasses to use dev-lang/python-exec.

Revision  Changes    Path
1.1040               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1040&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1040&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1039&r2=1.1040

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1039
retrieving revision 1.1040
diff -u -r1.1039 -r1.1040
--- ChangeLog	27 Oct 2013 13:44:35 -0000	1.1039
+++ ChangeLog	30 Oct 2013 19:14:02 -0000	1.1040
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1039 2013/10/27 13:44:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1040 2013/10/30 19:14:02 mgorny Exp $
+
+  30 Oct 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
+  python-single-r1.eclass, python-utils-r1.eclass:
+  Switch the eclasses to use dev-lang/python-exec.
 
   27 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
   Create a fake ".git" directory inside the checkout to satisfy git rev-parse



1.64                 eclass/python-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.63&r2=1.64

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- python-r1.eclass	22 Oct 2013 15:16:56 -0000	1.63
+++ python-r1.eclass	30 Oct 2013 19:14:02 -0000	1.64
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.63 2013/10/22 15:16:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.64 2013/10/30 19:14:02 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -122,7 +122,7 @@
 #
 # Example value:
 # @CODE
-# dev-python/python-exec:=
+# dev-lang/python-exec:=
 # python_targets_python2_6? ( dev-lang/python:2.6[gdbm] )
 # python_targets_python2_7? ( dev-lang/python:2.7[gdbm] )
 # @CODE
@@ -206,9 +206,9 @@
 	# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
 	# just fix :2 since := deps are not supported.
 	if [[ ${EAPI} != 4 ]]; then
-		PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]"
+		PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]"
 	else
-		PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]"
+		PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
 	fi
 }
 _python_set_globals
@@ -418,7 +418,7 @@
 		_PYTHON_USE_PYTHON_CHECKED=1
 
 		# python-exec has profile-forced flags.
-		if [[ ${CATEGORY}/${PN} == dev-python/python-exec ]]; then
+		if [[ ${CATEGORY}/${PN} == dev-lang/python-exec ]]; then
 			return
 		fi
 



1.24                 eclass/python-single-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.23&r2=1.24

Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-single-r1.eclass	22 Oct 2013 15:16:56 -0000	1.23
+++ python-single-r1.eclass	30 Oct 2013 19:14:02 -0000	1.24
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.23 2013/10/22 15:16:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.24 2013/10/30 19:14:02 mgorny Exp $
 
 # @ECLASS: python-single-r1
 # @MAINTAINER:
@@ -109,7 +109,7 @@
 #
 # Example value:
 # @CODE
-# dev-python/python-exec:0
+# dev-lang/python-exec:=
 # python_single_target_python2_6? ( dev-lang/python:2.6[gdbm] )
 # python_single_target_python2_7? ( dev-lang/python:2.7[gdbm] )
 # @CODE
@@ -195,9 +195,9 @@
 	# 3) use whichever python-exec slot installed in EAPI 5. For EAPI 4,
 	# just fix :2 since := deps are not supported.
 	if [[ ${EAPI} != 4 ]]; then
-		PYTHON_DEPS+="dev-python/python-exec:=[${PYTHON_USEDEP}]"
+		PYTHON_DEPS+="dev-lang/python-exec:=[${PYTHON_USEDEP}]"
 	else
-		PYTHON_DEPS+="dev-python/python-exec:2[${PYTHON_USEDEP}]"
+		PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
 	fi
 }
 _python_single_set_globals



1.45                 eclass/python-utils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.44&r2=1.45

Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- python-utils-r1.eclass	27 Oct 2013 07:27:52 -0000	1.44
+++ python-utils-r1.eclass	30 Oct 2013 19:14:02 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.44 2013/10/27 07:27:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.45 2013/10/30 19:14:02 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -981,7 +981,7 @@
 
 	# Check if we cached the result, or someone put an override.
 	if [[ ! ${_PYTHON_WANT_PYTHON_EXEC2+1} ]]; then
-		has_version 'dev-python/python-exec:2'
+		has_version 'dev-lang/python-exec:2'
 		_PYTHON_WANT_PYTHON_EXEC2=$(( ! ${?} ))
 	fi
 





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass python-single-r1.eclass python-utils-r1.eclass
@ 2014-05-26 16:13 Michal Gorny (mgorny)
  0 siblings, 0 replies; 7+ messages in thread
From: Michal Gorny (mgorny) @ 2014-05-26 16:13 UTC (permalink / raw
  To: gentoo-commits

mgorny      14/05/26 16:13:35

  Modified:             ChangeLog python-r1.eclass python-single-r1.eclass
                        python-utils-r1.eclass
  Log:
  Move python_fix_shebang into python-utils-r1, therefore making it a part of public API for all eclasses.

Revision  Changes    Path
1.1274               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1274&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1274&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1273&r2=1.1274

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1273
retrieving revision 1.1274
diff -u -r1.1273 -r1.1274
--- ChangeLog	24 May 2014 08:48:40 -0000	1.1273
+++ ChangeLog	26 May 2014 16:13:35 -0000	1.1274
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1273 2014/05/24 08:48:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1274 2014/05/26 16:13:35 mgorny Exp $
+
+  26 May 2014; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
+  python-single-r1.eclass, python-utils-r1.eclass:
+  Move python_fix_shebang into python-utils-r1, therefore making it a part of
+  public API for all eclasses.
 
   24 May 2014; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
   elisp-site-regen: Look for site-init files only in site-gentoo.d



1.73                 eclass/python-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.72&r2=1.73

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- python-r1.eclass	19 Apr 2014 10:29:06 -0000	1.72
+++ python-r1.eclass	26 May 2014 16:13:35 -0000	1.73
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.72 2014/04/19 10:29:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.73 2014/05/26 16:13:35 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -783,6 +783,8 @@
 	debug-print-function ${FUNCNAME} "${@}"
 
 	_python_replicate_script() {
+		local _PYTHON_FIX_SHEBANG_QUIET=1
+
 		if _python_want_python_exec2; then
 			local PYTHON_SCRIPTDIR
 			python_export PYTHON_SCRIPTDIR
@@ -792,7 +794,7 @@
 				doexe "${files[@]}"
 			)
 
-			_python_rewrite_shebang "${EPYTHON}" \
+			python_fix_shebang \
 				"${files[@]/*\//${D%/}/${PYTHON_SCRIPTDIR}/}"
 		else
 			local f
@@ -800,7 +802,7 @@
 				cp -p "${f}" "${f}-${EPYTHON}" || die
 			done
 
-			_python_rewrite_shebang "${EPYTHON}" \
+			python_fix_shebang \
 				"${files[@]/%/-${EPYTHON}}"
 		fi
 	}



1.26                 eclass/python-single-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.25&r2=1.26

Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- python-single-r1.eclass	30 Nov 2013 17:57:11 -0000	1.25
+++ python-single-r1.eclass	26 May 2014 16:13:35 -0000	1.26
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.25 2013/11/30 17:57:11 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.26 2014/05/26 16:13:35 mgorny Exp $
 
 # @ECLASS: python-single-r1
 # @MAINTAINER:
@@ -261,49 +261,5 @@
 	python_setup
 }
 
-# @FUNCTION: python_fix_shebang
-# @USAGE: <path>...
-# @DESCRIPTION:
-# Replace the shebang in Python scripts with the current Python
-# implementation (EPYTHON). If a directory is passed, works recursively
-# on all Python scripts.
-#
-# Only files having a 'python' shebang will be modified; other files
-# will be skipped. If a script has a complete shebang matching
-# the chosen interpreter version, it is left unmodified. If a script has
-# a complete shebang matching other version, the command dies.
-python_fix_shebang() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	[[ ${1} ]] || die "${FUNCNAME}: no paths given"
-	[[ ${EPYTHON} ]] || die "${FUNCNAME}: EPYTHON unset (pkg_setup not called?)"
-
-	local path f
-	for path; do
-		while IFS= read -r -d '' f; do
-			local shebang=$(head -n 1 "${f}")
-
-			case "${shebang}" in
-				'#!'*${EPYTHON}*)
-					debug-print "${FUNCNAME}: in file ${f#${D}}"
-					debug-print "${FUNCNAME}: shebang matches EPYTHON: ${shebang}"
-					;;
-				'#!'*python[23].[0123456789]*|'#!'*pypy-c*|'#!'*jython*)
-					debug-print "${FUNCNAME}: in file ${f#${D}}"
-					debug-print "${FUNCNAME}: incorrect specific shebang: ${shebang}"
-
-					die "${f#${D}} has a specific Python shebang not matching EPYTHON"
-					;;
-				'#!'*python*)
-					debug-print "${FUNCNAME}: in file ${f#${D}}"
-					debug-print "${FUNCNAME}: rewriting shebang: ${shebang}"
-
-					einfo "Fixing shebang in ${f#${D}}"
-					_python_rewrite_shebang "${f}"
-			esac
-		done < <(find "${path}" -type f -print0)
-	done
-}
-
 _PYTHON_SINGLE_R1=1
 fi



1.56                 eclass/python-utils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.55&r2=1.56

Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- python-utils-r1.eclass	16 May 2014 07:54:40 -0000	1.55
+++ python-utils-r1.eclass	26 May 2014 16:13:35 -0000	1.56
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.55 2014/05/16 07:54:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.56 2014/05/26 16:13:35 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -478,79 +478,6 @@
 	echo "${PYTHON_SCRIPTDIR}"
 }
 
-# @FUNCTION: _python_rewrite_shebang
-# @USAGE: [<EPYTHON>] <path>...
-# @INTERNAL
-# @DESCRIPTION:
-# Replaces 'python' executable in the shebang with the executable name
-# of the specified interpreter. If no EPYTHON value (implementation) is
-# used, the current ${EPYTHON} will be used.
-#
-# All specified files must start with a 'python' shebang. A file not
-# having a matching shebang will be refused. The exact shebang style
-# will be preserved in order not to break anything.
-#
-# Example conversions:
-# @CODE
-# From: #!/usr/bin/python -R
-# To: #!/usr/bin/python2.7 -R
-#
-# From: #!/usr/bin/env FOO=bar python
-# To: #!/usr/bin/env FOO=bar python2.7
-# @CODE
-_python_rewrite_shebang() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	local impl
-	case "${1}" in
-		python*|jython*|pypy*)
-			impl=${1}
-			shift
-			;;
-		*)
-			impl=${EPYTHON}
-			[[ ${impl} ]] || die "${FUNCNAME}: no impl nor EPYTHON"
-			;;
-	esac
-	debug-print "${FUNCNAME}: implementation: ${impl}"
-
-	local f
-	for f; do
-		local from shebang
-		read -r shebang < "${f}"
-		shebang=${shebang%$'\r'}
-		debug-print "${FUNCNAME}: path = ${f}"
-		debug-print "${FUNCNAME}: shebang = ${shebang}"
-
-		if [[ "${shebang} " == *"${impl} "* ]]; then
-			# skip files with correct impl
-			continue
-		elif [[ "${shebang} " == *'python '* ]]; then
-			from=python
-		elif [[ "${shebang} " == *'python2 '* ]]; then
-			from=python2
-		elif [[ "${shebang} " == *'python3 '* ]]; then
-			from=python3
-		else
-			eerror "A file does not seem to have a supported shebang:"
-			eerror "  file: ${f}"
-			eerror "  shebang: ${shebang}"
-			die "${FUNCNAME}: ${f} does not seem to have a valid shebang"
-		fi
-
-		if { [[ ${from} == python2 ]] && python_is_python3 "${impl}"; } \
-				|| { [[ ${from} == python3 ]] && ! python_is_python3 "${impl}"; } then
-			eerror "A file does have shebang not supporting requested impl:"
-			eerror "  file: ${f}"
-			eerror "  shebang: ${shebang}"
-			eerror "  impl: ${impl}"
-			die "${FUNCNAME}: ${f} does have shebang not supporting ${EPYTHON}"
-		fi
-
-		sed -i -e "1s:${from}:${impl}:" "${f}" || die
-	done
-}
-
 # @FUNCTION: _python_ln_rel
 # @USAGE: <from> <to>
 # @INTERNAL
@@ -743,7 +670,8 @@
 
 	# don't use this at home, just call python_doscript() instead
 	if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then
-		_python_rewrite_shebang "${ED%/}/${d}/${newfn}"
+		local _PYTHON_FIX_SHEBANG_QUIET=1
+		python_fix_shebang "${ED%/}/${d}/${newfn}"
 	fi
 }
 
@@ -1006,6 +934,100 @@
 	[[ ${impl} == python3* ]]
 }
 
+# @FUNCTION: python_fix_shebang
+# @USAGE: <path>...
+# @DESCRIPTION:
+# Replace the shebang in Python scripts with the current Python
+# implementation (EPYTHON). If a directory is passed, works recursively
+# on all Python scripts.
+#
+# Only files having a 'python*' shebang will be modified. Files with
+# other shebang will either be skipped when working recursively
+# on a directory or treated as error when specified explicitly.
+#
+# Shebangs matching explicitly current Python version will be left
+# unmodified. Shebangs requesting another Python version will be treated
+# as fatal error.
+python_fix_shebang() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	[[ ${1} ]] || die "${FUNCNAME}: no paths given"
+	[[ ${EPYTHON} ]] || die "${FUNCNAME}: EPYTHON unset (pkg_setup not called?)"
+
+	local path f
+	for path; do
+		local any_correct any_fixed is_recursive
+
+		[[ -d ${path} ]] && is_recursive=1
+
+		while IFS= read -r -d '' f; do
+			local shebang=$(head -n 1 "${f}")
+			local error
+
+			case "${shebang} " in
+				'#!'*"${EPYTHON} "*)
+					debug-print "${FUNCNAME}: in file ${f#${D}}"
+					debug-print "${FUNCNAME}: shebang matches EPYTHON: ${shebang}"
+
+					# Nothing to do, move along.
+					any_correct=1
+					;;
+				'#!'*python" "*|'#!'*python[23]" "*)
+					debug-print "${FUNCNAME}: in file ${f#${D}}"
+					debug-print "${FUNCNAME}: rewriting shebang: ${shebang}"
+
+					# Note: for internal use.
+					if [[ ! ${_PYTHON_FIX_SHEBANG_QUIET} ]]; then
+						einfo "Fixing shebang in ${f#${D}}."
+					fi
+
+					local from
+					if [[ "${shebang} " == *'python2 '* ]]; then
+						from=python2
+						python_is_python3 "${EPYTHON}" && error=1
+					elif [[ "${shebang} " == *'python3 '* ]]; then
+						from=python3
+						python_is_python3 "${EPYTHON}" || error=1
+					else
+						from=python
+					fi
+
+					if [[ ! ${error} ]]; then
+						sed -i -e "1s:${from}:${EPYTHON}:" "${f}" || die
+						any_fixed=1
+					fi
+					;;
+				'#!'*python[23].[0123456789]" "*|'#!'*pypy" "*|'#!'*jython[23].[0123456789]" "*)
+					# Explicit mismatch.
+					error=1
+					;;
+				*)
+					# Non-Python shebang. Allowed in recursive mode,
+					# disallowed when specifying file explicitly.
+					[[ ${is_recursive} ]] || error=1
+					;;
+			esac
+
+			if [[ ${error} ]]; then
+				eerror "The file has incompatible shebang:"
+				eerror "  file: ${f#${D}}"
+				eerror "  current shebang: ${shebang}"
+				eerror "  requested impl: ${EPYTHON}"
+				die "${FUNCNAME}: conversion of incompatible shebang requested"
+			fi
+		done < <(find "${path}" -type f -print0)
+
+		if [[ ! ${any_fixed} ]]; then
+			eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
+			if [[ ${any_correct} ]]; then
+				eqawarn "All files have ${EPYTHON} shebang already."
+			else
+				eqawarn "There are no Python files in specified directory."
+			fi
+		fi
+	done
+}
+
 # @FUNCTION: _python_want_python_exec2
 # @INTERNAL
 # @DESCRIPTION:





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass python-single-r1.eclass python-utils-r1.eclass
@ 2015-02-19 18:52 Michal Gorny (mgorny)
  0 siblings, 0 replies; 7+ messages in thread
From: Michal Gorny (mgorny) @ 2015-02-19 18:52 UTC (permalink / raw
  To: gentoo-commits

mgorny      15/02/19 18:52:06

  Modified:             ChangeLog python-r1.eclass python-single-r1.eclass
                        python-utils-r1.eclass
  Log:
  Deprecate EAPI=4 support.

Revision  Changes    Path
1.1541               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1541&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1541&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1540&r2=1.1541

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1540
retrieving revision 1.1541
diff -u -r1.1540 -r1.1541
--- ChangeLog	19 Feb 2015 17:22:25 -0000	1.1540
+++ ChangeLog	19 Feb 2015 18:52:06 -0000	1.1541
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1540 2015/02/19 17:22:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1541 2015/02/19 18:52:06 mgorny Exp $
+
+  19 Feb 2015; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
+  python-single-r1.eclass, python-utils-r1.eclass:
+  Deprecate EAPI=4 support.
 
   19 Feb 2015; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass,
   python-r1.eclass, python-single-r1.eclass, python-utils-r1.eclass:



1.86                 eclass/python-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.85&r2=1.86

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- python-r1.eclass	19 Feb 2015 17:22:25 -0000	1.85
+++ python-r1.eclass	19 Feb 2015 18:52:06 -0000	1.86
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.85 2015/02/19 17:22:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.86 2015/02/19 18:52:06 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -652,6 +652,7 @@
 
 	_python_validate_useflags
 	_python_check_USE_PYTHON
+	_python_check_EAPI
 
 	MULTIBUILD_VARIANTS=()
 



1.33                 eclass/python-single-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.32&r2=1.33

Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- python-single-r1.eclass	19 Feb 2015 17:22:25 -0000	1.32
+++ python-single-r1.eclass	19 Feb 2015 18:52:06 -0000	1.33
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.32 2015/02/19 17:22:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.33 2015/02/19 18:52:06 mgorny Exp $
 
 # @ECLASS: python-single-r1
 # @MAINTAINER:
@@ -379,6 +379,8 @@
 python_setup() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	_python_check_EAPI
+
 	unset EPYTHON
 
 	local impl impls=()



1.77                 eclass/python-utils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.76&r2=1.77

Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- python-utils-r1.eclass	19 Feb 2015 17:22:25 -0000	1.76
+++ python-utils-r1.eclass	19 Feb 2015 18:52:06 -0000	1.77
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.76 2015/02/19 17:22:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.77 2015/02/19 18:52:06 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -1127,6 +1127,22 @@
 	return 0
 }
 
+# @FUNCTION: _python_check_EAPI
+# @INTERNAL
+# @DESCRIPTION:
+# Check whether the ebuild is not using deprecated EAPI 4. Output
+# a QA warning if it does.
+_python_check_EAPI() {
+	if [[ ${EAPI} == 4 && ! ${_PYTHON_WARNED_EAPI} ]]; then
+		eqawarn "This package is using still using EAPI=4. This results in package"
+		eqawarn "dependencies violating PMS and causing issues for package managers."
+		eqawarn "For this reason, using EAPI=4 in new Python packages will be banned"
+		eqawarn "on 2015-03-20 (2 years and 6 months after approving EAPI 5)."
+
+		_PYTHON_WARNED_EAPI=1
+	fi
+}
+
 # -- python.eclass functions --
 
 _python_check_dead_variables() {





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass python-single-r1.eclass python-utils-r1.eclass
@ 2015-02-20 17:02 Michal Gorny (mgorny)
  0 siblings, 0 replies; 7+ messages in thread
From: Michal Gorny (mgorny) @ 2015-02-20 17:02 UTC (permalink / raw
  To: gentoo-commits

mgorny      15/02/20 17:02:56

  Modified:             ChangeLog python-r1.eclass python-single-r1.eclass
                        python-utils-r1.eclass
  Log:
  Restore EAPI=4 deprecation. That commit was perfectly fine.

Revision  Changes    Path
1.1544               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1544&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1544&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1543&r2=1.1544

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1543
retrieving revision 1.1544
diff -u -r1.1543 -r1.1544
--- ChangeLog	20 Feb 2015 10:22:42 -0000	1.1543
+++ ChangeLog	20 Feb 2015 17:02:56 -0000	1.1544
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1543 2015/02/20 10:22:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1544 2015/02/20 17:02:56 mgorny Exp $
+
+  20 Feb 2015; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
+  python-single-r1.eclass, python-utils-r1.eclass:
+  Restore EAPI=4 deprecation. That commit was perfectly fine.
 
   20 Feb 2015; Ulrich Müller <ulm@gentoo.org> games.eclass:
   [QA] Leave permissions of top-level directories alone, bug 537580.



1.88                 eclass/python-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.87&r2=1.88

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- python-r1.eclass	20 Feb 2015 08:14:22 -0000	1.87
+++ python-r1.eclass	20 Feb 2015 17:02:56 -0000	1.88
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.87 2015/02/20 08:14:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.88 2015/02/20 17:02:56 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -652,6 +652,7 @@
 
 	_python_validate_useflags
 	_python_check_USE_PYTHON
+	_python_check_EAPI
 
 	MULTIBUILD_VARIANTS=()
 



1.35                 eclass/python-single-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.34&r2=1.35

Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- python-single-r1.eclass	20 Feb 2015 08:14:22 -0000	1.34
+++ python-single-r1.eclass	20 Feb 2015 17:02:56 -0000	1.35
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.34 2015/02/20 08:14:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.35 2015/02/20 17:02:56 mgorny Exp $
 
 # @ECLASS: python-single-r1
 # @MAINTAINER:
@@ -379,6 +379,8 @@
 python_setup() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	_python_check_EAPI
+
 	unset EPYTHON
 
 	local impl impls=()



1.79                 eclass/python-utils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.78&r2=1.79

Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- python-utils-r1.eclass	20 Feb 2015 08:18:05 -0000	1.78
+++ python-utils-r1.eclass	20 Feb 2015 17:02:56 -0000	1.79
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.78 2015/02/20 08:18:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.79 2015/02/20 17:02:56 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -1168,6 +1168,22 @@
 	return 0
 }
 
+# @FUNCTION: _python_check_EAPI
+# @INTERNAL
+# @DESCRIPTION:
+# Check whether the ebuild is not using deprecated EAPI 4. Output
+# a QA warning if it does.
+_python_check_EAPI() {
+	if [[ ${EAPI} == 4 && ! ${_PYTHON_WARNED_EAPI} ]]; then
+		eqawarn "This package is using still using EAPI=4. This results in package"
+		eqawarn "dependencies violating PMS and causing issues for package managers."
+		eqawarn "For this reason, using EAPI=4 in new Python packages will be banned"
+		eqawarn "on 2015-03-20 (2 years and 6 months after approving EAPI 5)."
+
+		_PYTHON_WARNED_EAPI=1
+	fi
+}
+
 # -- python.eclass functions --
 
 _python_check_dead_variables() {





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass python-single-r1.eclass python-utils-r1.eclass
@ 2015-03-21 14:55 Michal Gorny (mgorny)
  0 siblings, 0 replies; 7+ messages in thread
From: Michal Gorny (mgorny) @ 2015-03-21 14:55 UTC (permalink / raw
  To: gentoo-commits

mgorny      15/03/21 14:55:33

  Modified:             ChangeLog python-r1.eclass python-single-r1.eclass
                        python-utils-r1.eclass
  Log:
  Ban new EAPI < 5 packages for python-r1 & python-single-r1.

Revision  Changes    Path
1.1570               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1570&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1570&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1569&r2=1.1570

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1569
retrieving revision 1.1570
diff -u -r1.1569 -r1.1570
--- ChangeLog	20 Mar 2015 00:13:32 -0000	1.1569
+++ ChangeLog	21 Mar 2015 14:55:33 -0000	1.1570
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1569 2015/03/20 00:13:32 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1570 2015/03/21 14:55:33 mgorny Exp $
+
+  21 Mar 2015; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
+  python-single-r1.eclass, python-utils-r1.eclass:
+  Ban new EAPI < 5 packages for python-r1 & python-single-r1.
 
   20 Mar 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass:
   Move cpu-optimation removal. See bug #542810



1.90                 eclass/python-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.89&r2=1.90

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- python-r1.eclass	20 Feb 2015 17:57:22 -0000	1.89
+++ python-r1.eclass	21 Mar 2015 14:55:33 -0000	1.90
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.89 2015/02/20 17:57:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.90 2015/03/21 14:55:33 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -33,8 +33,22 @@
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
-		# EAPI=4 is required for USE default deps on USE_EXPAND flags
+	4)
+		# EAPI=4 is only allowed on legacy packages
+		if [[ ${CATEGORY}/${P} == dev-python/pyelftools-0.2[123] ]]; then
+			:
+		elif [[ ${CATEGORY}/${P} == sys-apps/file-5.22 ]]; then
+			:
+		elif [[ ${CATEGORY}/${P} == sys-apps/i2c-tools-3.1.1 ]]; then
+			:
+		elif [[ ${CATEGORY}/${P} == sys-libs/cracklib-2.9.[12] ]]; then
+			:
+		else
+			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
+		fi
+		;;
+	5)
+		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -652,7 +666,6 @@
 
 	_python_validate_useflags
 	_python_check_USE_PYTHON
-	_python_check_EAPI
 
 	MULTIBUILD_VARIANTS=()
 



1.37                 eclass/python-single-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.36&r2=1.37

Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- python-single-r1.eclass	20 Feb 2015 17:57:22 -0000	1.36
+++ python-single-r1.eclass	21 Mar 2015 14:55:33 -0000	1.37
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.36 2015/02/20 17:57:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.37 2015/03/21 14:55:33 mgorny Exp $
 
 # @ECLASS: python-single-r1
 # @MAINTAINER:
@@ -35,8 +35,28 @@
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
-		# EAPI=4 is required for USE default deps on USE_EXPAND flags
+	4)
+		# EAPI=4 is only allowed on legacy packages
+		if [[ ${CATEGORY}/${P} == app-arch/threadzip-1.2 ]]; then
+			:
+		elif [[ ${CATEGORY}/${P} == media-libs/lv2-1.8.0 ]]; then
+			:
+		elif [[ ${CATEGORY}/${P} == media-libs/lv2-1.10.0 ]]; then
+			:
+		elif [[ ${CATEGORY}/${P} == sys-apps/paludis-1* ]]; then
+			:
+		elif [[ ${CATEGORY}/${P} == sys-apps/paludis-2.[02].0 ]]; then
+			:
+		elif [[ ${CATEGORY}/${P} == sys-apps/util-linux-2.2[456]* ]]; then
+			:
+		elif [[ ${CATEGORY}/${P} == sys-devel/gdb-7.[78]* ]]; then
+			:
+		else
+			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
+		fi
+		;;
+	5)
+		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -379,8 +399,6 @@
 python_setup() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	_python_check_EAPI
-
 	unset EPYTHON
 
 	local impl impls=()



1.82                 eclass/python-utils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.81&r2=1.82

Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- python-utils-r1.eclass	21 Feb 2015 08:07:30 -0000	1.81
+++ python-utils-r1.eclass	21 Mar 2015 14:55:33 -0000	1.82
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.81 2015/02/21 08:07:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.82 2015/03/21 14:55:33 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -1127,22 +1127,6 @@
 	return 0
 }
 
-# @FUNCTION: _python_check_EAPI
-# @INTERNAL
-# @DESCRIPTION:
-# Check whether the ebuild is not using deprecated EAPI 4. Output
-# a QA warning if it does.
-_python_check_EAPI() {
-	if [[ ${EAPI} == 4 && ! ${_PYTHON_WARNED_EAPI} ]]; then
-		eqawarn "This package is still using EAPI=4. This results in package"
-		eqawarn "dependencies violating PMS and causing issues for package managers."
-		eqawarn "For this reason, using EAPI=4 in new Python packages will be banned"
-		eqawarn "on 2015-03-20 (2 years and 6 months after approving EAPI 5)."
-
-		_PYTHON_WARNED_EAPI=1
-	fi
-}
-
 # -- python.eclass functions --
 
 _python_check_dead_variables() {





^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-03-21 14:55 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-26 16:13 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass python-single-r1.eclass python-utils-r1.eclass Michal Gorny (mgorny)
  -- strict thread matches above, loose matches on Subject: below --
2015-03-21 14:55 Michal Gorny (mgorny)
2015-02-20 17:02 Michal Gorny (mgorny)
2015-02-19 18:52 Michal Gorny (mgorny)
2013-10-30 19:14 Michal Gorny (mgorny)
2013-09-26 11:24 Michal Gorny (mgorny)
2012-11-30 11:40 Michal Gorny (mgorny)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox