gentoo Easter resync : 12.04.2020

5 files changed, 2 insertions, 137 deletions

diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 922c794cf6e2..f9034f6044cd 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,8 +1,3 @@
-AUX 0.10.43-unittest-build-failure.patch 545 BLAKE2B 9157ee511bbc09a7cf9d091a4fc57250a533b8028e69dc3ace6d4b10ce6809b7f7d9fa1941505c12cba943657636bd69ad94a52f8c0bfbc5fa1e17ebced5b6c2 SHA512 2f0a4485a458efc7ad0c77ab8ada1cb1833834b1eb3fe3f0d623f963ba65555c5af53b9dbbcf9b1b75d54f19c3873820c839468b361ffca28e6734adab7c3ecb
-DIST goffice-0.10.41.tar.xz 2381656 BLAKE2B 7d73b892d91f917e3a47058f508094a16bb50860686dcf33c68ac8028b40e7ba74cc276f276672f29ddafef73b03887cf6280a2812305bd9b24ae3021c319d25 SHA512 d4b6a30b2b5d92e7500a1810626d20a2d4e5f66c1a879c904fe57df384bf4a480de322e9ae0a5fe7a44e73e060d9a33da6d56cd051c3d6cb1ebf0eae09fda2f8
-DIST goffice-0.10.43.tar.xz 2381804 BLAKE2B 60e305620118f80595a0dfec8192648273f845c9f868142adb957796ee291e1e53b0f3d3f2446064d8014ec54e7008ac03eca7f2f4925efa00ff42b98810371b SHA512 979ccf67fe08d09a2cf0413b4674a44208aa5f4802ab086a463ea2b449fc8c9d1c96dea7234c8e715064cf1726a47d2a5428728a2ff0d00759d5fe7017dc709f
 DIST goffice-0.10.46.tar.xz 2397976 BLAKE2B a05696cde60b1cb1ee915bebd3a6e99d1f0a31dc232481615a1c6bbc05ee5433cdebfb05d96160026b260c752c2cfb11c0aecc338079cda66fd40b653fb8b0d1 SHA512 23714fef4dabccc76fe96b78d8eba9c9adb01cb9b3e2f1a9768598fb2a82742b2d2060a7d2548279998488c59e313d7a5863a96b2eb380f540b61fb08e0330f3
-EBUILD goffice-0.10.41.ebuild 1244 BLAKE2B 4d077c53840c1be6be76cd262fa4c1b9798861a429d5c1d4f9441e6f38e83162e24b478721b1dc14e9445582dddd2402a6fcc1d95da991f1da6f5f4d3c84535b SHA512 22a5e59c0b30d031841849c89dbc8258fd9bdd55b62aed930727fc4c33482672b8b464fc0d57f35ee9b0b2ed68f0dc1372d3093da81f3fb2747abc2845372f6f
-EBUILD goffice-0.10.43.ebuild 1370 BLAKE2B 7a40e2ca6b0cff35e67066879d46353979ad0549888672a5afcac8629fb892b037a4b8f12d6a4b7092bbeda9b9e70727b3486b72a4f34689ecd26c9e45757635 SHA512 e068b527f8b5438101310b27b7bccda66ce68dac8c82b8cd1c39ee6b8f99f6c84e349acf15615f67f62cd2c0a09366239501c5732981ac8337565ca2e0c82af0
-EBUILD goffice-0.10.46.ebuild 1435 BLAKE2B 21b3248acb696e0110696071828797afe67d49952a4a3a43acef2c016eea09020309837cb8ce418c19a0a345721614b57f56da5ccf971a4fcdcfef7b806412d3 SHA512 992c2f665ee577dd8b459f7e2b7a83c720c4150ce9e5ee9b7f5639fbcb7feeb14c0549bc9040995c0f9f0e21c558273872de9d62c015597a5befb791d411ea2d
+EBUILD goffice-0.10.46.ebuild 1433 BLAKE2B 27245a4417af2d02a716e2a1d15150e51cec6ff313bf3e71672fa9c65bba7002f5caaa43ced59f322ed22e8ae50b98ffebadff79e6acbae18e1636c38dea5c9b SHA512 2e86d28586e2fc09a316f601d123d6dafbc3f66be7a933d3560584ac0474bc773f5d63bbf1e0dd25bd8052aacaa5202a3c1f02ff1df221c71703eee0ef01c655
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/files/0.10.43-unittest-build-failure.patch b/x11-libs/goffice/files/0.10.43-unittest-build-failure.patch
deleted file mode 100644
index 8b9e89c3cf13..000000000000
--- a/x11-libs/goffice/files/0.10.43-unittest-build-failure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 54098b6cd7dddc573b937f45048dd8a434f581af Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 17 Nov 2018 16:30:30 +0100
-Subject: [PATCH] Add missing string.h include
-
----
- tests/test-quad.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/test-quad.c b/tests/test-quad.c
-index 49d751e8..379d91ed 100644
---- a/tests/test-quad.c
-+++ b/tests/test-quad.c
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include <goffice/goffice.h>
- 
- // A rather expensive way of forcing the compiler to drop any excess
--- 
-2.19.1
-
diff --git a/x11-libs/goffice/goffice-0.10.41.ebuild b/x11-libs/goffice/goffice-0.10.41.ebuild
deleted file mode 100644
index bf0f4ec8c4be..000000000000
--- a/x11-libs/goffice/goffice-0.10.41.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://git.gnome.org/browse/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.38.0:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24:=
-	>=x11-libs/cairo-1.10:=[svg]
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.20:3
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:= )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/perl-Compress-Raw-Zlib
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
diff --git a/x11-libs/goffice/goffice-0.10.43.ebuild b/x11-libs/goffice/goffice-0.10.43.ebuild
deleted file mode 100644
index c6f1937ccbd7..000000000000
--- a/x11-libs/goffice/goffice-0.10.43.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libxml2-2.4.12:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[introspection?]
-	>=x11-libs/cairo-1.10:=[svg]
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.20:3
-	>=x11-libs/pango-1.24:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:= )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/perl-Compress-Raw-Zlib
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# https://gitlab.gnome.org/GNOME/goffice/merge_requests/2
-	"${FILESDIR}"/${PV}-unittest-build-failure.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
diff --git a/x11-libs/goffice/goffice-0.10.46.ebuild b/x11-libs/goffice/goffice-0.10.46.ebuild
index 12d2ce5eb098..e6023df8247a 100644
--- a/x11-libs/goffice/goffice-0.10.46.ebuild
+++ b/x11-libs/goffice/goffice-0.10.46.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree