| 1 |
commit: c52e9c2f103ff1845b42f5372c22a4725672b200 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 28 19:03:11 2014 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 28 19:03:11 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c52e9c2f |
| 7 |
|
| 8 |
app-editors/gedit: sync the live ebuild |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.14 |
| 11 |
Manifest-Sign-Key: EFB4464E! |
| 12 |
|
| 13 |
--- |
| 14 |
app-editors/gedit/gedit-9999.ebuild | 47 +++++++++++++++---------------------- |
| 15 |
1 file changed, 19 insertions(+), 28 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-editors/gedit/gedit-9999.ebuild b/app-editors/gedit/gedit-9999.ebuild |
| 18 |
index 9497a22..ca629cf 100644 |
| 19 |
--- a/app-editors/gedit/gedit-9999.ebuild |
| 20 |
+++ b/app-editors/gedit/gedit-9999.ebuild |
| 21 |
@@ -21,7 +21,9 @@ LICENSE="GPL-2+ CC-BY-SA-3.0" |
| 22 |
SLOT="0" |
| 23 |
|
| 24 |
IUSE="+introspection +python spell vala" |
| 25 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 26 |
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas |
| 27 |
+# we need to fix that |
| 28 |
+REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )" |
| 29 |
if [[ ${PV} = 9999 ]]; then |
| 30 |
IUSE="${IUSE} doc" |
| 31 |
KEYWORDS="" |
| 32 |
@@ -51,14 +53,14 @@ COMMON_DEPEND=" |
| 33 |
>=x11-libs/gtk+-3:3[introspection] |
| 34 |
>=x11-libs/gtksourceview-3.6:3.0[introspection] |
| 35 |
dev-python/pycairo[${PYTHON_USEDEP}] |
| 36 |
- >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] ) |
| 37 |
+ >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] |
| 38 |
+ dev-libs/libpeas[${PYTHON_USEDEP}] ) |
| 39 |
spell? ( |
| 40 |
>=app-text/enchant-1.2:= |
| 41 |
>=app-text/iso-codes-0.35 ) |
| 42 |
" |
| 43 |
RDEPEND="${COMMON_DEPEND} |
| 44 |
x11-themes/gnome-icon-theme-symbolic |
| 45 |
- python? ( dev-libs/libpeas[${PYTHON_USEDEP}] ) |
| 46 |
" |
| 47 |
DEPEND="${COMMON_DEPEND} |
| 48 |
${vala_depend} |
| 49 |
@@ -78,35 +80,27 @@ if [[ ${PV} = 9999 ]]; then |
| 50 |
app-text/yelp-tools" |
| 51 |
fi |
| 52 |
|
| 53 |
+pkg_setup() { |
| 54 |
+ use python && [[ ${MERGE_TYPE} != binary ]] && python_setup |
| 55 |
+} |
| 56 |
+ |
| 57 |
src_prepare() { |
| 58 |
vala_src_prepare |
| 59 |
gnome2_src_prepare |
| 60 |
- |
| 61 |
- python_copy_sources |
| 62 |
} |
| 63 |
|
| 64 |
src_configure() { |
| 65 |
- local myconf="" |
| 66 |
- [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" |
| 67 |
DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README" |
| 68 |
|
| 69 |
- local myconf |
| 70 |
- myconf=" |
| 71 |
- --disable-deprecations |
| 72 |
- --enable-updater |
| 73 |
- --enable-gvfs-metadata |
| 74 |
- $(use_enable introspection) |
| 75 |
- $(use_enable spell) |
| 76 |
- $(use_enable vala) |
| 77 |
- $(use_enable python) |
| 78 |
+ gnome2_src_configure \ |
| 79 |
+ --disable-deprecations \ |
| 80 |
+ --enable-updater \ |
| 81 |
+ --enable-gvfs-metadata \ |
| 82 |
+ $(use_enable introspection) \ |
| 83 |
+ $(use_enable spell) \ |
| 84 |
+ $(use_enable vala) \ |
| 85 |
+ $(use_enable python) \ |
| 86 |
ITSTOOL=$(type -P true) |
| 87 |
- " |
| 88 |
- |
| 89 |
- if use python ; then |
| 90 |
- python_parallel_foreach_impl gnome2_src_configure ${myconf} |
| 91 |
- else |
| 92 |
- gnome2_src_configure ${myconf} |
| 93 |
- fi |
| 94 |
} |
| 95 |
|
| 96 |
src_test() { |
| 97 |
@@ -118,9 +112,6 @@ src_test() { |
| 98 |
} |
| 99 |
|
| 100 |
src_install() { |
| 101 |
- if use python ; then |
| 102 |
- python_foreach_impl gnome2_src_install |
| 103 |
- else |
| 104 |
- gnome2_src_install |
| 105 |
- fi |
| 106 |
+ # manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations |
| 107 |
+ gnome2_src_install pyoverridesdir="$(python_get_sitedir)/gi/overrides" |
| 108 |
} |
Archives