gentoo (valentine's day) resync : 14.02.2021

3 files changed, 2 insertions, 97 deletions

diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 9437377b02d7..ae5fc60ad946 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,5 +1,3 @@
-DIST gnumeric-1.12.47.tar.xz 18309764 BLAKE2B 8b800a6749d208a445abfc7189618abb20907118f274b313cf81436ab3665d50edeab4c49b03adea505448138bd32b8d3efcd041eba54342d9fb293c574cac08 SHA512 f6298fee752b062672acc20e18388d7424719d69ce9586888f33be07ca92bbd7d99e46b98e9ab2a546d1954d3113b59a5105d46c4e8a13e65e1ae9acc38391ab
 DIST gnumeric-1.12.48.tar.xz 18329300 BLAKE2B f38fdc14dbe2b45fa3c2ebbfb94d89c85f6c04bdc95b493a760a23ba347fa99d2515f0e7fc0a2f45e31c3f2a3b0c8b425b0fb876f59215e2da76348c5dbe116a SHA512 6c17e95ecd88b43da0f4f23d9c99dad5d0016f9618570a36be5998fa84c144bb5d13749fd9c4fe0c295e3c80d70c717d09763cc9904dfc1df062b96749b73ebc
-EBUILD gnumeric-1.12.47.ebuild 2291 BLAKE2B ed25d561db052c0e3e564e0cdc67fa43eec7f75a867ba73d2f3f10ca442b4cd969c23080f16baeecbb58b20f10e82209f2f7dbf25725a2108aa71bd9c2b2ce9a SHA512 24db0c199bacbb8465afcc621dd3184c921ae8983ecf0825c137f57bb82822a1a49b7a4537858f3ae76cb5c150bce91eebe1f79187ea75479b70ca738f6cf155
-EBUILD gnumeric-1.12.48.ebuild 2292 BLAKE2B 8da0b4576774b4378510a8b23db46418aac3cbdb2811c6f79ac39240bc00f17c710fd1a527f5f76b54c81e99187fc918755fef048855197c2c3c4a2ab40b7f70 SHA512 ea5808269286907cd769b47cb69047a312fda27248b2ba21a61ad027b0d8db70cb5000fd8205a59e6971774a998a530299bcb1dcc802fb943099894794b53484
+EBUILD gnumeric-1.12.48.ebuild 2291 BLAKE2B 6ec480c124408a9e6c363fd7bd4c51788b9defdd9f3f2fe0300abb9b7c8d8d0dddb89ca9150d29fd3988932b2154346619b996c63fad667d1742b3f17daf6e2d SHA512 727e3d3eef41262f03c01b6241b9f0642f27dea13fed43ce563a908467ef110f999c2c39810395d352dddd28e10b300e3c6e6ee04eaa52d75851eef64259f0e9
 MISC metadata.xml 519 BLAKE2B 07b0ba6ff606de990d5fb97de46aa20f0581ab63f789f2238446e6f87dc93283a0873dfec3ee4a3fd38372aa3fa17e50349abffbd5eb5cc73d4cbdbffe1e5592 SHA512 a03730e0ccc7c2fb4df57f0d63da93e9254c8df99594a26215ff9919302919eb0bfdd21622b9d73f84011c5cd28397cc0b5b2add2fce0624d7a59fc1877601d3
diff --git a/app-office/gnumeric/gnumeric-1.12.47.ebuild b/app-office/gnumeric/gnumeric-1.12.47.ebuild
deleted file mode 100644
index 3be600af38b6..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.47.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 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.46: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 "${D}" -name '*.la' -delete || die
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.48.ebuild b/app-office/gnumeric/gnumeric-1.12.48.ebuild
index a1ef3b1c5e5f..58fec4bc381c 100644
--- a/app-office/gnumeric/gnumeric-1.12.48.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.48.ebuild
@@ -12,7 +12,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} )"