gentoo resync : 20.03.2022

3 files changed, 6 insertions, 45 deletions

diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 2dc673f12c09..c992473a535f 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,3 @@
-DIST libgsf-1.14.47.tar.xz 691448 BLAKE2B 7be095fef159ff7a52f2cf4d83b59b5bb591e0d4fb1d69d88bc6f2eba4286337af2a2c46ac7d6603d5a68b9b6f03d41f647d34b0bee5e61244696c5ba02be569 SHA512 143d48eb02be8202b9eb97e29e5909061a0e1a562b86e4bb4b2eac3fb0a42b139ead131ed1ffa4dfe304b65527089777823122223a74ebbc9df94c17d013f97b
 DIST libgsf-1.14.48.tar.xz 701760 BLAKE2B 762fe424ad45ac9739e1ea2cd9971f80f9c4d573147c6043c6bbf7b416a6c69c3b0bbfa42f6424176a545f7f9e7257d33e62c92482945786bb142063390a9d08 SHA512 6efba54c1427f9bdf71203b265ee4cdaa7366f78f299d38deffb657198244fb6436ab4e077a010079a28832539cdef08796e43feb76450ab0420da56016cd95e
-EBUILD libgsf-1.14.47.ebuild 985 BLAKE2B 2853a0a472b785b671e4bb32b98882279cc37ef8c9e6a85985fa733b9d8c535f12e9cc2748dde22e3f117d444f27d174344bdd21557eb62d2665a316089044e8 SHA512 b7e3fbd56479859ca174a1fd4ce38d4e05b4eececbcddf709f19ecb1b302c66de5ed72a0cda6197fedd2880141522820076903740c8ba9682e6e99303a97f761
-EBUILD libgsf-1.14.48.ebuild 997 BLAKE2B dd3eaeeca69b2ccf6d01eae31ee6987fe79fda8383801d77304c693d261d58a0c346f6db0b89d913ef085c5125168258598e518442e1c24d2cb79b4cef0efcc3 SHA512 ce51d27936dd2f626685b591d3bcd3d93df7272c002147eb2950710a580e63864155c6adf6cb690ad64560d1eee54ee98749bde4cb748ee7b6023cbf59dd9e0b
+EBUILD libgsf-1.14.48.ebuild 1053 BLAKE2B f64d22b99dcf1c4336622707fc389af1c8bc50e286d41505616160c7f8515f4440d0c455bc26ac5a966c1daedfca19e10ac25aa11565c64ae4e90d472b491a5c SHA512 1f26d57a919ffce788887545d808ff4b97b4ba1500443f2e0da58e7ff27d01bca4d5b4c8bfd3c3056f35c5fcb355bd9f703be7a1c2ff25203676634a8a2c37ab
 MISC metadata.xml 321 BLAKE2B 0d1e16740ce0beddcea428308ea06e6a4201a312764ae81ce6cb8e2770319416ea0ab98ac536d85b38ce548a0bf9e2e03319b7aad0b672d1ee3b8f22d932af33 SHA512 64fa3ad72c8d27f271fcef49f9657fd2988f73eb2136c1ef84813b459dfe5bc0a40566efd9c8f0684f0da8c8eb56fcd78586f5947e02664f7663a8d8fc2a1148
diff --git a/gnome-extra/libgsf/libgsf-1.14.47.ebuild b/gnome-extra/libgsf/libgsf-1.14.47.ebuild
deleted file mode 100644
index 6e26ff2caed7..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.47.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.36: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-libs/gobject-introspection-common
-	>=sys-devel/gettext-0.19.6
-	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.48.ebuild b/gnome-extra/libgsf/libgsf-1.14.48.ebuild
index 317027803298..bbb8eb7238de 100644
--- a/gnome-extra/libgsf/libgsf-1.14.48.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,8 +9,9 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 gtk +introspection test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
@@ -28,6 +29,7 @@ DEPEND="${RDEPEND}
 	dev-libs/gobject-introspection-common
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
+	test? ( dev-perl/XML-Parser )
 "
 
 src_configure() {