gentoo resync : 15.01.2020

3 files changed, 3 insertions, 44 deletions

diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 0f8be59cce4a..dc4ea46ce80f 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,7 +1,5 @@
-DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7c3310e40984e482bc5120eae45a7e3ed4cfd878890037f31ee540c700dea3120119b9a533fa79cab317a0c83a8 SHA512 bb487de9358c057fc73f3414c9515726315be9b6d78456253daaca1cbd58281de8766e0b72914532d63fab04d3ae2cf90f711f436c7b4f70620d77e8a7802ac9
 DIST libgsf-1.14.45.tar.xz 618476 BLAKE2B f577859578de6ca359a7377dcced424e95779d3fd155cdbeb1c2874f7a0d0c7a09a2322d2538452b48798ea979e8260be77215140f298dc58ee32a0b9ead0e47 SHA512 2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd
 DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
-EBUILD libgsf-1.14.43.ebuild 990 BLAKE2B 6e3ee69f2a1fafd74d478f3c0e1d57306d8d43ca09374378334fa23ab581adfbebf1d7c0913f029bb751c4b29fd4764118e562bf3f3f841229c666dc60a34d25 SHA512 37cb2f2bf5560b7125cee0a7cc2749101580a1e5b96d7bd7d92dfa32ca587a240d3243a679643eea23a96930d3e0a2452b05a14eb14b9fcdbe78a3791dfcd695
-EBUILD libgsf-1.14.45.ebuild 991 BLAKE2B 7dd006712af212e06cbe10a897483b81e6ebc894abb95d931d70658d81bbe9e1a88aefd1c7804e8a69ce9a4152ff030de8a516bb8e83f2ee5e7515375e8376d5 SHA512 e42718bab319b74dab00e31ef96bdb1498ddcfb717db5b183d4bf887398db71e6d87c886a01032422ac5631a0446b7c5c65efdb801c788feb2188cb757cbcb97
+EBUILD libgsf-1.14.45.ebuild 990 BLAKE2B 09419741750747586c483df2b4d7b25d76b80acb4f01e7122c7c9fe0f382def8fdf1f17d66016f7f488f39136001de3de1794457582ad36c3aa898d484b80621 SHA512 da3738e2e5c68672d50cfd521a32442dac72f7261c1414060bd9b08d78a73f96f03ba1b728cec613c2455d976c05d3a5490fb86ec0cab547eeb0d951eb8ace29
 EBUILD libgsf-1.14.46.ebuild 1000 BLAKE2B 050b8e91952c3da2690ba442a109b88d8c3ddd430208c5c3526fa546868998a5db6ae46bfacd623c99214dd2579416220f589a0d47e3f0f7a312ef0f6cc2a4bc SHA512 2e293446446d8f556d05cb764960bcaf0bcd5fc4e8c5264393e55dca5e16f6eb995a00a9fe82abfae80febaa4dd6233105e1f042ea35997c9eac08f5054a5426
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.43.ebuild b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
deleted file mode 100644
index b2245def51a6..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.43.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://developer.gnome.org/gsf/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libxml2-2.4.16:2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		virtual/imagemagick-tools
-		)
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35.0
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with bzip2 bz2) \
-		$(use_enable introspection) \
-		$(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.45.ebuild b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
index 4d2e27fffa0f..13881ea7558f 100644
--- a/gnome-extra/libgsf/libgsf-1.14.45.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="