gentoo christmass resync : 25.12.2020

2 files changed, 24 insertions, 27 deletions

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index c5410cef58f3..80f1573e5800 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -2,7 +2,7 @@ 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 2621 BLAKE2B 50fdea0a81bba894e643f143459798398ed4404bb48f5068df79ff6877aba8ae1eca4f9d9f46e25d34db6a06e00b2cb5c1a7b0b2c5518da968c74bf427dbd828 SHA512 bb345f47471b2685f2cf3499f8e4bac8fa6ab652c7de60aabef402aa6a8c22d442c376662f7adda4a4d470ae6eec8a8c34a75fb71c3d19b07ff5689b5e06cab5
+EBUILD librsvg-2.40.21.ebuild 2545 BLAKE2B 0e4151ebcd62ad6a15c54a8642ef571311c45d2c4e6ce6f1b513019325147d7fb6c2642f415eff9bd1c87a242f7f760ab04770d5a75ae853545defe784ffc9a2 SHA512 754173c7ee44b8dd1584b166df68eafc146581e64d97377176f034cee77af9f268eee6544f79dc95ff608d765df12c827c5328b55498f897e2ccf3a90997bc87
 EBUILD librsvg-2.48.8.ebuild 2493 BLAKE2B 0dcdd0e0604652803e354397a61a6da127f59ac4f73c84355ae1ed473d9de28443ac96c144b06eab7d24da7c9f46d8f31580ce2cfbca734b8407f034c10c9d65 SHA512 9c05dee8de012eff413ac0444e0dbb1dc0fab8f50bad7d0c4179bfb2dc4a264d1110a26b2a5f808f0169a6e11922c220d27ff651835dcee4e80f5bc0c372d1f4
 EBUILD librsvg-2.48.9.ebuild 2498 BLAKE2B 77ad625306c3e87b085268d1b4f659f083ac58026d23f7285a866babeada7a43a3e28a5666043e5154af6573ac39325eba7e852fcb6052ae7ad59ccba5e1a84b SHA512 9e4445991fadcc1d29cb640248ffa0c8a3837afd3df750bbc1472ae2c66017c746335af351e4fc59652a3f0680470a0d81d1ec0586876bf606f590f5a633fc8a
 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 44a6e1505746..7fa10b848624 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
+GNOME2_EAUTORECONF="yes"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils gnome2 multilib-minimal vala
+inherit autotools gnome2 multilib-minimal vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
@@ -19,55 +19,52 @@ 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.38.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
 	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.38.0[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 	tools? ( >=x11-libs/gtk+-3.10.0:3 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-libs/gobject-introspection-common
 	dev-libs/vala-common
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.13
 	virtual/pkgconfig
+	x11-libs/gdk-pixbuf
 	vala? ( $(vala_depend) )
 "
 # >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
 
 RESTRICT="test" # Lots of issues due to freetype changes and more; ever since newer tests got backported into 2.40.19
 
-src_prepare() {
+PATCHES=(
 	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
-	eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
-
-	eautoreconf
+	"${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
+)
 
+src_prepare() {
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
 
 multilib_src_configure() {
-	local myconf=()
+	local myconf=(
+		--disable-static
+		--disable-tools  # only useful for librsvg developers
+		$(multilib_native_use_enable introspection)
+		$(multilib_native_use_with tools gtk3)
+		$(multilib_native_use_enable vala)
+		--enable-pixbuf-loader
+	)
 
 	# -Bsymbolic is not supported by the Darwin toolchain
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --disable-Bsymbolic )
-	fi
+	[[ ${CHOST} == *-darwin* ]] && myconf+=( --disable-Bsymbolic )
 
-	# --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[@]}"
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
 
 	if multilib_is_native_abi; then
 		ln -s "${S}"/doc/html doc/html || die