| 1 |
commit: 6eb1fb6129b4297b07ecb003e36f1d84b9c6486f |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 13 07:58:09 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 6 07:26:16 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb1fb61 |
| 7 |
|
| 8 |
app-office/gnumeric: Improve Python support |
| 9 |
|
| 10 |
Add missing PYTHON_REQUIRED_USE and PYTHON_DEPS for gi.overrides |
| 11 |
install. While at it, make it conditional to USE=introspection. |
| 12 |
Reduce deps for USE=python to Python 2 variants. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/690552 |
| 15 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/12691 |
| 17 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 18 |
|
| 19 |
app-office/gnumeric/gnumeric-1.12.43.ebuild | 17 +++++++++++------ |
| 20 |
app-office/gnumeric/gnumeric-1.12.44.ebuild | 17 +++++++++++------ |
| 21 |
2 files changed, 22 insertions(+), 12 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-office/gnumeric/gnumeric-1.12.43.ebuild b/app-office/gnumeric/gnumeric-1.12.43.ebuild |
| 24 |
index ed6ea6ba93b..903ec136a3a 100644 |
| 25 |
--- a/app-office/gnumeric/gnumeric-1.12.43.ebuild |
| 26 |
+++ b/app-office/gnumeric/gnumeric-1.12.43.ebuild |
| 27 |
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 28 |
|
| 29 |
IUSE="+introspection libgda perl python" |
| 30 |
# python-loader plugin is python2.7 only |
| 31 |
-REQUIRED_USE="python? ( $(python_gen_useflags -2) )" |
| 32 |
+REQUIRED_USE=" |
| 33 |
+ introspection? ( ${PYTHON_REQUIRED_USE} ) |
| 34 |
+ python? ( || ( $(python_gen_useflags -2) ) )" |
| 35 |
|
| 36 |
# Missing gnome-extra/libgnomedb required version in tree |
| 37 |
# but its upstream is dead and will be dropped soon. |
| 38 |
@@ -37,9 +39,10 @@ RDEPEND=" |
| 39 |
>=x11-libs/gtk+-3.8.7:3 |
| 40 |
x11-libs/cairo:=[svg] |
| 41 |
|
| 42 |
- introspection? ( >=dev-libs/gobject-introspection-1:= ) |
| 43 |
+ introspection? ( ${PYTHON_DEPS} |
| 44 |
+ >=dev-libs/gobject-introspection-1:= ) |
| 45 |
perl? ( dev-lang/perl:= ) |
| 46 |
- python? ( ${PYTHON_DEPS} |
| 47 |
+ python? ( $(python_gen_impl_dep '' -2) |
| 48 |
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] ) |
| 49 |
libgda? ( gnome-extra/libgda:5[gtk] ) |
| 50 |
" |
| 51 |
@@ -59,7 +62,7 @@ src_prepare() { |
| 52 |
|
| 53 |
src_configure() { |
| 54 |
if use python ; then |
| 55 |
- python_setup 'python2*' |
| 56 |
+ python_setup -2 |
| 57 |
fi |
| 58 |
gnome2_src_configure \ |
| 59 |
--disable-static \ |
| 60 |
@@ -72,6 +75,8 @@ src_configure() { |
| 61 |
|
| 62 |
src_install() { |
| 63 |
gnome2_src_install |
| 64 |
- python_moduleinto gi.overrides |
| 65 |
- python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py |
| 66 |
+ if use introspection; then |
| 67 |
+ python_moduleinto gi.overrides |
| 68 |
+ python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py |
| 69 |
+ fi |
| 70 |
} |
| 71 |
|
| 72 |
diff --git a/app-office/gnumeric/gnumeric-1.12.44.ebuild b/app-office/gnumeric/gnumeric-1.12.44.ebuild |
| 73 |
index ed6ea6ba93b..903ec136a3a 100644 |
| 74 |
--- a/app-office/gnumeric/gnumeric-1.12.44.ebuild |
| 75 |
+++ b/app-office/gnumeric/gnumeric-1.12.44.ebuild |
| 76 |
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 77 |
|
| 78 |
IUSE="+introspection libgda perl python" |
| 79 |
# python-loader plugin is python2.7 only |
| 80 |
-REQUIRED_USE="python? ( $(python_gen_useflags -2) )" |
| 81 |
+REQUIRED_USE=" |
| 82 |
+ introspection? ( ${PYTHON_REQUIRED_USE} ) |
| 83 |
+ python? ( || ( $(python_gen_useflags -2) ) )" |
| 84 |
|
| 85 |
# Missing gnome-extra/libgnomedb required version in tree |
| 86 |
# but its upstream is dead and will be dropped soon. |
| 87 |
@@ -37,9 +39,10 @@ RDEPEND=" |
| 88 |
>=x11-libs/gtk+-3.8.7:3 |
| 89 |
x11-libs/cairo:=[svg] |
| 90 |
|
| 91 |
- introspection? ( >=dev-libs/gobject-introspection-1:= ) |
| 92 |
+ introspection? ( ${PYTHON_DEPS} |
| 93 |
+ >=dev-libs/gobject-introspection-1:= ) |
| 94 |
perl? ( dev-lang/perl:= ) |
| 95 |
- python? ( ${PYTHON_DEPS} |
| 96 |
+ python? ( $(python_gen_impl_dep '' -2) |
| 97 |
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] ) |
| 98 |
libgda? ( gnome-extra/libgda:5[gtk] ) |
| 99 |
" |
| 100 |
@@ -59,7 +62,7 @@ src_prepare() { |
| 101 |
|
| 102 |
src_configure() { |
| 103 |
if use python ; then |
| 104 |
- python_setup 'python2*' |
| 105 |
+ python_setup -2 |
| 106 |
fi |
| 107 |
gnome2_src_configure \ |
| 108 |
--disable-static \ |
| 109 |
@@ -72,6 +75,8 @@ src_configure() { |
| 110 |
|
| 111 |
src_install() { |
| 112 |
gnome2_src_install |
| 113 |
- python_moduleinto gi.overrides |
| 114 |
- python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py |
| 115 |
+ if use introspection; then |
| 116 |
+ python_moduleinto gi.overrides |
| 117 |
+ python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py |
| 118 |
+ fi |
| 119 |
} |
Archives