gentoo resync : 15.01.2020

4 files changed, 3 insertions, 132 deletions

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 6682f16d00f5..d321b629d526 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,7 +1,4 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
-AUX librsvg-2.40.2-vala-out-of-source.patch 1066 BLAKE2B 43bb0dfdc90f3fe3084e23ee5d275d92e41a60f7f5c3763180c91232f4543fe93b036ff22a455247b15d09f514bd8a9a4145ac1aec09b444cb9fc5414410c4b9 SHA512 6a8e8035183a965c7359c6258cde5a842c2eda662a9ccebbe27ea27eb978591255664a837124e65f25e2653980c354c6c4b9ae11427cc27fe46ccfcdcde8102f
-DIST librsvg-2.40.18.tar.xz 574384 BLAKE2B 964997ef3bd5f8bdcab43e67f22d12458683c0eeee2fa81e7a6199f6a31c7ac11c599327a6a66118000f63549ea735a042c71429635f6dc9bf073f12eab067b6 SHA512 faf503d0d881801ce129715e7ae979ee1675bd32beac9170b1889c94aac64caf486968bc86f3480463b84e94f28c1d805551ffdcb7068ecadd0688146e0fb182
 DIST librsvg-2.40.20.tar.xz 1796376 BLAKE2B ec8e7308a0255aa22038262d69019e810bb78b92e3de62662b53ab375110c8186e565e1eb7f5825c61c6d10bed1876ff3f7a06d1073e9676a3d2bb5dfb6b791e SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
-EBUILD librsvg-2.40.18.ebuild 2664 BLAKE2B db423b9dbd58b0795fae4c77e4fa261da20ecb0e36fb990457370806b7ed29546c70fe68c181e1980ea143f24e2372bcdc4224c934f3bf618a37b2ca153636cc SHA512 0f53e104b4eba5a31153d749d41366554ef900a14f86d213781b788fbc7d970a3c64f70225533133d87615b9424c6e246db8611ec59458833cae7389cece9cbe
-EBUILD librsvg-2.40.20.ebuild 2669 BLAKE2B e184e19b698f81d05e09159673a56164cf8c39554134544791a5df9e2f4f3507195b390422fdc2351fcfa1c1fefe5d54e3af7e6fda237b0d2a140a03e733a8c2 SHA512 afb7c63a0f7f4c097a67b5dc0c1a0271b26557c321ba9ffc9e9c694b87bbfd775901ef815792cb99f976d609b09a297711fa00d0162e46ebdd71a080615a8f0b
+EBUILD librsvg-2.40.20.ebuild 2668 BLAKE2B 258c5ddfeb87442d5548ad6156672277847f5760618867f8ed5faa0b4b850272d92619037dc1c2e37c6e36d5635663230f4282cd67790b4a6e248b7422ecc814 SHA512 44298d635d3927e3757fc07bb78092483cfe5b96d08506679d25282f9f306cc94b8751cab349a6379f15ad6f45d58e4a899f54b4b8f66a9d8b415538516833ac
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch b/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch
deleted file mode 100644
index bda090572a8d..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bf4da5524d50e1068f851bcbe50c8f8ae1948d73 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 18 Jun 2014 09:44:51 +0200
-Subject: [PATCH] build: Fix building .vapi out-of-source.
-
-Rsvg-2.0-custom.vala file resides in $(srcdir), and therefore full path
-needs to be given to vapigen. Otherwise, the build fails when build is
-performed out-of-source.
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e881100..dc6b0c9 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -257,7 +257,7 @@ VAPIGEN_VAPIS = librsvg-$(RSVG_API_VERSION).vapi
- 
- librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo
- librsvg_@RSVG_API_VERSION_U@_vapi_METADATADIRS = $(srcdir)
--librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir Rsvg-$(RSVG_API_VERSION)-custom.vala
-+librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir $(srcdir)/Rsvg-$(RSVG_API_VERSION)-custom.vala
- 
- vapidir = $(datadir)/vala/vapi
- vapi_DATA = $(VAPIGEN_VAPIS)
--- 
-2.0.0
-
diff --git a/gnome-base/librsvg/librsvg-2.40.18.ebuild b/gnome-base/librsvg/librsvg-2.40.18.ebuild
deleted file mode 100644
index 8d60a0d105d0..000000000000
--- a/gnome-base/librsvg/librsvg-2.40.18.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection tools vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-	tools? ( >=x11-libs/gtk+-3.10.0:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	dev-libs/vala-common
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
-	eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731826
-	eapply "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# -Bsymbolic is not supported by the Darwin toolchain
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --disable-Bsymbolic )
-	fi
-
-	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
-	# only for librsvg developers
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tools \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_with tools gtk3) \
-		$(multilib_native_use_enable vala) \
-		--enable-pixbuf-loader \
-		"${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.40.20.ebuild b/gnome-base/librsvg/librsvg-2.40.20.ebuild
index 258ad748ba0a..4c596c4cd131 100644
--- a/gnome-base/librsvg/librsvg-2.40.20.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.20.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
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection tools +vala"
 REQUIRED_USE="vala? ( introspection )"