gentoo resync : 08.01.2021

3 files changed, 99 insertions, 3 deletions

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 80f1573e5800..2c8dabbe0388 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -2,7 +2,9 @@ AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
 DIST librsvg-2.48.8.tar.xz 15302184 BLAKE2B 7d44b58d894afbeff0cb4606ed64191c028e7ac9d987dd3248b90df4ae0c000ee47b02484116bf7ee6e7aad567b91df7a2aae6880514f5ddee3ef4826c2e828e SHA512 7b35afbbad17927168acb3a308bff59ea66e8e1ac18c2ab5626a7d494e90d87d2dc552959ad72974d3ed8ba4c2f919335cf9110a0d0a09148e606222e4fcee43
 DIST librsvg-2.48.9.tar.xz 15309204 BLAKE2B 2547f9eb2bb81c7c879356df0df674ba27a09e3b1f0eb8df99df7a9a9c5e6838e94e143f50a00a742a4fd7043c01b4f484cfa78c84c4d5e6ec281bde35fd98b2 SHA512 91fc480a9e9ff3755ed2685170a1fadea9232ab9a727a66da5085df09cd1a160cb8f443de7dec950799de5f4cb88b1ee33384107e316f573940147346c155a40
-EBUILD librsvg-2.40.21.ebuild 2545 BLAKE2B 0e4151ebcd62ad6a15c54a8642ef571311c45d2c4e6ce6f1b513019325147d7fb6c2642f415eff9bd1c87a242f7f760ab04770d5a75ae853545defe784ffc9a2 SHA512 754173c7ee44b8dd1584b166df68eafc146581e64d97377176f034cee77af9f268eee6544f79dc95ff608d765df12c827c5328b55498f897e2ccf3a90997bc87
+DIST librsvg-2.50.2.tar.xz 16354004 BLAKE2B 485c14bf898fdcf2ad55cd6191eb5d315de73d02a34f15b528e36e64549f0eb2597b90d277c28d7d8d584b59c69f8eaa9f90820dcbaeb4a457d4ce1e2e2adf30 SHA512 f7e4990e1d74750246ec5816327c606607bb864ea7c44bce3ba9254a90b71692ed397e90343473d266f71eae3df7085c00e5a9a90b02d27ed6648e717d69fb45
+EBUILD librsvg-2.40.21.ebuild 2534 BLAKE2B 6e6e0198086c44d870e7ee5201be265392ab1535004c38937aadcd0ceb463fad5df5a76800dea59c410e33f010fd7a2fd9f3a45e19b054aa2e65e3ab141a1e7a SHA512 28809d0b720ecba8f0d42fc81872387069efdd6a371beffbedf7b7363627d88dd7429bb12686d8321c786fe7f2780ed73498f273de8a394bc1bac839e06769ac
 EBUILD librsvg-2.48.8.ebuild 2493 BLAKE2B 0dcdd0e0604652803e354397a61a6da127f59ac4f73c84355ae1ed473d9de28443ac96c144b06eab7d24da7c9f46d8f31580ce2cfbca734b8407f034c10c9d65 SHA512 9c05dee8de012eff413ac0444e0dbb1dc0fab8f50bad7d0c4179bfb2dc4a264d1110a26b2a5f808f0169a6e11922c220d27ff651835dcee4e80f5bc0c372d1f4
 EBUILD librsvg-2.48.9.ebuild 2498 BLAKE2B 77ad625306c3e87b085268d1b4f659f083ac58026d23f7285a866babeada7a43a3e28a5666043e5154af6573ac39325eba7e852fcb6052ae7ad59ccba5e1a84b SHA512 9e4445991fadcc1d29cb640248ffa0c8a3837afd3df750bbc1472ae2c66017c746335af351e4fc59652a3f0680470a0d81d1ec0586876bf606f590f5a633fc8a
+EBUILD librsvg-2.50.2.ebuild 2477 BLAKE2B 3063beee2aba1cb84f172e906cc3bdd739b60bd14d4800419576d093ba990df90a5fe1ca459a618ed37c0651bb65c85bdf9846e481e3ec7e6c32a15cfdf5c31e SHA512 7ac1e8a8028d425c1057747d99681b516acb47cb1d5ad14de0e7bf23c66d25c0d5d895c7b9d449e7ab65d0b334cc4b1e4e66d238ba4d09ad668d3be3538347a1
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index 7fa10b848624..f16fab8717d7 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha arm hppa ~ia64 ~mips ppc s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha arm hppa ~ia64 ~mips ppc s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection tools +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/librsvg/librsvg-2.50.2.ebuild b/gnome-base/librsvg/librsvg-2.50.2.ebuild
new file mode 100644
index 000000000000..01b20ea0c5c2
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.50.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+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[${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
+}