gentoo resync : 06.08.2019

3 files changed, 24 insertions, 14 deletions

diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index a1835afc2ade..8edffe8c5a21 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -2,6 +2,6 @@ DIST gnumeric-1.12.39.tar.xz 20040688 BLAKE2B 5d99da20b567a939208881b962de3c79ab
 DIST gnumeric-1.12.43.tar.xz 18033636 BLAKE2B 32cbbefc10c0537b02b56564ed37f03d69d0865e9bd16dc8cb77aacf682087fce60f01a2e70b5dbef4d73840b6ccbe198d3c5cc5f13b0f1b2a48d0af635e607f SHA512 d2702000e6c4f4c0c7ff442a2b81e10f4d55f0cffbf7b7f1e7c9fed98fb46172b0118ca05102aa53fb4f953799e2be3534f0518b025ece26647ce67b870a34a7
 DIST gnumeric-1.12.44.tar.xz 18010384 BLAKE2B 0348714a7dae119b36a6739ea499bc0411416637fe9cbd703024f4cdcdb894e2d4b0da3212ea6e2ad1dd81f893c96341722c83ef014db7f0a6f2a048696f41c6 SHA512 ea21dcdf5fdf4e02bb9d83671675f2409f12ee928611604d7589e0047ce5d75bf6ac51e6a5322c4af520428acdccf4c2b3b8e3fc6530030e162268aea94a503f
 EBUILD gnumeric-1.12.39.ebuild 1478 BLAKE2B 09c3f7ef78dccdd75dd66a90ef4a03395ec99e622b18a8538f5b83a6161651d1195d357ad88233a38dd272c31541dbd30947804eaf9e72919505aeb95b4b215b SHA512 fbe626756b95c7e6dc7ae870390d7bda2448caec9056d7083dc66534603e6e16a0b8c69dde18e4727719c2c4aadb32d63f7a5aa848016d04c1f5586acb70a72f
-EBUILD gnumeric-1.12.43.ebuild 1832 BLAKE2B f2b87cce66479a727d60538aa28c1377e2ab9fcf963e7b026f0e5b6160bdda6c0656d0fdbb54a76a2932f392ae5d8c4539fdec3a1a6f12ce070638efe5b85652 SHA512 7e44d00c1410aef8aafccaeebeef439e697c8ade4758753743e6734bdadef3dccc9a293c9fa88aec517e36b1bd807ce064c3b52122076937a41572086f3a9d48
-EBUILD gnumeric-1.12.44.ebuild 1832 BLAKE2B f2b87cce66479a727d60538aa28c1377e2ab9fcf963e7b026f0e5b6160bdda6c0656d0fdbb54a76a2932f392ae5d8c4539fdec3a1a6f12ce070638efe5b85652 SHA512 7e44d00c1410aef8aafccaeebeef439e697c8ade4758753743e6734bdadef3dccc9a293c9fa88aec517e36b1bd807ce064c3b52122076937a41572086f3a9d48
+EBUILD gnumeric-1.12.43.ebuild 1940 BLAKE2B 2f4f3e68a5d63579e0aa32db5ff71087cdb1fb5783d2512d27e91cd58a1431e38c79801a70fc904f855c21c76227e4da6db6fa5de3732336449e4c0e54705a5b SHA512 72a3ee9d1e40609ee95c65c406b96109bbc38733ff2b5fc461743c65f7d5c2058218369c002b298de9c3b266a45cc0942c7711531a3dc2b6b420bc2e40a54c54
+EBUILD gnumeric-1.12.44.ebuild 1940 BLAKE2B 2f4f3e68a5d63579e0aa32db5ff71087cdb1fb5783d2512d27e91cd58a1431e38c79801a70fc904f855c21c76227e4da6db6fa5de3732336449e4c0e54705a5b SHA512 72a3ee9d1e40609ee95c65c406b96109bbc38733ff2b5fc461743c65f7d5c2058218369c002b298de9c3b266a45cc0942c7711531a3dc2b6b420bc2e40a54c54
 MISC metadata.xml 465 BLAKE2B c246609f5d6b20c968faeb36a0c6e33df41ae8a373360ed003541fdf816ff9399f62ababfc4aea5c557bcf9dac83a71357ce9e789ca08d94e83cdeda83aaa275 SHA512 753783aee82021a573093a0ecb7807bdf56d037032fb1afa5559db44b1d06f72bdf9aedfead48cae9917d78aaa7c39d19e528946ef45b51fd6cf5357b9b020fa
diff --git a/app-office/gnumeric/gnumeric-1.12.43.ebuild b/app-office/gnumeric/gnumeric-1.12.43.ebuild
index ed6ea6ba93b7..903ec136a3a5 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 ed6ea6ba93b7..903ec136a3a5 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
 }