gentoo resync : 24.06.2021

6 files changed, 100 insertions, 5 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index b3718f0ca74c..76f7b714bf0c 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 3c3288d750b9..0cb656c2641c 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,3 +1,5 @@
 DIST gnumeric-1.12.49.tar.xz 18057896 BLAKE2B 75ae1683feb7f37cdff4cb5fbec04b0f241e4590236ea68706180853c1a950092bf0d902652d65288b42dba13c384e1ac364cefb32b9d60c37a9948d9d7fc8eb SHA512 047d625aee3a15dd8881f2e11cc7c67d211d40be86ec018517d1b3140ff4bd031fb2cb86e48f1f6ee22432aa1f39c978bad5fd5bf5c6a1be9aa53411136429ed
+DIST gnumeric-1.12.50.tar.xz 18062104 BLAKE2B 46d15e5fe540cce904de07b263707d7fd8c29d9a2611105cdb117a3acd6693651e588b4d281038b48fbc36bba100d162c2c2ab1be589ea206272155cbd9046df SHA512 d5896cb8390c99fb3871c722116cc085b93b788fab91bf44d24f20228b8290170a0adc906160a6aa46431ae43b04079621c370dcda42658fa9ae3c1d8baf1730
 EBUILD gnumeric-1.12.49.ebuild 2292 BLAKE2B b4ed27e762e99bdfb954c4779b442583e4dbfb721af03cd77567073b3673cfa73e7e4bd3b30a03dc9106b034897384a63225b8c31790227d06192aa156110f5e SHA512 c29a402fbb48e7f566203f3bbc85a9be15a152b954f78e5ca155f87862fab5007a69e90c1b7f4a3b9aa03c04183b04f41f5764721601fc1f814640f9db8666c5
+EBUILD gnumeric-1.12.50.ebuild 2294 BLAKE2B 17a7af8994d49197577a7b48014b213f6ea1ba3138d2d6a6ea2f58241d140d6f4c14f277e1bfd6df88d4c3537c3366c6323397817e5d64cf2c57d4c124102d84 SHA512 cc5b717029d0975d6a88064a51a06c6626382c86543de20b6f040b19d4dd37eb97f69e520439f9b395717d432b10902f44195f476b71f91750babe44caaa355e
 MISC metadata.xml 519 BLAKE2B 07b0ba6ff606de990d5fb97de46aa20f0581ab63f789f2238446e6f87dc93283a0873dfec3ee4a3fd38372aa3fa17e50349abffbd5eb5cc73d4cbdbffe1e5592 SHA512 a03730e0ccc7c2fb4df57f0d63da93e9254c8df99594a26215ff9919302919eb0bfdd21622b9d73f84011c5cd28397cc0b5b2add2fce0624d7a59fc1877601d3
diff --git a/app-office/gnumeric/gnumeric-1.12.50.ebuild b/app-office/gnumeric/gnumeric-1.12.50.ebuild
new file mode 100644
index 000000000000..63de219a0b6a
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.12.50.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org libtool python-r1 xdg
+
+DESCRIPTION="The GNOME Spreadsheet"
+HOMEPAGE="http://www.gnumeric.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection libgda perl"
+REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
+
+# Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
+
+# lots of missing files, also fails tests due to 80-bit long story
+# upstream bug #721556
+RESTRICT="test"
+
+# Gnumeric has two python components
+# 1. The python loader for loading python-based plugins.
+#    This component is pure python 2 and a port "is not currently being worked on".
+# 2. The python gobject-based introspection API. This component is compatible
+#    with python 3.
+# Component 1. can only be re-enabled once someone has ported the upstream
+# codebase to python 3.
+# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/glib-2.40.0:2
+	>=gnome-extra/libgsf-1.14.33:=
+	>=x11-libs/goffice-0.10.50:0.10
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24.0:=
+
+	>=x11-libs/gtk+-3.8.7:3
+	x11-libs/cairo:=[svg]
+
+	introspection? (
+		${PYTHON_DEPS}
+		>=dev-libs/gobject-introspection-1:=
+	)
+	perl? ( dev-lang/perl:= )
+	libgda? ( gnome-extra/libgda:5[gtk] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Manage gi overrides ourselves
+	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--disable-static \
+		--without-psiconv \
+		--without-python \
+		--with-zlib \
+		$(use_with libgda gda) \
+		$(use_enable introspection) \
+		$(use_with perl)
+}
+
+src_install() {
+	default
+	dodoc HACKING MAINTAINERS
+
+	if use introspection; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index a4cfb1a092fd..2a491c7bd7ee 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -3,6 +3,6 @@ AUX 0.5-mouse-cursor-fixes2.patch 2299 BLAKE2B 0664740211d33f56f8a55efcec05c89e8
 AUX 0.5-mouse-cursor-fixes3.patch 1431 BLAKE2B 887e3237d57623b12d3b94e67138aa0838f6b5782aeff18abec12a1f6607334cf49dd1bd82d07053a80649a1f3bb7fdcf1c02a9d7b36749a0a45fe8e9f80ce7a SHA512 a353a4bc4d641e973cd50424cfa089a213d3de283b1c61c3aaeb859d2e8f068108d7740b1f3f6935f20142d2500ca0dffcdd570e47e83b9e0d9959da37f3e726
 DIST gtg-0.4.0.tar.xz 3744752 BLAKE2B fdeabe32135dea24ac6113a486650b66b5143aa745117029b03e26e1bb3f2e8629623b26efdae0c8217741a2b4964b5dc060f0e450c05c950e21ea360f3f3823 SHA512 f2677f6bbc0b6cb21b7882a2bd0342b4919581c12e4aa43c13b5dbc48740418c512a41619584d0d75bfa63ebc4a5460abfbc27360e1817c8832cbecf3c34a60e
 DIST gtg-0.5.tar.gz 2229259 BLAKE2B e724cbd015a6f0b6fee62c52283b56244490efb7df4e57b2e30745f58fbc41442b008f5c81b53cfd001f04a92ff53a14e2117d6c12d0d5a35fe49158b5f736fa SHA512 631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a
-EBUILD gtg-0.4.0.ebuild 1329 BLAKE2B a4da48e80920c74e1f7249e5dda2c3cdb2aea8bb636c776053d531da02531a88911e5c28057d6d0963e7ee9d04db9e8ba12f836378c5d830dd5e2829897fc709 SHA512 c1d6f91a67cf4c0b41d462426bd69bcfa12e2f0f605fc06e1848a9b03402f47207d187aca0456495a23dac89c00b770ff9f497de283dfa3c5e490b7e9ea97c1c
-EBUILD gtg-0.5.ebuild 1533 BLAKE2B 45fcf8016cac5030fab3f43f134be6981a154f69836552cf2cec769c90d5be35aeb9edbb9a2ebcb775ffd64962a4544c4c56734e3a05fdbfe128a17f7ac7c8ca SHA512 a0e919aa427440566b866f448d13339faa85b60fadb46d31f797d0c740ea8fb7b3ffdf4722bab094f5776d1f5e91295570a3d9808c7488078120e619614bc8c7
+EBUILD gtg-0.4.0.ebuild 1365 BLAKE2B 1a8fafbc64ddf449930d8494e14c1e602977438dfdae024a5298d0aceebee153781fb99878484498b17020a8be475949552e48ca5e37af71a16cc441c481fd86 SHA512 7d1ac5b538ca7d10e9b5c77134b1426aaef69d16d1386210819be6d39e155014083d8d506d07125444674a4215776f832a884524305bcdc2f56effa58b7bd85d
+EBUILD gtg-0.5.ebuild 1569 BLAKE2B 2dde0c9370f60590019cc6bf464e0882eb5d5cef89ee6eeb71d12e2fae41c33e1a43438eadc6bd6352ac13c27ab52702d0489c319aa637d93ce4caf6fd7bc35b SHA512 3a8e9b98dbbf800c3864270336f8628b789ef1c5198d5d24415c24f7b8d19cb3771be5935700ca051e6083d9f380da5566217a406295defb2dc1ec5a59aa4eba
 MISC metadata.xml 886 BLAKE2B 5f0068ca29003ca7dc9988c6e648076eb612103a30c0d5bbf60faec65c7e859d8546243d42764f2b09c000c37ad05e665646aefc6493288c856e2ee96f3187ff SHA512 9676a4693ee4c934eb22673f80b13fe61531e6c82b821990d070ad7c3b709a416c14741c870c3845e5d49a1b4c91b7c8fd16b7812d5e7466ebf352f53328f945
diff --git a/app-office/gtg/gtg-0.4.0.ebuild b/app-office/gtg/gtg-0.4.0.ebuild
index 135111e7c824..e16de2b4bc69 100644
--- a/app-office/gtg/gtg-0.4.0.ebuild
+++ b/app-office/gtg/gtg-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -40,7 +40,7 @@ BDEPEND="
 			dev-python/cheetah3[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
 		')
-		app-text/pdfjam
+		|| ( app-text/pdfjam >=app-text/texlive-core-2021 )
 		app-text/pdftk
 		dev-texlive/texlive-latex
 	)
diff --git a/app-office/gtg/gtg-0.5.ebuild b/app-office/gtg/gtg-0.5.ebuild
index 90a0833c2d73..665f741c9650 100644
--- a/app-office/gtg/gtg-0.5.ebuild
+++ b/app-office/gtg/gtg-0.5.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 			dev-python/cheetah3[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
 		')
-		app-text/pdfjam
+		|| ( app-text/pdfjam >=app-text/texlive-core-2021 )
 		app-text/pdftk
 		dev-texlive/texlive-latex
 	)