[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass

["Michal Gorny (mgorny)" <mgorny@gentoo.org>]

mgorny      12/12/19 09:22:17

  Modified:             ChangeLog python-r1.eclass
  Log:
  Re-enable python-r1 -> python-single-r1 dep prevention.

Revision  Changes    Path
1.566                eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -r1.565 -r1.566
--- ChangeLog	17 Dec 2012 20:09:28 -0000	1.565
+++ ChangeLog	19 Dec 2012 09:22:17 -0000	1.566
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.565 2012/12/17 20:09:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.566 2012/12/19 09:22:17 mgorny Exp $
+
+  19 Dec 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
+  Re-enable python-r1 -> python-single-r1 dep prevention.
 
   17 Dec 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass,
   python-single-r1.eclass:



1.30                 eclass/python-r1.eclass

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

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- python-r1.eclass	17 Dec 2012 20:09:28 -0000	1.29
+++ python-r1.eclass	19 Dec 2012 09:22:17 -0000	1.30
@@ -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.29 2012/12/17 20:09:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.30 2012/12/19 09:22:17 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -134,12 +134,16 @@
 
 _python_set_globals() {
 	local flags=( "${PYTHON_COMPAT[@]/#/python_targets_}" )
-	#local flags_st=( "${PYTHON_COMPAT[@]/#/-python_single_target_}" )
 	local optflags=${flags[@]/%/?}
-	#optflags+=,${flags_st[@]/%/(-)}
 
-	# PYTHON_SINGLE_TARGET safety check temporarily disabled
-	# because of issues with paludis, bug #447524.
+	# A nice QA trick here. Since a python-single-r1 package has to have
+	# at least one PYTHON_SINGLE_TARGET enabled (REQUIRED_USE),
+	# the following check will always fail on those packages. Therefore,
+	# it should prevent developers from mistakenly depending on packages
+	# not supporting multiple Python implementations.
+
+	local flags_st=( "${PYTHON_COMPAT[@]/#/-python_single_target_}" )
+	optflags+=,${flags_st[@]/%/(-)}
 
 	IUSE=${flags[*]}
 	REQUIRED_USE="|| ( ${flags[*]} )"