gentoo resync : 20.03.2022

3 files changed, 4 insertions, 99 deletions

diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index d1077cf773c7..6623fffc12b0 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,3 @@
-DIST gnumeric-1.12.50.tar.xz 18062104 BLAKE2B 46d15e5fe540cce904de07b263707d7fd8c29d9a2611105cdb117a3acd6693651e588b4d281038b48fbc36bba100d162c2c2ab1be589ea206272155cbd9046df SHA512 d5896cb8390c99fb3871c722116cc085b93b788fab91bf44d24f20228b8290170a0adc906160a6aa46431ae43b04079621c370dcda42658fa9ae3c1d8baf1730
 DIST gnumeric-1.12.51.tar.xz 18117120 BLAKE2B 7d30dc01cda93a99ef8d47ccdf6bcfd1b6b6964a806599c7ade486f9bbfb61a876ef942174425cb2f59e018f5ec95a9df36a9deb0cd67d23e1801c2c289d83bd SHA512 c46164d9deb29831ab059613548743d84cb15461ac363305a28097832eb69d3fbf3cf8784c420c777bd09e32212b2ef6237bfa56ca28a7e08fd3befde9dfed36
-EBUILD gnumeric-1.12.50.ebuild 2292 BLAKE2B 2275ed4505ea2616dc9009517949d38df177f882b6ce283bc79069e3c94260d419f6b22d798a8431f3130a63cdfb565ce80541f8c8822c253158ba9d6d838225 SHA512 77cc54a618e47a3d9942bec85edefa18947c97891d2a60f28b629a554a02d80b8c2a73292f4a2e3385fd7e67df7de37614aa6002dd59118ae911241498aba7ca
-EBUILD gnumeric-1.12.51.ebuild 2293 BLAKE2B db7d57d45a050d7f3be9d5c929b40fa1d9b896e5d239d18d6d31cc267d3650181060d759117793ac692335c47ddac8e54e057291f96cb0f17d2ac214481ad88c SHA512 104ee61620b59326211a0d8cf89e6c7cebc5a7689c08fbe4e673ac3c8d0f6bb9befb6153d9d0fe5a8e2ec35de4a31598a1ed31c038137f56531c20cc387daf2f
+EBUILD gnumeric-1.12.51.ebuild 2309 BLAKE2B 40e79edb5acf501740a1c696a66bdafce95ca17743689fcc8c0355608984c53b4e764097aa6c89f2ab52c58b2f726bd74489814a82413f59c35d30e2293d80af SHA512 d569f16ab5f01fd5d849bf927731071cce53da85817cb4371fe1888f6be6f3d9093dfe7d9b9c301a8f19f150b0ab69f70c9b04038c7e2f80a1eae1493d3a817f
 MISC metadata.xml 520 BLAKE2B cdd4d61e6b2192b820c122370c47ea2ff0c8b4130474a1273f59ccb83d74decccc174632d0a605b17c5d2efd3312409f4afeb45b66adb332b5c5b1fbce305ef9 SHA512 50a15120cea4f1b2cdadac5819bd215175fb4e9e468647f2228b229c1b50fc01c3a35f125b2404ab0c45e4174c028e39873bb91c8a53f7cbb8d0ec488b5c96e7
diff --git a/app-office/gnumeric/gnumeric-1.12.50.ebuild b/app-office/gnumeric/gnumeric-1.12.50.ebuild
deleted file mode 100644
index a310f83e4fd8..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.50.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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/gnumeric/gnumeric-1.12.51.ebuild b/app-office/gnumeric/gnumeric-1.12.51.ebuild
index dbab1a8b51de..0a1e06a80140 100644
--- a/app-office/gnumeric/gnumeric-1.12.51.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.51.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit gnome.org libtool python-r1 xdg
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -35,7 +35,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=dev-libs/glib-2.40.0:2
 	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.51:0.10
+	>=x11-libs/goffice-0.10.51:0.10[introspection?]
 	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.24.0:=