gentoo resync : 31.05.2021

3 files changed, 4 insertions, 101 deletions

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 6aedc26002d7..ecd892befbbd 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,10 +1,8 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-DIST librsvg-2.50.3.tar.xz 18868408 BLAKE2B 8b245a233ddd56137880e43f4da2df623237bb1ce2e143cee09da3fadc1edd9b3e4f4753fe48cf814d2372e532775573a34982a6cc88ace9be336e16ae473c20 SHA512 21710b6b5810b959679b7908aa371b8af02c85549efbc64f5fda01cfc3881539b5afc6bc304ce2289719dee48f583b1eb9867546e09f36941f81af968434e389
-DIST librsvg-2.50.4.tar.xz 18954216 BLAKE2B 88467cf7b3a7382182f3a37887e9d05dbcb723464607707271491ca20cf7bedb890ec64e1a8c34ab136a23dbfe93dfd19fccbd194c4bd65868b07874c5070067 SHA512 5f476a663e1fa3297d699b1057622e72dbefdf9126ade97762288b7bc4e8a294936d008c889bcaf8e35f46d3b818f5317c63883df0043ec0f8aad18fa5feb4f3
 DIST librsvg-2.50.5.tar.xz 18958716 BLAKE2B 36ca7b9316f0384dfa0063035fe3b57adc9c0a94757b81662e0e80ff19c2388d872353ba2047c8402fd586e4d3614a88e2ba29502bd16c55d8a336238954aaaa SHA512 d1d653031f20a393ba7ae56e3187244cb8e96bfa14f888b07338b80c8d947112c421a88bc57f62eaa6c8b705dde1277a7b56c7cdf602b46c1516309dd4011b56
+DIST librsvg-2.50.6.tar.xz 22225624 BLAKE2B d2822758456758ee818717db60b9136c31efa675f4c6ac94202e90a503b63aee736f995e8d23a72f50fe3b941953591d690cf99a65ddf7295e50b244186d242b SHA512 67f771c6aeaf70bc63f053ee6821e6eae545581c5381fbd3c3cd70c9f06fb2b14b584e9933108d0698abbca59c88fb0dd05d7a09925a727dfa58960b7d4f3396
 EBUILD librsvg-2.40.21.ebuild 2535 BLAKE2B fb7707a26b24f05ef9afe464f036d205e72243fe0b411ddc17b42a3f73bfd35e4a92b9236c12218d4bffb8edc825813f3b08cf164faf6cd1f96e689b76ac2970 SHA512 0ae92c01878ed45cd2da511bca6bcb86465723d3f71752168d5764b56d366544bc6bce1fce2d93ad497c901af8758db11bf3a53ad79389bcf54b16210bb18da2
-EBUILD librsvg-2.50.3.ebuild 2503 BLAKE2B 16130a1bb29f4f6f86fc3cfb02b4ddd3f1bf9dddf7149ef3edefbeb3f78995259e76b6c33be8fac2896d2985ff1310ec10ef62d2f73a61101f914fbbdd762418 SHA512 884181f1b55d61d4b9fa73e96392086bda8ebb1d0c672901a140f8ad22f37c755e8b8fdeb0ef5821849f36f01e48bc081afd23c31cf1e5bbe52e821097ee5b73
-EBUILD librsvg-2.50.4.ebuild 2582 BLAKE2B 4d106ba7d0be3acd56af91cf045aae2010bc7d6adc125a1676e93a862fb989fdc1cea04d953518d10f246f594533a7562826311b03c59e5943bc978fae7507e7 SHA512 d7040b77c374f84aa22de634220f77e97c390c79ffb729ff186a08c60dd258d4a45037466713ef1bdf653de866b4b210e689a11a9561c73d59d98a982e852028
 EBUILD librsvg-2.50.5.ebuild 2589 BLAKE2B 4b332cd6a04c97908a61a30d18591eb3e1b7e6901637abf9aea07b93b6da06f7f6df33bcc3e3a0663a48355271779643382d9065784a3356d2ea535bb5e87cb3 SHA512 bebb2c340fa684c2d0f86d140e919423a89a787ddc3256e28ef49a5a150f1836534348bb9d1da4521760b8532e537f50f4107dc6b509063fe00787c2a1586fc5
+EBUILD librsvg-2.50.6.ebuild 2577 BLAKE2B d1f7f58b9d597ec468632c9317dd98d049f25828f701322a97ff7da5d48b29010543291c95b69d28cbbbf5dd5abf74faef01ed99cbcf7b038806e6db358be7ab SHA512 a2f73a752c007ee1e29f75b8dff78c0526ed3a724cb6be025dccf72d4dadb65680e7c8fca97f496c9676e2e03719529bacb37a0580412804ed77d0618e6103c6
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.50.3.ebuild b/gnome-base/librsvg/librsvg-2.50.3.ebuild
deleted file mode 100644
index b9143da05f5e..000000000000
--- a/gnome-base/librsvg/librsvg-2.50.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION=0.46
-
-inherit gnome2 multilib-minimal rust-toolchain vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.40[${MULTILIB_USEDEP}]
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-debug
-		--disable-tools # the tools/ subdirectory is useful only for librsvg devs
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable vala)
-		--enable-pixbuf-loader
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# Set the rust target, which can differ from CHOST
-			RUST_TARGET="$(rust_abi)"
-			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
-			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
-			cross_compiling=yes
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	# causes segfault if set, see bug #411765
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.50.4.ebuild b/gnome-base/librsvg/librsvg-2.50.6.ebuild
index 7079e46b7a43..ef1c37205812 100644
--- a/gnome-base/librsvg/librsvg-2.50.4.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.44.0[${MULTILIB_USEDEP}]
 
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 "