axs         14/11/07 18:11:58

  Modified:             ChangeLog python-single-r1.eclass
  Log:
  Help PMs figure out what to do by turning off unimplemented 
python_single_target_* flags in PYTHON_USEDEP; thanks to mgorny, floppym and 
Arfever for reviews

Revision  Changes    Path
1.1407               eclass/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1406
retrieving revision 1.1407
diff -u -r1.1406 -r1.1407
--- ChangeLog   7 Nov 2014 16:17:46 -0000       1.1406
+++ ChangeLog   7 Nov 2014 18:11:58 -0000       1.1407
@@ -1,6 +1,12 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1406 2014/11/07 
16:17:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1407 2014/11/07 
18:11:58 axs Exp $
+
+  07 Nov 2014; Ian Stakenvicius (_AxS_) <[email protected]>
+  python-single-r1.eclass:
+  Help PMs figure out what to do by turning off unimplemented
+  python_single_target_* flags in PYTHON_USEDEP; thanks to mgorny, floppym and
+  Arfever for reviews
 
   07 Nov 2014; Ian Stakenvicius (_AxS_) <[email protected]>
   python-single-r1.eclass:



1.29                 eclass/python-single-r1.eclass

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

Index: python-single-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- python-single-r1.eclass     7 Nov 2014 16:17:46 -0000       1.28
+++ python-single-r1.eclass     7 Nov 2014 18:11:58 -0000       1.29
@@ -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-single-r1.eclass,v 1.28 
2014/11/07 16:17:46 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.29 
2014/11/07 18:11:58 axs Exp $
 
 # @ECLASS: python-single-r1
 # @MAINTAINER:
@@ -159,12 +159,14 @@
 
 _python_single_set_globals() {
        local impls=()
+       local unimpls=()
 
        PYTHON_DEPS=
        local i PYTHON_PKG_DEP
-       for i in "${PYTHON_COMPAT[@]}"; do
-               _python_impl_supported "${i}" || continue
-               impls+=( "${i}" )
+       for i in "${_PYTHON_ALL_IMPLS[@]}"; do
+               has "${i}" "${PYTHON_COMPAT[@]}" \
+                       && impls+=( "${i}" ) \
+                       || unimpls+=( "${i}" )
        done
 
        if [[ ${#impls[@]} -eq 0 ]]; then
@@ -173,8 +175,9 @@
 
        local flags_mt=( "${impls[@]/#/python_targets_}" )
        local flags=( "${impls[@]/#/python_single_target_}" )
+       local unflags=( "${unimpls[@]/#/-python_single_target_}" )
 
-       local optflags=${flags_mt[@]/%/(-)?}
+       local optflags=${flags_mt[@]/%/(-)?},${unflags[@]/%/(-)}
 
        IUSE="${flags_mt[*]}"
 
@@ -195,7 +198,7 @@
                PYTHON_REQUIRED_USE="^^ ( ${flags[*]} )"
                # Ensure deps honor the same python_single_target_* flag as is 
set
                # on this package.
-       optflags+=,${flags[@]/%/(+)?}
+               optflags+=,${flags[@]/%/(+)?}
 
                for i in "${impls[@]}"; do
                        # The chosen targets need to be in PYTHON_TARGETS as 
well.




Reply via email to