gentoo resync : 25.03.2022

18 files changed, 106 insertions, 38 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 84b2e8317af1..3a469c35516e 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 3b67b4a1c84e..de2ef8cdd69e 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,6 +1,8 @@
 DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3d834e4147c3a3c5e6ca7c705ed2d16e8cf0a1255f5ae999d7e930b9716585b8c498c220f1ab40fec929dde7679efd56f3b18a45 SHA512 9609732cd51c6794d4d86598818bb2a589b0f4b6b795e57f3507dad69b21ef1b2fc2e83e24e937428bbace32fcccf587a5771cbc02c5768206e704f0456a6d1d
 DIST adwaita-icon-theme-41.0.tar.xz 17086916 BLAKE2B 6899bf734a3f708e6596a4aeb2df426041dd46232a3cbd55f530fab2cc92277db74322a31a443e251a06c74bf7fad7d5f9394b63edb33fced5ce8987e5c87d3e SHA512 2a540f2b53cb64433780029ea70c2cfe8417ae7e619d8eefa59825e3ebcb8585acd4ccae25344c8e146a0ee0705ccbb39a2cb729a162534fd86a4ff24e505c86
+DIST adwaita-icon-theme-42.0.tar.xz 10407000 BLAKE2B 1ec998731b8da4ed17d7bb5887faba7a33721955836265c67efeffcf16bbb82e6f20750245b9b6d7dc4e816ec0e6ae71cb51a839debb0e070edf5d347d6260d5 SHA512 521bfd44fdc253f5fd01fcdfaa485669849ad73c35354ccfe9b358ba433cfa40ee6d68b70ec2268a4ce0631a48670b03b30811ca68e2e19f9430082454e02015
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.32.0.ebuild 1601 BLAKE2B 4ad17ff022fe911ec1b0feaad93215fe06f476b183287eb7eb99cb1250b0423c1d3306ae17b6b3da321e0d3d7c8b6cadce388c26b5d2656849f61778a913d439 SHA512 db1b487ec247df4eceead54b565bedac0be524f44349c4b2a4e1060b185ca7633922df874dd543ba286c985245858940d5612c55c62b5679a23f28f382ff477c
 EBUILD adwaita-icon-theme-41.0.ebuild 1541 BLAKE2B 70ce4473116bd53db0548420176cd9e4b2162eff5cd63dc320bc97c9b3dd4d12fe8cc2eb8ca2762e6bca94cd3bcf0e34086f19840daf48cfb60b88e38492af5d SHA512 4c2407584b7596bf31e73f745b2928af15a52fe3fc1b979e84ce728775dd81b2af1e7b8cdbeb3f7a627e5dbdf04fc03a375d55190e79c0dc4d6cfe6535ae577f
+EBUILD adwaita-icon-theme-42.0.ebuild 1546 BLAKE2B c9fa11e4da0d684763623fac46ed5a047a436a9cc07e7ec4be1659f3f6ad198579d0b37df4beb4ce7cc3e8f63800036305e7803188b81346de87c8cb83a8df54 SHA512 b2b970547bb8204b1f7cdcbbe06c71c34e654592330740149fa5bf892bb5e30a401a9c493170dd0e33c3a021b065a6bebe5fee51d63bce017dd5911fd5dd9137
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0.ebuild
new file mode 100644
index 000000000000..7154dd1d95ab
--- /dev/null
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="GNOME default icon theme"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
+
+SRC_URI="${SRC_URI}
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+LICENSE="
+	|| ( LGPL-3 CC-BY-SA-3.0 )
+	branding? ( CC-BY-SA-4.0 )
+"
+SLOT="0"
+IUSE="branding"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
+# librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
+DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+RDEPEND="${DEPEND}
+	>=gnome-base/librsvg-2.48:2
+"
+BDEPEND="
+	>=gnome-base/librsvg-2.48:2
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-libs/gtk+:3
+"
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_prepare() {
+	if use branding; then
+		for i in 16 22 24 32 48; do
+			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
+			"${S}"/Adwaita/${i}x${i}/places/start-here.png \
+			|| die "Copying gentoo logos failed"
+		done
+	fi
+
+	# Install cursors in the right place used in Gentoo
+	sed -e 's:^\(cursordir.*\)icons\(.*\):\1cursors/xorg-x11\2:' \
+		-i "${S}"/Makefile.am \
+		-i "${S}"/Makefile.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
+}
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index a721badb1c49..552c74e54975 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1,5 +1,5 @@
 DIST fvwm-crystal-3.6.5.tar.gz 5899049 BLAKE2B addd82dbbab9b457a94715a969a27ff6ef2be07cddd33a379dc4d5348c9565d3a19943828b068ec5ef5f6d032f51b77a1990316ee7b3e16e5dc98ddf32f98c7d SHA512 45cd99b83342e5e5f0de89edc92dbba3311efc7ef431d509490e3fd5b49420e94d1cef55865f45e731fd4c13172c6e2d26fbd10107cdb4a4f525379e17b94e6d
 DIST fvwm-crystal-3.7.1.tar.gz 5936306 BLAKE2B 3a47ddab10365faf13c4b9de8ac172b2f91073addd7799315a47901c10b28b6b16c89ccb9c4a313285cd1e9b40d6ecd8b563e8764bb063d249ceb54804d63ec7 SHA512 0e61bd190ab0b9f4c51b65e9bbeb3689c38127769166f90fc2eff655c68b11c60e67ef35417ed7e97d06bb549d2a87ba6785fc6530a5269d19c1243d3cbe27ed
-EBUILD fvwm-crystal-3.6.5.ebuild 2479 BLAKE2B 869b8d37dcc17ee843ecdf79053fa9a08fbcce9e6d4b4c7ee5439e97018bc4fc454730195b5ff48c3d65a44a31b0dc5aab2b2661fd8057268cd55c544c61e26e SHA512 c30ac420f1c1c21776faa75dcd6b961efcb2708e098ee5859e646738440254cea723d22f5a9d627e5f53d2c1f1315e983a387e0e22da7974b2b95ee7580cd5f6
-EBUILD fvwm-crystal-3.7.1.ebuild 2185 BLAKE2B 6458ae9c1b663040d868887fffe274798a07e3fbfe6660f95a459317aeb51485848cdf2eda19a5da695f4d5d7ca061c424ac808fe643ef127a5bcb91311cada0 SHA512 e20bb6ba33e518c5ea2abd05a042b605572e94c6711b6bee337402c0c330f6f5525afed232cb5cf0c065aab9e2816812c988b8824b1d0b6859066754368975a8
+EBUILD fvwm-crystal-3.6.5.ebuild 2486 BLAKE2B 5c72758e49e9bd4de1ebb0d138f1211fac5042382b25703cae736246ff0f2567da7496b325a543d73a14834d2d62f67f3554afa355fe1451b60f5b213c1a4681 SHA512 2f9eebd35adcf6f4bc0f296fb64c062377da144d39b19e35e21653f7ec6f9324254ee567b4ef2f338a5b4b3defae845ebfe5bb504f6b31267c67f82e03f05e19
+EBUILD fvwm-crystal-3.7.1.ebuild 2192 BLAKE2B 973b83721e05c97a78ec3852f94786a90b03509449baed646ae61d95fdac03e5f3c06bec4dea02293c25afe572a817dfe198edcd57d997a7c840ba5a641b0fc4 SHA512 a531caa965f609b3ada074c98d6af531103ef862455e9e075f1ac0a856e7df19e8fdead57d5c4c4c3ccc5dc23f964422476a305d1d6f03a37e8e6a3554a6ea8e
 MISC metadata.xml 1237 BLAKE2B 3309596bab642a50c8697ceaa0d513a4042fcb88d45b252fb2b01ac5e107b5204b54ea6511dc5c4b7d784461dd2ea919928e97240cc1d2481848f8a0c39dbf40 SHA512 57502a32cb3df26c4afa1a84acbb84fc8a59c0795e2ffba7cf4494ffe842aaba7642443f39f88e74ea18efdeb4d7fe66604dc8898fc2c2f26c94ce4ab5ebd70e
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild
index 7766a50c06bb..64685e28b377 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.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 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 case ${PV} in
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild
index 341bd3f4a022..97ef2652c9ed 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.7.1.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=8
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/fvwm-crystal/fvwm-crystal.git"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/x11-themes/fvwm-themes-extra/Manifest b/x11-themes/fvwm-themes-extra/Manifest
index abb2ad9d3c5a..4ffedeebd4c1 100644
--- a/x11-themes/fvwm-themes-extra/Manifest
+++ b/x11-themes/fvwm-themes-extra/Manifest
@@ -1,3 +1,3 @@
 DIST fvwm-themes-extra-0.7.0.tar.bz2 1141727 BLAKE2B 4a1fa07547d81b21ae42ffa20dea6c2eb713991d55cb14b60cc0c11d4e3d38207545c71864585595f11c2506ca13e4e8df071c0029251adf1618ecd92b48bffc SHA512 1328ffc798dae65afba180bdf08718881d28fb9bd135951d43ee4d59b0bcf5cb9200c50a3f87b81505a715a44491ffb9aa23f397424a76393c2952059f94beb0
-EBUILD fvwm-themes-extra-0.7.0.ebuild 430 BLAKE2B 0d7eae308c85b990627df178e76c4c076783c3a0d8933ad37b4f6e55ab6c6d4b6bdea2d5a5a0e555a78530157dc0b06c81ff64feb62bc7237609d52cfd7835f0 SHA512 0c51194210f43a3f4bb7ae1a2c7d223dddf4fb9a9cc6d870a37f7c25aacb4d76583a5eafd7217dbb0cde35c1b81c6615dd47f3dd38f868eb6f904e264337324b
+EBUILD fvwm-themes-extra-0.7.0.ebuild 437 BLAKE2B 8266505241a73257fcf7923a2acd4a199381e9164fdae226da0ae95839a4ce1fee9529c8cae0eff2189e289853bc465207429e0dafae5b1eec3f81268256a9b0 SHA512 2510c365084c9eb7c2d17268c958d207a0358a34b1fa17e990262842133fdbc5ff3ad95e0012d51e88482bdcfc7e45a2d65d9971a551e776d70b7eab435dd90d
 MISC metadata.xml 330 BLAKE2B 14e04459de650ace277828ed03e32b82b75d138a5f73074229e1e317ab673227a2e9b7d29a1a4982c96c2d92aa87e54845c9f977282530b36a0068542a4f8162 SHA512 a6be7425713ef517100dc4edf6b8de0a82ef97323a4da67268963bee09276a9d43c6ff71ef765438cc4bfb11f76cb4c0d83efd2f5ae189bcbbb823b3b2997d7e
diff --git a/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild b/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild
index febe9b09914e..3d06f5fd2974 100644
--- a/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild
+++ b/x11-themes/fvwm-themes-extra/fvwm-themes-extra-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fvwm-themes/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-themes/fvwm-themes"
diff --git a/x11-themes/fvwm-themes/Manifest b/x11-themes/fvwm-themes/Manifest
index 0beb3ddb64f1..6d2a45158572 100644
--- a/x11-themes/fvwm-themes/Manifest
+++ b/x11-themes/fvwm-themes/Manifest
@@ -1,5 +1,5 @@
 AUX fvwm-themes-0.7.0-gentoo.patch 906 BLAKE2B e4da518c0c0e9f2a3cf757b26c2cb1013a78cb7b6e81c0d9085cac1c68bf23c4ba4361d92b9cc5835a41a5501e330428ae6b5bc0d5689bbb28a8da6a0806f24a SHA512 cfd9281e4706962425f229cf596cd3cd898e501d2503e5e688e75541438db21f3febe54225a20df246d06d78d602ff3dfbf173e0c89a858d033247656a9af459
 AUX fvwm-themes-0.7.0-posix-sort.patch 356 BLAKE2B 42f0cccef7f54e57716d16fecd8ce195fb4b50029764778409c5e66fdd8829040fde705d637970fb423a00b958a5cd6e67891895516147b24d6a3a24a43e4ccd SHA512 e74a9aadc925c752cdc863312451d4a539f493e20a858d5cf163e518cbd068f7f6eb266dc8b42e21ff1b2e5dd156e86012b66856ad79a585a3e8182eb7db951b
 DIST fvwm-themes-0.7.0.tar.bz2 921517 BLAKE2B e8011b0677bd0a7bcc4f5141bc0ec17cab20f49fc2bf7932760b8a12d3ddc0a4a3324124eef02152508be40ebae20be58f485e223ce9622beaacf2c50cf8fea2 SHA512 38b14412bf3b9b59f8a001b628c384687daa8c26c8aaff258a0fcedde7fd8c5bb3fbd7cfb083dfa46b7ff1ae2ace652727a1faf96815bc5074d8134cd073e608
-EBUILD fvwm-themes-0.7.0-r1.ebuild 897 BLAKE2B 6753a7509551631d24d9488b1ef58d6126a04bbe2de98bbbe643b801f70d29279995a91d3379cda804e502f80d133c0f6e1e28ba1b0ccf1b861367a66020a2bb SHA512 0150443a7fe75bbd34b5aa85f44179f89d5e6e6487a46a48ff4270b48b9672c2cf49594a86deb04326fa2f8b4aff55dc41139e425b5b831ff9647d90f8be496a
+EBUILD fvwm-themes-0.7.0-r1.ebuild 901 BLAKE2B cbe68544c3a765712efbe8d15ba8a276c052f18c692d21384be722ac054110ec2172d74a98e886918f1017ab38b8c89881b4b410f5872af7397e905e22b19c02 SHA512 0db7c662c223f55642b8595589d9390acdbf11a9986fc0d417e8601950477abe046a61d0b9c1623343dc4a0eecf3b42103e43c900601069b37bad97756c218f2
 MISC metadata.xml 249 BLAKE2B dbc285bbc2a8b0b548e1297ff182dda4ed31be9356d62ee606c1747e4e90bb2492fe2cd682fdebc3d88e0f07d3328013587debd633c3bce621a4e0422f4f47d4 SHA512 20a2f4c34d8593a122540afa16fa150e7efd7b5f7a845cf229163f5c1581fca1a34fcdecc59d8509ce1cbb98a5dc93c78099b6a463fbfcffb3bec1804a8c062e
diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
index 45ae2d79b317..3408eb54f1d6 100644
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gnome"
 
 RDEPEND=">=x11-wm/fvwm-2.6.2"
diff --git a/x11-themes/fvwm_icons/Manifest b/x11-themes/fvwm_icons/Manifest
index 13511ccdb990..0d7aecbce193 100644
--- a/x11-themes/fvwm_icons/Manifest
+++ b/x11-themes/fvwm_icons/Manifest
@@ -1,3 +1,3 @@
 DIST fvwm_icons-1.0.tar.bz2 328620 BLAKE2B 3df1b64903601e1db420c09d80c2907ecddbfdd8fd235b9f1a833be9ccdf20e0e8889ef6259e1c5663e107c7e7625f26fc0d7432a46571ad906436948a01f561 SHA512 79bd47492bb3854c79b5ea144467732460a0dc97a975b4ddf273d60f97a51ac71c94004293c6e073cdcbde72e6f6b38da697df6849808314937384e280f3d6d4
-EBUILD fvwm_icons-1.0.ebuild 421 BLAKE2B 0cbf524f32691a687012b72da3a6b6f7ae2f61811c223fe8bb2c63b2c167863be54dda72dcf5851ce9e9f1429fb2399369d86fca11be528f05f89eb7c1bfe530 SHA512 c06cdab37938661d8b2a3df6a7302145851678921661360783c2a53013bf858d84a075c2de8746ab24b0fdf7b84709bb2ff1877d8a6c9d940c2a6b0cd884954e
+EBUILD fvwm_icons-1.0.ebuild 428 BLAKE2B acb048a6353e338435bbf8b39411e96fe4c345bb6379a884735d33e50701a400ac2667d6fe55c004dc5449a56cedcc83543f36946721d5cbf2b88e87a607811c SHA512 95610ec54847f83fc9453035507a51c97f4a4a2ea2fe243a69793ba0bb050bdafb12a17c4ec2d14f8b6da1df8a96a08d3438db2581268211a479296c7ff9a4fd
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild b/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild
index 3f34195417d0..e7399aa8c577 100644
--- a/x11-themes/fvwm_icons/fvwm_icons-1.0.ebuild
+++ b/x11-themes/fvwm_icons/fvwm_icons-1.0.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
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2 FVWM"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=x11-wm/fvwm-2.6.2"
 
diff --git a/x11-themes/fvwm_sounds/Manifest b/x11-themes/fvwm_sounds/Manifest
index 04c99a6f2b8f..2f8bb0f2b851 100644
--- a/x11-themes/fvwm_sounds/Manifest
+++ b/x11-themes/fvwm_sounds/Manifest
@@ -1,3 +1,3 @@
 DIST fvwm_sounds-1.0.tgz 81920 BLAKE2B 679b6e44d7ec3a233ddb8665366e770a8ef58335cbb19c3ee6be94457975c33013ce222ba7d32c441e6d059703f2ad77550d92b0cc78243785e90461a5dd03f9 SHA512 816c5462459c9bd167ff1eb80ef3069ef3f3ef5ac5b797254bb1b17858c8c8cb1d3f335d7a85e159067427efb0329ff1599fb8cf5e93b723a9cffc978ab98555
-EBUILD fvwm_sounds-1.0.ebuild 413 BLAKE2B 6c1da469c89a13f1afba64fb731fd618f3ebb45c3d0003abfb4b9a32c74dd7973f7df4dfbb70fb306cde3782255b52848540cf005eb705eac2522d1f2d5a037a SHA512 cf184c8db883a0bcd236bedcd3db0eb34e2550f05bbee066a89008456f8778f90c600d996ebb91a4f5d5b129fb6d36fe8e4e8ba7e4bdfbbeace74d1cbec49790
+EBUILD fvwm_sounds-1.0.ebuild 420 BLAKE2B 37d217b0dd23ae3dee59d0dc4a5365b7e7af6f1104d79b9f3cf037ffad3be268384289f96db8cb36f3ef08abc62839bf292cc49a14ff4e68b32e8b55c6114082 SHA512 2b0245ba066149375e1404a9fa4aac03330ac2dcca035d77d02a8811e6c8b2387e1786407d5eb99e384ac5da492a63ca8877c822f494d2663c938e89560ae7ee
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild b/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild
index fdfa78a80ccf..2efd33f16102 100644
--- a/x11-themes/fvwm_sounds/fvwm_sounds-1.0.ebuild
+++ b/x11-themes/fvwm_sounds/fvwm_sounds-1.0.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
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2 FVWM"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=x11-wm/fvwm-2.6.2"
 
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index 00a5448131fd..abd249a6dcf2 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-backgrounds-41.0.tar.xz 44919212 BLAKE2B 34f84a855447cc83624be22d4757b4165a7d5552ef9b2c30f21710ad11aa769ceb3c374d07e8e4461a6322bfd29e2e9138c2dbfd50678c0db200516e0881bd8b SHA512 d5b408e702ea15dd30482f6e3b446fe27c8032c1358957a8d3d491864716144df9a074a5667f4c3ab300f90961e1fb72d3db461cca6ae7a48a0ccf865723941a
+DIST gnome-backgrounds-42.0.tar.xz 51639368 BLAKE2B 3dc288732a91d53e2db9cfca5e529c3a6bda4d272645090751349485836a3c6807bdc071a9ae9ae58032265155a04c2b381cb7479fe913608cf9e39ff0ae79ed SHA512 31cfbc52ec96bc4ce77960620a895af7f10c1fc4d474b589d49f3d1198b41792ab443bf8d7a661e71778455ab066f034c7fb6655e96db028990de0788e464e1d
 EBUILD gnome-backgrounds-41.0.ebuild 458 BLAKE2B b0cb22b5b5a6485ce1347604702bb665d737e5b7d95bf1e521897ac39c4f9b03300e15f1453de6c02085ae43dc2b7fd8330c818de6c8f1b2ef86a99737ea0c9c SHA512 1a79002a2840421cfa343882a05b40e9a4e68c9640fb8f221c239d270fa7de553295775abf00695c1c3bbf9fe814a496e61db5f2a653ca08a57b1bfc1c7928be
+EBUILD gnome-backgrounds-42.0.ebuild 461 BLAKE2B 78a05d2dcee68ad30621e3e925db540d7163d99fda61708dceea6155d4777764578ceb231fd0f58a329e98eff5d5a3bd2e0bed1ace8a7986a9b49a4213f0ceb8 SHA512 e2fc578a1f638c2733fe46e35f1c225a6075262ab79b0e54df44eaf25dba21bc875e9a593966fa9ed5179cda054b3dc25a28f98e9a95eb45e5febff5424877a5
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild
new file mode 100644
index 000000000000..899bc57295bc
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson
+
+DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+
+LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=">=sys-devel/gettext-0.19.8"
diff --git a/x11-themes/gnome-icon-theme-symbolic/Manifest b/x11-themes/gnome-icon-theme-symbolic/Manifest
index da35797b8bf4..525a89d3973d 100644
--- a/x11-themes/gnome-icon-theme-symbolic/Manifest
+++ b/x11-themes/gnome-icon-theme-symbolic/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-icon-theme-symbolic-3.12.0.tar.xz 230420 BLAKE2B e9543bced2f49c98890cb684cfe58d66b84e0e18a469b1c77e24cc10968a2663a1f15e3dc49d937706eb39bbcc83189a59069c666490153a3fb460650210c613 SHA512 e2a662d38c5c1328f384d9bdd73ce54f4e1174a1d88763e4a5f772c2479081f11c81937ba2dc159ce250e433762f14de824516fc68209200d95dc47790471eda
-EBUILD gnome-icon-theme-symbolic-3.12.0.ebuild 1022 BLAKE2B 113ec7478cee194e4ef7f1ad6d564a43ed34bf7ccc4086f42a1208dc1f8e8228cac6556c8ead3c21faeaff59da9de0c84c5994c23b2921ea83bba17414431092 SHA512 df4ae6dc15d20805b9eab32f89c0e512f970d1e8893873de88fa123a2735685120ba4401474e9aeb423c17ffcf7db769de3a3d57544f9ece8593e32440d5970c
+EBUILD gnome-icon-theme-symbolic-3.12.0-r1.ebuild 905 BLAKE2B 994f3707df2632fe06f2ae39cea7bf89278bca3c7868336f3d7141dcec2884cc6276b05331c3a584bce9b85665943fb6e2cea6fa82ffee2f71e7280f1d7e6813 SHA512 5c26ac2a843b78487519316333a0a3289fb15c2b1c52eb003b4a6ae7178906e351bdd68df22049789f0635076e8cb1263c0c0cc278b395e71717d802a824dc30
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0-r1.ebuild
index 2c90572a16ef..def008ace268 100644
--- a/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0.ebuild
+++ b/x11-themes/gnome-icon-theme-symbolic/gnome-icon-theme-symbolic-3.12.0-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
 
 inherit gnome2
 
@@ -11,27 +10,19 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gnome-icon-theme-symbolic"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-IUSE=""
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
 
-COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-
+# keyboard-brightness icon file collision with old gnome-power-manager
+DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
 # gnome-base/librsvg will be needed by apps using this icons, bug #508210
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	gnome-base/librsvg
-	!=gnome-extra/gnome-power-manager-3.0*
-"
-# Matches 3.10
-#	!=gnome-extra/gnome-power-manager-3.1*
-
-# keyboard-brightness icon file collision with old gnome-power-manager
-DEPEND="${COMMON_DEPEND}
+	!=gnome-extra/gnome-power-manager-3.0*"
+BDEPEND="
 	>=x11-misc/icon-naming-utils-0.8.7
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
+	virtual/pkgconfig"
 
 src_configure() {
 	gnome2_src_configure \