commit: a020a0b83b88165b90f6d887cf140485c9292660
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 1 11:45:52 2014 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 1 11:45:52 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a020a0b8
app-editors/gedit-plugins: fix Python support
Add a proper REQUIRED_USE for libpeas compatibility, use python_setup()
to use the correct implementation.
Package-Manager: portage-2.2.14
Manifest-Sign-Key: EFB4464E!
---
app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild
b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild
index 641d4c8..f009722 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild
@@ -5,7 +5,7 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{2,3} )
+PYTHON_COMPAT=( python3_{3,4} )
PYTHON_REQ_USE="xml"
inherit eutils gnome2 multilib python-r1
@@ -19,12 +19,13 @@ SLOT="0"
IUSE_plugins="charmap git terminal zeitgeist"
IUSE="+python ${IUSE_plugins}"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
REQUIRED_USE="
charmap? ( python )
git? ( python )
+ python? ( ^^ ( $(python_gen_useflags '*') ) )
terminal? ( python )
zeitgeist? ( python )
- python? ( ${REQUIRED_PYTHON_USE} )
"
RDEPEND="
@@ -56,6 +57,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
+pkg_setup() {
+ use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
src_configure() {
gnome2_src_configure \
$(use_enable python) \