| 1 |
commit: a020a0b83b88165b90f6d887cf140485c9292660 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 1 11:45:52 2014 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 1 11:45:52 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a020a0b8 |
| 7 |
|
| 8 |
app-editors/gedit-plugins: fix Python support |
| 9 |
|
| 10 |
Add a proper REQUIRED_USE for libpeas compatibility, use python_setup() |
| 11 |
to use the correct implementation. |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.14 |
| 14 |
Manifest-Sign-Key: EFB4464E! |
| 15 |
|
| 16 |
--- |
| 17 |
app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild | 9 +++++++-- |
| 18 |
1 file changed, 7 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild |
| 21 |
index 641d4c8..f009722 100644 |
| 22 |
--- a/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild |
| 23 |
+++ b/app-editors/gedit-plugins/gedit-plugins-3.14.1.ebuild |
| 24 |
@@ -5,7 +5,7 @@ |
| 25 |
EAPI="5" |
| 26 |
GCONF_DEBUG="no" |
| 27 |
GNOME2_LA_PUNT="yes" # plugins are dlopened |
| 28 |
-PYTHON_COMPAT=( python3_{2,3} ) |
| 29 |
+PYTHON_COMPAT=( python3_{3,4} ) |
| 30 |
PYTHON_REQ_USE="xml" |
| 31 |
|
| 32 |
inherit eutils gnome2 multilib python-r1 |
| 33 |
@@ -19,12 +19,13 @@ SLOT="0" |
| 34 |
|
| 35 |
IUSE_plugins="charmap git terminal zeitgeist" |
| 36 |
IUSE="+python ${IUSE_plugins}" |
| 37 |
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas |
| 38 |
REQUIRED_USE=" |
| 39 |
charmap? ( python ) |
| 40 |
git? ( python ) |
| 41 |
+ python? ( ^^ ( $(python_gen_useflags '*') ) ) |
| 42 |
terminal? ( python ) |
| 43 |
zeitgeist? ( python ) |
| 44 |
- python? ( ${REQUIRED_PYTHON_USE} ) |
| 45 |
" |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
@@ -56,6 +57,10 @@ DEPEND="${RDEPEND} |
| 49 |
virtual/pkgconfig |
| 50 |
" |
| 51 |
|
| 52 |
+pkg_setup() { |
| 53 |
+ use python && [[ ${MERGE_TYPE} != binary ]] && python_setup |
| 54 |
+} |
| 55 |
+ |
| 56 |
src_configure() { |
| 57 |
gnome2_src_configure \ |
| 58 |
$(use_enable python) \ |
Archives