diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-01-30 10:42:25 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-01-30 10:42:25 +0000 |
| commit | dd112bf8e547b524b9f474b5476a5181f44ce9a9 (patch) | |
| tree | c5cfee974622513f42989c0ecd1711e866d08ff1 /eclass | |
| parent | old (diff) | |
| download | historical-dd112bf8e547b524b9f474b5476a5181f44ce9a9.tar.gz historical-dd112bf8e547b524b9f474b5476a5181f44ce9a9.tar.bz2 historical-dd112bf8e547b524b9f474b5476a5181f44ce9a9.zip | |
Use (-) USE-defaults to reduce issues from removing flags.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/python-r1.eclass | 8 | ||||
| -rw-r--r-- | eclass/python-single-r1.eclass | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9d02f3ec7756..c38feff52759 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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.653 2013/01/29 21:12:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.654 2013/01/30 10:42:25 mgorny Exp $ + + 30 Jan 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass, + python-single-r1.eclass: + Use (-) USE-defaults to reduce issues from removing flags. 29 Jan 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass: Disable pypy1.8 globally. diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 2dec145959a8..5735a6d91314 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -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.39 2013/01/27 16:40:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.40 2013/01/30 10:42:25 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -128,7 +128,7 @@ fi # # Example value: # @CODE -# python_targets_python2_6?,python_targets_python2_7? +# python_targets_python2_6(-)?,python_targets_python2_7(-)? # @CODE _python_set_globals() { @@ -150,7 +150,7 @@ _python_set_globals() { fi local flags=( "${impls[@]/#/python_targets_}" ) - local optflags=${flags[@]/%/?} + local optflags=${flags[@]/%/(-)?} # A nice QA trick here. Since a python-single-r1 package has to have # at least one PYTHON_SINGLE_TARGET enabled (REQUIRED_USE), @@ -229,7 +229,7 @@ python_gen_usedep() { for pattern; do if [[ ${impl} == ${pattern} ]]; then matches+=( - "python_targets_${impl}?" + "python_targets_${impl}(-)?" "-python_single_target_${impl}(-)" ) break diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 76dea7aa4d67..6235b66e2cff 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -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.14 2013/01/21 19:28:16 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.15 2013/01/30 10:42:25 mgorny Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -130,7 +130,7 @@ fi # # Example value: # @CODE -# python_targets_python2_7?,python_single_target_python2_7(+)? +# python_targets_python2_7(-)?,python_single_target_python2_7(+)? # @CODE _python_single_set_globals() { @@ -159,7 +159,7 @@ _python_single_set_globals() { local flags_mt=( "${impls[@]/#/python_targets_}" ) local flags=( "${impls[@]/#/python_single_target_}" ) - local optflags=${flags_mt[@]/%/?} + local optflags=${flags_mt[@]/%/(-)?} optflags+=,${flags[@]/%/(+)?} IUSE="${flags_mt[*]} ${flags[*]}" |