diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-12-14 08:41:59 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-12-14 08:41:59 +0000 |
| commit | 79a1b47cddfe80fcfa835143c5fc2a9b2755a157 (patch) | |
| tree | 2ed295bb2f4f9f5d7e5ce2c1e515bc0415d50820 /eclass | |
| parent | Support directories in DOCS, in EAPI 4+. (diff) | |
| download | historical-79a1b47cddfe80fcfa835143c5fc2a9b2755a157.tar.gz historical-79a1b47cddfe80fcfa835143c5fc2a9b2755a157.tar.bz2 historical-79a1b47cddfe80fcfa835143c5fc2a9b2755a157.zip | |
Prevent python-r1 packages from depending on python-single-r1 packages.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/python-r1.eclass | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d86a1a9b9b61..e651ecb852e6 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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.559 2012/12/14 08:40:18 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.560 2012/12/14 08:41:59 mgorny Exp $ + + 14 Dec 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass: + Prevent python-r1 packages from depending on python-single-r1 packages. 14 Dec 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass: Support directories in DOCS, in EAPI 4+. diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 39de7f2f27eb..f4e4c95add51 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -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.25 2012/12/01 09:29:24 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.26 2012/12/14 08:41:59 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -133,7 +133,9 @@ fi _python_set_globals() { local flags=( "${PYTHON_COMPAT[@]/#/python_targets_}" ) + local flags_st=( "${PYTHON_COMPAT[@]/#/-python_single_target_}" ) local optflags=${flags[@]/%/?} + optflags+=,${flags_st[@]/%/(-)} IUSE=${flags[*]} REQUIRED_USE="|| ( ${flags[*]} )" |