From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1109278-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 39BD5138334
for <garchives@archives.gentoo.org>; Fri, 6 Sep 2019 07:29:16 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 40429E0815;
Fri, 6 Sep 2019 07:29:15 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 111E2E0815
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Sep 2019 07:29:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AD8B034AD1F
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Sep 2019 07:29:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E4C26FE
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Sep 2019 07:29:11 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1567754776.6eb1fb6129b4297b07ecb003e36f1d84b9c6486f.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/gnumeric/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/gnumeric/gnumeric-1.12.43.ebuild app-office/gnumeric/gnumeric-1.12.44.ebuild
X-VCS-Directories: app-office/gnumeric/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 6eb1fb6129b4297b07ecb003e36f1d84b9c6486f
X-VCS-Branch: master
Date: Fri, 6 Sep 2019 07:29:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 60202108-6024-40da-8ea7-a6578e20a885
X-Archives-Hash: 5a00decc0a493a0638553256fb0a8433
commit: 6eb1fb6129b4297b07ecb003e36f1d84b9c6486f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 13 07:58:09 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 6 07:26:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb1fb61
app-office/gnumeric: Improve Python support
Add missing PYTHON_REQUIRED_USE and PYTHON_DEPS for gi.overrides
install. While at it, make it conditional to USE=introspection.
Reduce deps for USE=python to Python 2 variants.
Closes: https://bugs.gentoo.org/690552
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/12691
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-office/gnumeric/gnumeric-1.12.43.ebuild | 17 +++++++++++------
app-office/gnumeric/gnumeric-1.12.44.ebuild | 17 +++++++++++------
2 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/app-office/gnumeric/gnumeric-1.12.43.ebuild b/app-office/gnumeric/gnumeric-1.12.43.ebuild
index ed6ea6ba93b..903ec136a3a 100644
--- a/app-office/gnumeric/gnumeric-1.12.43.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.43.ebuild
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="+introspection libgda perl python"
# python-loader plugin is python2.7 only
-REQUIRED_USE="python? ( $(python_gen_useflags -2) )"
+REQUIRED_USE="
+ introspection? ( ${PYTHON_REQUIRED_USE} )
+ python? ( || ( $(python_gen_useflags -2) ) )"
# Missing gnome-extra/libgnomedb required version in tree
# but its upstream is dead and will be dropped soon.
@@ -37,9 +39,10 @@ RDEPEND="
>=x11-libs/gtk+-3.8.7:3
x11-libs/cairo:=[svg]
- introspection? ( >=dev-libs/gobject-introspection-1:= )
+ introspection? ( ${PYTHON_DEPS}
+ >=dev-libs/gobject-introspection-1:= )
perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS}
+ python? ( $(python_gen_impl_dep '' -2)
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
libgda? ( gnome-extra/libgda:5[gtk] )
"
@@ -59,7 +62,7 @@ src_prepare() {
src_configure() {
if use python ; then
- python_setup 'python2*'
+ python_setup -2
fi
gnome2_src_configure \
--disable-static \
@@ -72,6 +75,8 @@ src_configure() {
src_install() {
gnome2_src_install
- python_moduleinto gi.overrides
- python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+ if use introspection; then
+ python_moduleinto gi.overrides
+ python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+ fi
}
diff --git a/app-office/gnumeric/gnumeric-1.12.44.ebuild b/app-office/gnumeric/gnumeric-1.12.44.ebuild
index ed6ea6ba93b..903ec136a3a 100644
--- a/app-office/gnumeric/gnumeric-1.12.44.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.44.ebuild
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="+introspection libgda perl python"
# python-loader plugin is python2.7 only
-REQUIRED_USE="python? ( $(python_gen_useflags -2) )"
+REQUIRED_USE="
+ introspection? ( ${PYTHON_REQUIRED_USE} )
+ python? ( || ( $(python_gen_useflags -2) ) )"
# Missing gnome-extra/libgnomedb required version in tree
# but its upstream is dead and will be dropped soon.
@@ -37,9 +39,10 @@ RDEPEND="
>=x11-libs/gtk+-3.8.7:3
x11-libs/cairo:=[svg]
- introspection? ( >=dev-libs/gobject-introspection-1:= )
+ introspection? ( ${PYTHON_DEPS}
+ >=dev-libs/gobject-introspection-1:= )
perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS}
+ python? ( $(python_gen_impl_dep '' -2)
>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
libgda? ( gnome-extra/libgda:5[gtk] )
"
@@ -59,7 +62,7 @@ src_prepare() {
src_configure() {
if use python ; then
- python_setup 'python2*'
+ python_setup -2
fi
gnome2_src_configure \
--disable-static \
@@ -72,6 +75,8 @@ src_configure() {
src_install() {
gnome2_src_install
- python_moduleinto gi.overrides
- python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+ if use introspection; then
+ python_moduleinto gi.overrides
+ python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+ fi
}