gentoo resync : 24.12.2018

3 files changed, 2 insertions, 56 deletions

diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 088a37e4dd5f..44b83825892e 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,8 +1,6 @@
 AUX 0.10.43-unittest-build-failure.patch 545 BLAKE2B 9157ee511bbc09a7cf9d091a4fc57250a533b8028e69dc3ace6d4b10ce6809b7f7d9fa1941505c12cba943657636bd69ad94a52f8c0bfbc5fa1e17ebced5b6c2 SHA512 2f0a4485a458efc7ad0c77ab8ada1cb1833834b1eb3fe3f0d623f963ba65555c5af53b9dbbcf9b1b75d54f19c3873820c839468b361ffca28e6734adab7c3ecb
-DIST goffice-0.10.38.tar.xz 2373308 BLAKE2B f270233adbbf300ad41516b1ed988db0772b95940196a6ac92c3090f6e52bc47933bb6bb4c023d7137cbca42adfab17fc41b82042c2e9c0340a6cd84942874e5 SHA512 1d72e30ee0b9f322cd4114d0a024a99e6d9ff7efcaeb9ca40b5fffe94180c232f03935743c15b1c6170f8bfc04fea5bdcc4d12760643c66cffafefbaa562fd62
 DIST goffice-0.10.41.tar.xz 2381656 BLAKE2B 7d73b892d91f917e3a47058f508094a16bb50860686dcf33c68ac8028b40e7ba74cc276f276672f29ddafef73b03887cf6280a2812305bd9b24ae3021c319d25 SHA512 d4b6a30b2b5d92e7500a1810626d20a2d4e5f66c1a879c904fe57df384bf4a480de322e9ae0a5fe7a44e73e060d9a33da6d56cd051c3d6cb1ebf0eae09fda2f8
 DIST goffice-0.10.43.tar.xz 2381804 BLAKE2B 60e305620118f80595a0dfec8192648273f845c9f868142adb957796ee291e1e53b0f3d3f2446064d8014ec54e7008ac03eca7f2f4925efa00ff42b98810371b SHA512 979ccf67fe08d09a2cf0413b4674a44208aa5f4802ab086a463ea2b449fc8c9d1c96dea7234c8e715064cf1726a47d2a5428728a2ff0d00759d5fe7017dc709f
-EBUILD goffice-0.10.38.ebuild 1254 BLAKE2B c412e0ae4ae8ada5a7d199313d915f7d4d9a1aead9742c271f9e741ec5d18159103cfd5396114b16f707647019eb6ae05bb7ca094d0ed4f805de7324c3bb5c77 SHA512 dd8935ebd5ecee474ab3057a440c622791aa83ee7a641c063f81b9c20cf207be766fcb468ad0c2d564af365606b810847b3bb7f167eaa472c1a7b18a4ccc8c28
-EBUILD goffice-0.10.41.ebuild 1256 BLAKE2B 0898222d5e823217463395ebeae4873563b16303bfc8dfb5f9b589c9dee4503d6fee42d422bfcd3fa622c5982f801613b19593e6ef88a18f611df0be0bbbd0b3 SHA512 a0df898947688fcad9e1d42df6cebaff68dc9e24cffe9ad3b97a441b28d61c318ce88ea95aa9833c032399ce02ac76e3f16334c0262d5c88e032fc43d0817793
+EBUILD goffice-0.10.41.ebuild 1254 BLAKE2B c412e0ae4ae8ada5a7d199313d915f7d4d9a1aead9742c271f9e741ec5d18159103cfd5396114b16f707647019eb6ae05bb7ca094d0ed4f805de7324c3bb5c77 SHA512 dd8935ebd5ecee474ab3057a440c622791aa83ee7a641c063f81b9c20cf207be766fcb468ad0c2d564af365606b810847b3bb7f167eaa472c1a7b18a4ccc8c28
 EBUILD goffice-0.10.43.ebuild 1380 BLAKE2B dae0ddb7c21e019690acb465722c91c124500972adba3e83eef6494270e55b8cb17428ee77fe67eadefd6d3623304a8d98c70a7101649b07c4077cc862c25b9b SHA512 84e08ab7de38952c5f409666d80d90e9430b93a64708549adb8576bff7b652b8c235aac400c3712b6ec816e5728a39d8997dbb77d7cc63c9d546902d77a3f20c
 MISC metadata.xml 441 BLAKE2B d1239d813165b887ed43610e0b9a09afd739164ecf52a0b6a94e957550b5dec5e18dbf5777e4b7bf8e1d665edf89bc5777ad90ebd93caeab5af6fc2882eb3469 SHA512 69e822f6c8ecb89ae952b30074c2527e8283eeabe32ac6555d043576b21d0f5a40b968b0211574ce8b1836dac85370070ee86905551bdd8cf2418cdc2ac6c3ce
diff --git a/x11-libs/goffice/goffice-0.10.38.ebuild b/x11-libs/goffice/goffice-0.10.38.ebuild
deleted file mode 100644
index 6ce1d66a8ebc..000000000000
--- a/x11-libs/goffice/goffice-0.10.38.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 ~x86-fbsd ~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.41.ebuild b/x11-libs/goffice/goffice-0.10.41.ebuild
index 75c08021059d..6ce1d66a8ebc 100644
--- a/x11-libs/goffice/goffice-0.10.41.ebuild
+++ b/x11-libs/goffice/goffice-0.10.41.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree