gentoo resync : 20.03.2022

3 files changed, 4 insertions, 44 deletions

diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 744496172223..d10b5063e68d 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-user-docs-40.5.tar.xz 9210512 BLAKE2B 0fe638636377d1c392d208c55016cdc346fa1ec64d327ab9ded9b58744d115c74d5a03927836138cb2d58c9df735d8bc032da4a7ff3ef3ffa53a1a59b88a3006 SHA512 dbef51c262862b211304158fd9aa7bf75ab20bbf21ed0bebe0a1c547cb53e580d32062a6f362f0750a8fbe1e93e8987593c80fa7fbb758c1a61827256db69d52
-DIST gnome-user-docs-41.1.tar.xz 9402668 BLAKE2B 952f2c117df9a9e35ae9fab13e5da402f804bce8d4fc96c07355d99e10debeb7b214f72b976826d016ae9f8d8c8a1b558d9a06f8f20e37ddd56404b6a794925a SHA512 49e08947b87ff551cfcf7de9e791de664d32f5628e1e7b4dbcf4b03e38d3e09edda602239dc52bef22a3711c437b669f8a092a33a385531e15311a0c858e78b1
-EBUILD gnome-user-docs-40.5.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
-EBUILD gnome-user-docs-41.1.ebuild 945 BLAKE2B 8cf285e1ae36038670c31156fb06beff40f25111da8311eeb9340cb46bac239be3381ae6a037cd491bdb0c47002ea9bf04646b36fdd48a91f5367f59da711593 SHA512 fe0a2534cdc8477a9b343734fa4c6dc3839d5416e1be9389783e4a02a2b3de4ac0b8e8bc36b0247dc1e66e17e8b533ceb6316fae06df624b34877defd2c912a2
+DIST gnome-user-docs-41.2.tar.xz 9407232 BLAKE2B 81c6d638e6cf3011cf4f2ee835c293fd0152435d2f4d07e7bc403882e378d140d7e03fbaca7f87e23f6c65d104dc7be4a2bc0902a3e1a5ab42815ceb250ff4b0 SHA512 982fa4c491a530df0067c3f437c961f84c393f1f95895e86f348609fa0407ffa6a33dbc961c87c5083180d4ad1a069ec2886d0ec841e9c965f21cb0b55322f4b
+EBUILD gnome-user-docs-41.2.ebuild 942 BLAKE2B 978c25c4ed533255a16ee88e7f670ee92c8e838c9b0c884645fd1477e91f1e63558c5e2cc21ca2e407098b97bc5e18dfd70b422614a7999221022fe767dbcc2b SHA512 72898d7193955b3d5bac304e4bbd2283de883ec8b4d97bc8ea8071b05d6be6a790e3255c29a89b03476db7459515e85c7dacf997b4e78388e5fb78a32d73dc45
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-41.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-41.1.ebuild
deleted file mode 100644
index 63ac52f4afea..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-41.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-
-BDEPEND="test? ( dev-libs/libxml2 )"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip
-	!test? ( test )"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-41.2.ebuild
index f9a0f49950e9..5087dc81bc50 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-40.5.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-41.2.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
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-libs/libxml2 )"