[gentoo-commits] proj/gnome:master commit in: app-editors/gedit/

[Michał Górny]

commit:     7bd51e90949f1491d9d3e4e4011e3830128d037e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 28 18:58:11 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 28 18:58:11 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7bd51e90

app-editors/gedit: add proper REQUIRED_USE and MERGE_TYPE check

Since libpeas supports at most one version of Python 3, add
an appropriate exactly-one-of REQUIRED_USE. Additionally, add
a MERGE_TYPE check to pkg_setup to avoid initializing Python
in binary package installs.

Package-Manager: portage-2.2.14
Manifest-Sign-Key: EFB4464E!

---
 app-editors/gedit/gedit-3.14.1.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-editors/gedit/gedit-3.14.1.ebuild b/app-editors/gedit/gedit-3.14.1.ebuild
index d41d63e..d2baa72 100644
--- a/app-editors/gedit/gedit-3.14.1.ebuild
+++ b/app-editors/gedit/gedit-3.14.1.ebuild
@@ -18,7 +18,9 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 
 IUSE="+introspection +python spell vala"
-REQUIRED_USE="python? ( || ( $(python_gen_useflags 'python3*') ) )"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
+# we need to fix that
+REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
@@ -66,7 +68,7 @@ DEPEND="${COMMON_DEPEND}
 # yelp-tools, gnome-common needed to eautoreconf
 
 pkg_setup() {
-	use python && python_setup
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
 }
 
 src_prepare() {