diff options
-rw-r--r-- | eclass/ChangeLog | 6 | ||||
-rw-r--r-- | eclass/python-r1.eclass | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 95f0a1419d05..a8ef0d695bdc 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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.562 2012/12/16 14:11:58 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.563 2012/12/16 21:42:33 mgorny Exp $ + + 16 Dec 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass: + Temporarily disable PYTHON_SINGLE_TARGET safety check because of issues with + paludis, bug #447524. 16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> gnome2.eclass: Pass --disable-schemas-compile from gsettings.m4 in gnome2_src_configure. diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index f4e4c95add51..2b515f1b458a 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.26 2012/12/14 08:41:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.27 2012/12/16 21:42:33 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -133,9 +133,12 @@ fi _python_set_globals() { local flags=( "${PYTHON_COMPAT[@]/#/python_targets_}" ) - local flags_st=( "${PYTHON_COMPAT[@]/#/-python_single_target_}" ) + #local flags_st=( "${PYTHON_COMPAT[@]/#/-python_single_target_}" ) local optflags=${flags[@]/%/?} - optflags+=,${flags_st[@]/%/(-)} + #optflags+=,${flags_st[@]/%/(-)} + + # PYTHON_SINGLE_TARGET safety check temporarily disabled + # because of issues with paludis, bug #447524. IUSE=${flags[*]} REQUIRED_USE="|| ( ${flags[*]} )" |