gentoo resync : 29.12.2022

7 files changed, 26 insertions, 308 deletions

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 3eab44ce71ef..5e4ff12f1e6c 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,13 +1,8 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
-AUX librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch 2171 BLAKE2B b9ef76f832fdb18daae53652908d1f59042448420b63239a7434a5f350bb4e1ce9c4b54eb85e1ab9c0ec593c4f9882b66fbb3b00d9f7dcaddd526e69b00705f7 SHA512 34d0fc111b2ef09076bf6d011a0ed14d56370ece58db31e460d84177154fa058b8c77b54987c23333a47dbba58380813b656cec6818added7f0e897d7154973f
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-DIST librsvg-2.52.6.tar.xz 23662708 BLAKE2B 21108297aa4f87a852d0decb9cc7b8a5cdb546e00075d16f0f86502752adc176a67b56607eb90b034ca4e2dddbf8f82a3d81727496a5ae1a2b94715cdbbd87ac SHA512 be4830fb34c4859bdbe0c86da7b5de0807f28bb63fc124b4405ca8f9ef6ee45add77b4c43b9031d00157870eceb458df30cf5ee25e73d3894797d622b465f38d
-DIST librsvg-2.52.7.tar.xz 23709632 BLAKE2B 4eb83d71b77b851c408ddba711fe39ed23863aa6466634020a19ffc30e00c12f7dea81f11fdc09eb53c0c72efb35adc4528568b3c27e5dc0e886426d145d347f SHA512 15c075d696ebba35555f93456be088e6398da5b7992119edc78f1ee1d376a70425248e36b138dc86234aec13cb139fded11d6d74523c44f9a49eb19c2151fcb7
-DIST librsvg-2.54.0.tar.xz 23489972 BLAKE2B 04fcbb688b18e98dcbef81e84106a99280d45f242152a355ac6f202410c13b289b281bd10f9e77854997362b7d3e88832d3274d7d63ace8adc05613da99e2aab SHA512 3357ca8cf7537fe2792ee2d9a1719622656f3e1d7f30da062799a4b3ca8788cc07333a00e1c9da53a53da2b67a2aa5895a4c8fce35003da659fb7f98048b68eb
-DIST librsvg-2.54.1.tar.xz 28181768 BLAKE2B 86e1cf01febce55acadc9b05f5e08fda69423ab267ab8330bbf892d63f475d5ddd163099346f3cf1e63bf2807d847440cf48d8b24f3c32b3ab14a35c0c54d96e SHA512 d1ea8a49988fed1d7a2ba21540a6c10084cd78f8b6db3534882d086a09f3a0d96ec80c59b3744a6eeef8ae511f0b0152eaf18cc9a134f4b871a993418cae09a6
-EBUILD librsvg-2.40.21.ebuild 2600 BLAKE2B 21f2ee7a8c11fc1d1dea3ff8cc804951fbeb5b555841b79a9230a7c67ef9d2c6ae571a5b775835565f9995b134eede674a5f254b568dab34bd1cb30603461f76 SHA512 be3bfd885134bfbc97170d7349689e54d0be0eece6b4a85e4761ec697bb496aa2c2723c6e82b97df29dc6a7e4676a7bec3c83a00a3a33f6d0fca4187bef5d4a7
-EBUILD librsvg-2.52.6.ebuild 2533 BLAKE2B 6ca050d7e942cbad64bedbeefbe2f14fadb86b3f121e1fef6eb686f811e88815a59d6f5615a870c9c08bf678ae5c51ac0481d4d9b7193a48edc55b5d6fd09755 SHA512 d7b8b9b48bae3ef5cf8e8723fa23a94df8f6355c14b2bdccaedfb8649b9bac5c66a86a113e65594e7277139628dee2c2f311d82ec00d84b7a49d759e2f5f9788
-EBUILD librsvg-2.52.7.ebuild 2538 BLAKE2B 94f34eae9a6ec5584a591ccba117611df6e322db538e707e773970431aa9e4a6217c7901487a2ddceebdb7da2c110e3884a9bf7d10dafcd49d9cbe05218c0727 SHA512 9578a4ba5bfd9f3222f367fb4be6ab509b376fe7c3cf59860b9e447552947779921bdcd0de7ae35193eb46b9afc49767da6a900572a53036cd44e1f1b4d7d93f
-EBUILD librsvg-2.54.0.ebuild 3077 BLAKE2B 6eaeed128935c3930360e06e70ebd5efd8d832438486e7261c5d4c9d62f5cd5e0d97b0f5537e5f9c856e55d571d811743f9b2492c3d517a9233c80f4c4128931 SHA512 e97f2697e41de6d474ef7c587885d10f20ea2aa25655d468725edf6f6892b7c69c7b0ad34b9197cfed4a58751755a80083aa4bb5cd7ce1f7f3ce83b5f2dd90b5
-EBUILD librsvg-2.54.1.ebuild 2889 BLAKE2B 172441dab4b98ff288eb10c78ed44687e02a892119a0ee8c00e5603c23cf78984b87d3090aee5975d947d8d0bdca5b0a0a42b1aad4a33d3786ee6f9b0df08995 SHA512 cd6686b4266dab735d21d94e9489bdc076def911b7feed2ee043d1d4a031f36e8004585a2b15146221b553508d7c4c5e84c660233d3580646821c226a741fefb
+DIST librsvg-2.54.3.tar.xz 28215048 BLAKE2B 3685b9c0eb923874e6829c365f437095b595ccea997b7b1411ab82117d09b84261241594959a049bd712fc0791d359c6bf536acfe022c44bcbd7804a2a59ef28 SHA512 153bb9d5b2e04ac87127663ab2cae1ae9e3c23666e54234efb3e247a6c3fdd67701f8baa31e06bba673c0cfc71202001c46fb8e0398770dfbc59e10f6de78077
+DIST librsvg-2.54.4.tar.xz 28214908 BLAKE2B 9aab1175494e50c9b4a1b74c76c0db4f052e42d98e48842c87a5434382983fc63f41923c67dc86c31988c114c4a18056d52a99c8ac2d5c1dd90af3da4814e4ac SHA512 e3415044a4faa48ec83e25cbd86dfbe7bc997286269298fb913a61a13d55195f660bcef459950979c2b8d60b144b29e33b278b2c4da0c376de65c34f39687e9a
+EBUILD librsvg-2.40.21.ebuild 2607 BLAKE2B e1c974514e0deb7c81ff027747a00bb8bfb1902a140711a7207e4d126c59ef5ebc0252cb64c6ff379822db65bcf3b60992ec72accf3d1d3d6681ea65d1df6b49 SHA512 a2ba181144cb049e66af4743e1b84ff3865d7aed0b4c1f06c985616fb1fc72f39845926def6b81fafef041f59bbaa8b136782be1de99127af651d2b916724ed4
+EBUILD librsvg-2.54.3.ebuild 2809 BLAKE2B 732ecd76072d64e43e9f48e44bc2d7ef30196dd688d60aac56b141385aa2f163ae3af8a1e0f456fce8a747fd8cd592fd0ebc5557db810e84c2f326dbb34b3d83 SHA512 1fa43b593333ee9ad9187a791a59988240fca44d3db2880ee4324b3a917054bc8cd2b9bdcf51a22da1f7b69cc4504abe60b8f010598142a94aa11a6f0b21b5cf
+EBUILD librsvg-2.54.4.ebuild 2770 BLAKE2B d294412c056957f34e47f3951b6763e60cd053fe3fd1c2ab0f4fff061566bcb288da975f04d9821a5e9e173a3e32314e2a2ad63ac7750ed86c589b27fd37eecf SHA512 729205c198e91bcdac79ac9df3c48b2e184bdf3267afb03b2b568a6bfbb6384e7faead9031b0e1c8f894b4c4581d837f0f5d282bf860be456584da1c0a2d80c8
 MISC metadata.xml 312 BLAKE2B 9a8c74fbf88673a6fee588b6c7368d4d40287b3dbb46d591878f5744ce3eaf5fc6b4e711cd50d2ff830e9c0139cd99f629cb378039376dded59373216ec19038 SHA512 0715a267ceda6ecb4d9499951b0d3343b5ccedbfc85441f3001d9293dfdd2d31b214f907c5466676cce899c67f4249cf4b643a46b4d16e1ab6b89ccaac763e26
diff --git a/gnome-base/librsvg/files/librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch b/gnome-base/librsvg/files/librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch
deleted file mode 100644
index ee5c3bce0a5c..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.54.1-build-Add-enable-gtk-doc-flag.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/692
-
-From 1c53068cbcfccb9c663dea2d1a61c8d7b24d317a Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Tue, 26 Apr 2022 15:01:55 -0700
-Subject: [PATCH] build: Add --enable-gtk-doc flag
-
-gtk-doc documentation relies on introspection, and introspection doesn't
-cross compile well, so it's nice to be able to disable documentation.
----
- Makefile.am  |  2 +-
- configure.ac | 19 ++++++++++++++-----
- 2 files changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 83e73c38..1e1ce856 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--if HAVE_GI_DOCGEN
-+if ENABLE_GTK_DOC
- RSVG_DOC = doc
- endif
- 
-diff --git a/configure.ac b/configure.ac
-index 9abc587e..6cced25c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,11 +123,19 @@ AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" != "xno"])
- 
- dnl Gi-docgen
- 
--AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no])
--AS_IF(test x$GI_DOCGEN = xno,
--    AC_MSG_WARN([gi-docgen not found - not building docs])
--)
--AM_CONDITIONAL(HAVE_GI_DOCGEN, [test "x$GI_DOCGEN" != "xno"])
-+AC_ARG_ENABLE([gtk-doc],
-+              [AS_HELP_STRING([--disable-gtk-doc],[Disable building documentation (requires introspection)])],
-+              [enable_gtk_doc=$enableval],[enable_gtk_doc=auto])
-+
-+AS_IF([test "x$enable_gtk_doc" != xno],
-+      [AC_CHECK_TOOL(GI_DOCGEN, [gi-docgen], [no])
-+       AS_IF([test "x$GI_DOCGEN" = no],
-+             [AS_CASE(["$enable_gtk_doc"],
-+                      [yes], [AC_MSG_ERROR([gi-docgen not found - cannot build docs])],
-+                      [auto], [AC_MSG_WARN([gi-docgen not found - not building docs])])
-+              enable_gtk_doc=no]
-+             [enable_gtk_doc=yes])])
-+AM_CONDITIONAL(ENABLE_GTK_DOC, [test "x$enable_gtk_doc" = xyes])
- 
- dnl ===========================================================================
- 
-@@ -359,4 +367,5 @@ librsvg-$VERSION
- 	Build introspectable bindings:  ${found_introspection}
- 	Build Vala bindings:            ${enable_vala}
- 	Build GdkPixbuf loader:         ${enable_pixbuf_loader}
-+	Build developer documentation:  ${enable_gtk_doc}
- "
--- 
-2.35.1
-
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index bbd1656e7ba5..983b8aab8e94 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-2021 Gentoo Authors
+# Copyright 1999-2022 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha arm hppa ~ia64 ~loong ~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.52.6.ebuild b/gnome-base/librsvg/librsvg-2.52.6.ebuild
deleted file mode 100644
index 28767f1a0cdb..000000000000
--- a/gnome-base/librsvg/librsvg-2.52.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 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 ~ppc ppc64 ~riscv x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,svg,${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.46.0[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.52[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-QA_FLAGS_IGNORED="
-	usr/bin/rsvg-convert
-	usr/lib.*/librsvg.*
-"
-
-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
-		$(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
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
-
-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.52.7.ebuild b/gnome-base/librsvg/librsvg-2.52.7.ebuild
deleted file mode 100644
index 083436b27fac..000000000000
--- a/gnome-base/librsvg/librsvg-2.52.7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 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 ~ppc ~ppc64 ~riscv ~x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,svg,${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.46.0[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.52[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-QA_FLAGS_IGNORED="
-	usr/bin/rsvg-convert
-	usr/lib.*/librsvg.*
-"
-
-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
-		$(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
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}
-
-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.54.1.ebuild b/gnome-base/librsvg/librsvg-2.54.3.ebuild
index 656e02c638ae..8ef771052666 100644
--- a/gnome-base/librsvg/librsvg-2.54.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.54.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="gtk-doc +introspection +vala"
 REQUIRED_USE="
@@ -50,10 +50,6 @@ QA_FLAGS_IGNORED="
 	usr/lib.*/librsvg.*
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-build-Add-enable-gtk-doc-flag.patch
-)
-
 src_prepare() {
 	use vala && vala_src_prepare
 	gnome2_src_prepare
@@ -100,7 +96,7 @@ multilib_src_install_all() {
 
 	if use gtk-doc; then
 		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PF}/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
 	fi
 }
 
diff --git a/gnome-base/librsvg/librsvg-2.54.0.ebuild b/gnome-base/librsvg/librsvg-2.54.4.ebuild
index efdb0bdf2148..5437b1fed3c2 100644
--- a/gnome-base/librsvg/librsvg-2.54.0.ebuild
+++ b/gnome-base/librsvg/librsvg-2.54.4.ebuild
@@ -2,21 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION=0.46
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
+IUSE="gtk-doc +introspection +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
 
 RDEPEND="
 	>=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}]
@@ -33,25 +35,21 @@ DEPEND="${RDEPEND}
 	>=virtual/rust-1.56[${MULTILIB_USEDEP}]
 	${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	dev-util/gi-docgen
+	gtk-doc? ( dev-util/gi-docgen )
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
+
+	dev-libs/gobject-introspection-common
+	dev-libs/vala-common
 "
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
 
 QA_FLAGS_IGNORED="
 	usr/bin/rsvg-convert
 	usr/lib.*/librsvg.*
 "
 
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
 src_prepare() {
-	# Documentation is built unconditionally and depends on introspection,
-	# but introspection is only built for the primary ABI.
-	# Disable documentation and manually build the doc subdirectory separately.
-	sed -i -e '/SUBDIRS =/s/ doc//' Makefile.in Makefile.am || die
-
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
@@ -60,6 +58,7 @@ multilib_src_configure() {
 	local myconf=(
 		--disable-static
 		--disable-debug
+		$(multilib_native_use_enable gtk-doc)
 		$(multilib_native_use_enable introspection)
 		$(multilib_native_use_enable vala)
 		--enable-pixbuf-loader
@@ -85,26 +84,18 @@ multilib_src_configure() {
 
 multilib_src_compile() {
 	gnome2_src_compile
-
-	if multilib_is_native_abi && use introspection; then
-		emake -C doc
-	fi
 }
 
 multilib_src_install() {
 	gnome2_src_install
-
-	if multilib_is_native_abi && use introspection; then
-		emake DESTDIR="${D}" install -C doc
-	fi
 }
 
 multilib_src_install_all() {
 	find "${ED}" -name '*.la' -delete || die
 
-	if use introspection; then
+	if use gtk-doc; then
 		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/${PF}/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+		mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
 	fi
 }