gentoo resync : 29.12.2022

4 files changed, 47 insertions, 98 deletions

diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 10b3a5bad609..20bf0625a444 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,4 @@
-DIST gnumeric-1.12.51.tar.xz 18117120 BLAKE2B 7d30dc01cda93a99ef8d47ccdf6bcfd1b6b6964a806599c7ade486f9bbfb61a876ef942174425cb2f59e018f5ec95a9df36a9deb0cd67d23e1801c2c289d83bd SHA512 c46164d9deb29831ab059613548743d84cb15461ac363305a28097832eb69d3fbf3cf8784c420c777bd09e32212b2ef6237bfa56ca28a7e08fd3befde9dfed36
+AUX gnumeric-1.12.52-slibtool.patch 1489 BLAKE2B aff4a76659bbe81f178baeadea9967870e6a5c38f960bce1287951056eae038cf3c34c7f1e8f7b65aa5999ec9a1474d9e8732b89d432b68ce015dcc96d7a0c27 SHA512 805507509d8fa5702734b74f7c3004001ab3c84e22e14773025b2b53015d3b01bb8acfe7094812e5ad4fac73f8c3e04f2a1d78f99f619bf0f16607d2da0f02aa
 DIST gnumeric-1.12.52.tar.xz 18115444 BLAKE2B 6d8489c27b6f7bd0ffad7d255b606a48ca9660dd38973e4bb529d38797a3029db4a0a399e40f69c84ddf33b96d27cfc184fd079fbe16590b92e056c1a836b037 SHA512 3baa2d2c4ed5f740429454f988ea527991febf38f49df17f0d88affe501c676bae95149fb0cdb4b369ef8d32247c1f4fe4c0eeab9a60329e1332aaf9c566f868
-EBUILD gnumeric-1.12.51.ebuild 2316 BLAKE2B 396826ed17b3c86f49fa45163a0bb9172244d07dd26d9da820aed2e097d35cb2a7469588a8390745d2920c5d777c81f2448574cd019dbf8d7ca0e223033a8b97 SHA512 b6e6e0f6a766f3cc0044ec591110b894947b94d86778bb6b61f8cc6b72a13c7334dee87dace6eb92467d9f277def9a4f6a668e23a1e6595f8e1cf3795551422d
-EBUILD gnumeric-1.12.52.ebuild 2317 BLAKE2B 56ec6870ab4f38789b680dff6266e71561b6158fff409a909bc882ca6e5c95e7b61037b2ecbcec464c0330fa00ecfee688783b45eb71a41a1ebdcf536eb96367 SHA512 1b66c60a85843c1e5ec6021309846bf4a666685c022d4c9ebdd07a50de6d3817d93c0093857fbb0af345e22d7d00946fb2329778529051dea778083adfde9317
+EBUILD gnumeric-1.12.52.ebuild 2423 BLAKE2B 760e90aa2225771c84c6ba69fe018e6f74a832cbadd6d49b9068d9d2d7ac6cd659877fff1b6535a4a345f3b798d517ea5ba884112a7bf487f29c41ddbe601e7b SHA512 8140135fa451576eb3a80d561a96c5d723c46950d5c8c774356384bdac46b8ed42448a499a91384b1c4d92f35968b862a72108c66aeed6d48d7dec10ab23bffd
 MISC metadata.xml 520 BLAKE2B cdd4d61e6b2192b820c122370c47ea2ff0c8b4130474a1273f59ccb83d74decccc174632d0a605b17c5d2efd3312409f4afeb45b66adb332b5c5b1fbce305ef9 SHA512 50a15120cea4f1b2cdadac5819bd215175fb4e9e468647f2228b229c1b50fc01c3a35f125b2404ab0c45e4174c028e39873bb91c8a53f7cbb8d0ec488b5c96e7
diff --git a/app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch b/app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch
new file mode 100644
index 000000000000..43e869afa7a9
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.12.52-slibtool.patch
@@ -0,0 +1,36 @@
+Upstream-PR: https://gitlab.gnome.org/GNOME/gnumeric/-/merge_requests/25
+From 3031cc85718dde12a34be46330ef3b8c885f4f9e Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 10 May 2022 15:52:57 -0700
+Subject: [PATCH] plugins/excelplugins: Remove erroneous .libs
+
+The .libs directory is for internal usage by the libtool
+implementation only.
+
+When build gnumeric with slibtool instead of GNU libtool this
+will be a failure where slibtool is far more strict about user
+errors.
+
+rdlibtool: error logged in slbt_exec_link_create_dep_file(), line 1091: path not found: ../../src/.libs/.libs/libspreadsheet.a.disabled.
+
+Gentoo Bug: https://bugs.gentoo.org/791610
+---
+ plugins/excelplugins/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/excelplugins/Makefile.am b/plugins/excelplugins/Makefile.am
+index 3bc8f70b0..91e2fa765 100644
+--- a/plugins/excelplugins/Makefile.am
++++ b/plugins/excelplugins/Makefile.am
+@@ -7,7 +7,7 @@ gnumeric_plugin_excelpluginsdir = $(gnumeric_plugindir)/excelplugins
+ xmldir = $(gnumeric_plugin_excelpluginsdir)
+ gnumeric_plugin_excelplugins_LTLIBRARIES = plugin.la xlcall32.la
+ plugin_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS)
+-plugin_la_LIBADD = ../../src/.libs/libspreadsheet.la
++plugin_la_LIBADD = ../../src/libspreadsheet.la
+ plugin_la_SOURCES = excelplugins.c
+ xlcall32_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS)
+ xlcall32_la_SOURCES = xlcall32_emulation.c win32replacements.h xlcall.h
+-- 
+GitLab
+
diff --git a/app-office/gnumeric/gnumeric-1.12.51.ebuild b/app-office/gnumeric/gnumeric-1.12.51.ebuild
deleted file mode 100644
index 0f66f166e970..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.51.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{7..10} )
-
-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 ~riscv ~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.51:0.10[introspection?]
-	>=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.52.ebuild b/app-office/gnumeric/gnumeric-1.12.52.ebuild
index b11b523b71ae..1f8d25865c92 100644
--- a/app-office/gnumeric/gnumeric-1.12.52.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.52.ebuild
@@ -4,14 +4,14 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit gnome.org libtool python-r1 xdg
+inherit autotools gnome.org python-r1 xdg
 
 DESCRIPTION="The GNOME Spreadsheet"
 HOMEPAGE="http://www.gnumeric.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -56,12 +56,18 @@ BDEPEND="
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-slibtool.patch" # 791610
+)
+
 src_prepare() {
 	default
 
 	# Manage gi overrides ourselves
 	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
-	elibtoolize
+
+	# Changed from 'elibtoolize' for bug # 791610
+	eautoreconf
 }
 
 src_configure() {