gentoo resync : 25.10.2021

27 files changed, 161 insertions, 119 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index ed0afd665910..b097c9f3785d 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index 5338992c3cce..b39cc8fce5e7 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,5 +1,8 @@
 AUX pre-rendered.ini 46 BLAKE2B 1ce5b9c6033e544572ddc22f3630fbdf0c7cfcc49bb503c20fbd667c7188640d6f4dbd368f125d22d1c863e7f58c30e2f66341a69ce35b93d0921ab019f26574 SHA512 336de96005c8a0386c2769cd82ad3e70251a7a8810e8685f9835451c1c116fffa56a0cda22989b8a60bef0bb3e067b26938a29b9a6c90f1b2f1ebb7a7448e56f
 DIST arc-theme-20210412-pngs.tar.xz 159340 BLAKE2B 40027335b8b44ae38bfadfa52e08858cf09646ed9c3e2fcddece8959d2f35845c4924002f36cea65cb27ecf61fdb3dffbf0d5c01024c34d16c31e21bf69b5a72 SHA512 85bdcd1fb81a5c33b479123bad178b1833a95ecf09310fa3b754c25f753ec10a7cada14983014b090c4a86d7a8497ac881fee9576737be29f4f772ccb59a8f1e
 DIST arc-theme-20210412.tar.xz 257248 BLAKE2B c525c3632670d8aa6b640baa8b3dddca6c5dd5f087734604c68d9140f810fc595f73db06f93b6193ba1c59a8cd85b87f5f6fda9777940adf36f3c436a8426810 SHA512 d3064546301e013a1e5a8db735346d74c73f37cbf808b7afeee6f88c820cea58ba6458fa63e1213377cdd33c8347167242e6f8f1eacf85ce212f3b2508c0bb80
+DIST arc-theme-20211018-pngs.tar.xz 160836 BLAKE2B 4c2882ce03724c7abd8d4db31da82355d28b792a16648e010eca033f77d3ad6da8f7026e2562249caa993f2e8549191b6ec8d4473fbcab084ae3d91c468956c5 SHA512 6ac7bf27ebc258d0e2c2102ed286ba196d6f9c8343e1885d77d8f29cda0f8c247926003bd8c40165e08b9b3987f8a2f82800d509b78dd598d2e7ff8bea964831
+DIST arc-theme-20211018.tar.xz 271084 BLAKE2B dc8808a5c7a0444d5ac11fa213b99b9633691ad920a07820752974f98febd8bc112a34568c38d354558e7876182278603ab66ebf8e50aa51f5eba431bd6b3433 SHA512 da46efc0e38efb7f1d0cd9a5d2c4e8f00f3b8d408ec50c54d89ef67fc3bb5ea253b5fb890b0cb8e82cafebd44a599d0de2369272ed88da73dd979052b130bd55
 EBUILD arc-theme-20210412.ebuild 2355 BLAKE2B ad3fef1485f56de1156d71c4c87b0266acc4536a0ddec4e409501513cb6f9cc1972e53c1549551adc1d88173600d685fefd48d79f363f72d68a3e5c9e7638e6b SHA512 9426f4794e66a1f320d71eff4627dbfd6ec4feeb199b1cce4d32b2d411dc00cbafe235040baa3a0fdd86a0bc3e69d38a4d0e15888284f5600d01ec6cda9e1c2f
-MISC metadata.xml 899 BLAKE2B cb5e503e0fa06b95ff1cca44a1531f62452b471f499626275983db02fc07f87392c791614304533e2421351079f4bf75e972f2ff2700b89881282e8efbe30b55 SHA512 0747f62c2b2458cec714593ee8773cb235cfc5d3222ebf6bb32e0f2ce1c7cfd104da8fd0f7bdf62b28c4d52e4bbe784011996da20773a32f21826ee5d1e96a0d
+EBUILD arc-theme-20211018.ebuild 2490 BLAKE2B 940d9c4e2c6edb0047078297f474975c29534e46acc2fe96a8e8ca1a0db7a0d5d2ee57e8bc3697fb71cbef36d5ca44fa5410e1e0bacb6a8e8f77a363ea614b4f SHA512 670f26e3670bf270f66bd59cd114174c7c187841bdf211c031b8e9255205e640f4662fc4e3a6c1dd39814d5c3d85e97a3c08ac4ebb3b458bf3ae6956e2baa63e
+MISC metadata.xml 946 BLAKE2B d4014414bf6cec247b14ff903b108f5a7abf296615bc49e89765c818f98199ea3fe4ceba21605b3b476ef71a9d2e18b4a47028e5c631a1f047a5c7af92b64a53 SHA512 e18f46b5e3a9543a99dc5886e961ccddf82dbb3f0e50401468ee54603b942e74059526d265e4c444e459236a2c5c13240ede22f7e6b7da6208372acc2d073567
diff --git a/x11-themes/arc-theme/arc-theme-20211018.ebuild b/x11-themes/arc-theme/arc-theme-20211018.ebuild
new file mode 100644
index 000000000000..1913f6de05eb
--- /dev/null
+++ b/x11-themes/arc-theme/arc-theme-20211018.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# USE="-* gtk2 gtk3 gtk4 xfce" ebuild ${P}.ebuild clean compile
+# cd $(portageq envvar PORTAGE_TMPDIR)/portage/x11-themes/${P}/work
+# find ${P}-build/ -name "*.png" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="A flat theme with transparent elements for GTK 2/3/4 and GNOME Shell"
+HOMEPAGE="https://github.com/jnsh/arc-theme"
+SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.tar.xz
+	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cinnamon gnome-shell +gtk2 +gtk3 +gtk4 mate +pre-rendered xfce"
+
+SASSC_DEPEND="
+	dev-lang/sassc
+"
+
+SVG_DEPEND="
+	!pre-rendered? (
+		media-gfx/inkscape
+		media-gfx/optipng
+	)
+"
+
+# Supports various GTK+3, GNOME Shell, and Cinnamon versions and uses
+# pkg-config to determine which set of files to build. Updates will
+# therefore break existing installs but there's no way around this. At
+# least GTK+3 is unlikely to see a release beyond 3.24.
+BDEPEND="
+	>=dev-util/meson-0.56.0
+	cinnamon? (
+		${SASSC_DEPEND}
+		gnome-extra/cinnamon
+	)
+	gnome-shell? (
+		${SASSC_DEPEND}
+		>=gnome-base/gnome-shell-3.18
+	)
+	gtk2? (
+		${SVG_DEPEND}
+	)
+	gtk3? (
+		${SASSC_DEPEND}
+		${SVG_DEPEND}
+		virtual/pkgconfig
+		=x11-libs/gtk+-3.24*:3
+	)
+	gtk4? (
+		${SASSC_DEPEND}
+		${SVG_DEPEND}
+	)
+	xfce? (
+		${SVG_DEPEND}
+	)
+"
+
+# gnome-themes-standard is only needed by GTK+2 for the Adwaita
+# engine. This engine is built into GTK+3.
+RDEPEND="
+	gtk2? (
+		x11-themes/gnome-themes-standard
+		x11-themes/gtk-engines-murrine
+	)
+"
+
+src_configure() {
+	local themes=$(
+		printf "%s," \
+		$(usev cinnamon) \
+		$(usev gnome-shell) \
+		$(usev gtk2) \
+		$(usev gtk3) \
+		$(usev gtk4) \
+		$(usex mate metacity "") \
+		$(usex xfce xfwm "")
+	)
+
+	local emesonargs=(
+		-Dthemes="${themes%,}"
+		-Dgtk3_version=3.24
+		-Dgtk4_version=4.2 # 4.0 dropped in Gentoo, works with 4.4.
+	)
+
+	if use pre-rendered; then
+		emesonargs+=(
+			$(if tc-is-cross-compiler; then
+				  echo --cross-file
+			  else
+				  echo --native-file
+			  fi)
+			"${FILESDIR}"/pre-rendered.ini
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	# fontconfig issue?
+	# https://bugs.gentoo.org/666418#c28
+	use pre-rendered ||
+		addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX
+
+	meson_src_compile
+}
diff --git a/x11-themes/arc-theme/metadata.xml b/x11-themes/arc-theme/metadata.xml
index 25d3932c367d..c54d3e049299 100644
--- a/x11-themes/arc-theme/metadata.xml
+++ b/x11-themes/arc-theme/metadata.xml
@@ -12,6 +12,7 @@
 		<flag name="cinnamon">Install theme for <pkg>gnome-extra/cinnamon</pkg></flag>
 		<flag name="gtk2">Install GTK+2 theme</flag>
 		<flag name="gtk3">Install GTK+3 theme</flag>
+		<flag name="gtk4">Install GTK+4 theme</flag>
 		<flag name="mate">Install Metacity theme for <pkg>mate-base/mate</pkg></flag>
 		<flag name="gnome-shell">Install theme for <pkg>gnome-base/gnome-shell</pkg></flag>
 		<flag name="pre-rendered">Avoid <pkg>media-gfx/inkscape</pkg> and <pkg>media-gfx/optipng</pkg> dependencies by using pre-rendered PNGs</flag>
diff --git a/x11-themes/clearlooks-phenix/Manifest b/x11-themes/clearlooks-phenix/Manifest
index c8efa6793583..041779c6bc8a 100644
--- a/x11-themes/clearlooks-phenix/Manifest
+++ b/x11-themes/clearlooks-phenix/Manifest
@@ -1,3 +1,3 @@
 DIST clearlooks-phenix-7.0.1.tar.gz 319467 BLAKE2B c1ba52ef1ea8bca06e47a9ae3f37f764dd70a32239d758be7117de1b28422ba2bee0f9549e2b32adfb05eff38f864baaf2515d04e274dee80412c0d743f1ac06 SHA512 f304278429d6ea796c566a4b9301bcf146243bda24807b9f0f1367c8eeca488106c62f20bd17e7b4e32580b11e21c8c8515eb9ae4dfbdf9da52d6c3d59d7730c
-EBUILD clearlooks-phenix-7.0.1.ebuild 551 BLAKE2B 9b6435085d0f71c71e7202fe05c45413b07525d9dbe2928ca38fc4df53c8f93452ce834562558b393049efa7040f540dda51a870d7029ae6829b3ed3b45cf073 SHA512 e245e70bf5f523220fab08e60b52205aacb68c5d89e018c7042e4b6092a5e8df45957ad6d2429d1ff3a72b1bf4fd5c3653a4df8ca93c18c13d499b92503e440f
+EBUILD clearlooks-phenix-7.0.1.ebuild 543 BLAKE2B 7659a4d683d6390cb8d29a732613afd6b7f0bc3d93aafa17af8f75898428c7c2fec201b7c81e17ee7d1e9c52a8be5f27a579ca63660ba8662a6e1244d62c7d37 SHA512 e77b23ffd13838e489417b1c3b49c12fcc3deda2d9c7a1c34c3d2a400d382abe89d28f816459160c6008608ae146e7a13a42eee1e957d9ce0c82fba76deb38a7
 MISC metadata.xml 258 BLAKE2B 6e690288f9ac2fcea7c5befed69b5747916b1583fcd463fe37432cbd70c09776c21228f6e6bfb3dddeb03bb0735bce6847b840fe55c89b02c81573f8038905d8 SHA512 2a2426a465bca9a3832d25a5e31c721bf2687285b89887b128d8ca73f6f08c4da5904f564b1df6a59df59918dc722aae33d9e6fccf38a56a9d6f58bd3b845b6b
diff --git a/x11-themes/clearlooks-phenix/clearlooks-phenix-7.0.1.ebuild b/x11-themes/clearlooks-phenix/clearlooks-phenix-7.0.1.ebuild
index 48eee81abd02..089329303334 100644
--- a/x11-themes/clearlooks-phenix/clearlooks-phenix-7.0.1.ebuild
+++ b/x11-themes/clearlooks-phenix/clearlooks-phenix-7.0.1.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Clearlooks-Phenix is a GTK+ 3 port of Clearlooks, the default theme for GNOME 2"
 HOMEPAGE="https://github.com/jpfleury/clearlooks-phenix"
 SRC_URI="https://github.com/jpfleury/clearlooks-phenix/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 x86"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=x11-libs/gtk+-3.20.0:3
diff --git a/x11-themes/gartoon/Manifest b/x11-themes/gartoon/Manifest
index c0b04fad6ae4..77c4aadae89a 100644
--- a/x11-themes/gartoon/Manifest
+++ b/x11-themes/gartoon/Manifest
@@ -1,3 +1,3 @@
 DIST gartoon-0.5.tar.gz 1552790 BLAKE2B 6d753c806a26fed906a212b288c3db8de2487ed47abb660769dce2fa3785dd7e7608ebb95987d64ab8978616cd030e54ce83072d052a053adf6b4584a1320bb6 SHA512 c9a3def77e9cbbd8bb6f5ae469b4720b8b26b182daef44f65676a8a1db48424d1e73c3dd8a26b0b8918ad81a9dca0a1f78e162a1e1a938d9a56115dbbaf4ebb9
-EBUILD gartoon-0.5-r2.ebuild 1208 BLAKE2B 4fa1aa29fd2b07d0cd58e2bc6666f39025ffd56e6e9c890fa0e540e6e3a1e1126dbd13041d7d6f463e9d95ce0630bfefe1e46676a9b80f72b87a97996b39137f SHA512 5d1a7afd54700303e6901eac09e6b8b7fb0b26312abd2e0758e65ae13bc3baf65f703e68f1deca93b591a60ab70fed12209f53129750e86eaf73947c887e22a0
+EBUILD gartoon-0.5-r2.ebuild 1218 BLAKE2B c4829e8a3f6f3690026a6b5b64afb42a0a3e695f019e64340cd7797276e3ce6dd685ec3eb72266e2a60581a4d0efaa49c28f8e9e69378d68dd6be34f15b8c4ee SHA512 0da29cd7e3161dc0cef598ddf9e9b0dd0c29d5199018bb16b8397ae1f70c4a55fa15a46bc8abc588674f49e9d47fbf5b58bee8f8adbd3aeffa92d575e081877b
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-themes/gartoon/gartoon-0.5-r2.ebuild b/x11-themes/gartoon/gartoon-0.5-r2.ebuild
index d96da6db459f..afc3705691eb 100644
--- a/x11-themes/gartoon/gartoon-0.5-r2.ebuild
+++ b/x11-themes/gartoon/gartoon-0.5-r2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Gartoon SVG icon theme"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc sparc ~x86"
@@ -13,13 +14,12 @@ SLOT="0"
 
 RESTRICT="binchecks strip"
 
-S=${WORKDIR}/${PN}
-
 pkg_setup() {
 	mydest="/usr/share/icons/${PN}"
 }
 
 src_prepare() {
+	default
 	sed -i \
 		-e "s:\(^pixmap_path\) \(\".*\"$\):\1 \"${mydest}/scalable/stock\":" \
 		scalable/stock/iconrc || die
diff --git a/x11-themes/gentoo10-backgrounds/Manifest b/x11-themes/gentoo10-backgrounds/Manifest
index 62156bf8bbde..c8631b8dc6cd 100644
--- a/x11-themes/gentoo10-backgrounds/Manifest
+++ b/x11-themes/gentoo10-backgrounds/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo10-backgrounds-20110309.tar.xz 21649584 BLAKE2B 1d15de80fa4f96d85196a92ce0b2afe485b920ca1827791a775ea666034f1da522be8ad2764dcea2ede9e92e516cb23e41f0db06039f85422a8553d7e1b35bdc SHA512 194acc2b5133a92be3522ec6502fdf4cb6b5c5948f168c119304dbaf3bdcb21cd9e3ea9b948e91a1206c2233c670bf630a95d98aba78b621a6437244a9a861e1
-EBUILD gentoo10-backgrounds-20110309.ebuild 1148 BLAKE2B 4828b8b6cfebd45a59416281d9b21728a0f162db2a152c07aed613f7be5005ea3bb934a85da2733b0727eac6733a9e7b88241912063cf67662886c41e302f2b3 SHA512 28f7c276a5b3a10ad76dcd24ca2e0afd1be566f13f5bf79fa0c939baf8105e7256b1a427b01b77b932122b3b0e1f7f159c138efbfc7139c9823b6f6609456646
+EBUILD gentoo10-backgrounds-20110309.ebuild 1093 BLAKE2B f97d90edc9249e5330ef91ddef3b19144fbd8f34e55b62a0d3fa53941b8a01a784afe84e452e7ae324444c535efd1e8162e69dacce25235101df6790b81b23b5 SHA512 a032af0c1a0fc94e83c73131c6261023006c279a74f48afdb0ca696cc649339bc1f785c7b9c3f06261df4d7f5f4324fd2dc76a7af49eb06ea1e5d3af145608d6
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild b/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild
index 7718adab6a51..b2c3afe621c4 100644
--- a/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild
+++ b/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild
@@ -1,31 +1,24 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Gentoo - 10 Years Compiling Background Artwork"
 HOMEPAGE="https://www.gentoo.org/inside-gentoo/artwork/"
-
 SRC_URI="https://dev.gentoo.org/~flameeyes/${P}.tar.xz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="CC-BY-SA-3.0"
+SLOT="0"
 KEYWORDS="amd64 ~mips x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/xz-utils"
 
-S="${WORKDIR}/${PN}"
-
-SLOT="0"
+BDEPEND="app-arch/xz-utils"
 
 src_prepare() {
+	default
 	sed -i -e "s:/usr/:${EPREFIX}/usr/:" *.xml || die
 }
 
-src_compile() { :; }
-src_test() { :; }
-
 src_install() {
 
 	insinto /usr/share/backgrounds/gentoo10
diff --git a/x11-themes/gnustep-neos-theme/Manifest b/x11-themes/gnustep-neos-theme/Manifest
index 243bee63df96..8e377eb6d080 100644
--- a/x11-themes/gnustep-neos-theme/Manifest
+++ b/x11-themes/gnustep-neos-theme/Manifest
@@ -1,3 +1,3 @@
 DIST Neos-0.1.theme.tar.gz 63018 BLAKE2B 3fc90eb3819a80b64b32d9fd30e8f9f2e48c96c7ea03117df81073f85f248790ce0463fe7c8ca23d5a5241b291ad92190632b95d60c33e54576342c156a373b2 SHA512 9c8c404d2a67c77f64dec94b9828ff54e48360357e7dab5d374481a0249998e93a23a32344bf8ebfb9c1a5822c553265903e6c6cb576be3e8123c68b114e2874
-EBUILD gnustep-neos-theme-0.1.ebuild 695 BLAKE2B 6f22f7545dc8d772a4684e1b9350ff4d22987f94ed0600bc2a48dfd9e01b66dded19999aa29fdfff1d2dedd1147ac1ef929e7c384ef67642829d3ef6e1c8694f SHA512 9b3490c2f256ea9e721ff10d988444da1f12dce2a4e384236e398fb0cddeeba9ba28e157c6a614bef934f5827a2cd4319d52f60d83b54d9eac5ff164d55945c4
+EBUILD gnustep-neos-theme-0.1-r1.ebuild 704 BLAKE2B 6e16d0a44ce61f03100cbb75b299cc4ddf5ccd55998fcfd3068c45152931b263171bc78bda4795dcd3c5acb41f7b16275f9450744f6525aa755e892d4ce5094b SHA512 317a465b1a1ca0fa843b8b222f632a213f0c4fe75a26cfac601c10ff20381157335dabee04d421057e85f489ece12f87e02f759e5707276302a6ec14d091bc9c
 MISC metadata.xml 638 BLAKE2B 35296e11964476265672d13febebd217cf319413a6f2abf216076bd32fc686a2a801f9068caab3a6dc7a51c5061762f1a7984080e45437d6eaa0a5fc335ed548 SHA512 fa014c58478a0e331934c843287c86e2a89cc254d22edc4a450482e33ff5b51459f0be432abc87b6e8f7cd1369ee2ca4cdffac23bd0d3ac9cddd6997f6390496
diff --git a/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1.ebuild b/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1-r1.ebuild
index a06b099d78ad..fe713bff6ee8 100644
--- a/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1.ebuild
+++ b/x11-themes/gnustep-neos-theme/gnustep-neos-theme-0.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit gnustep-2 vcs-clean
 
@@ -19,6 +19,7 @@ S=${WORKDIR}
 RESTRICT="binchecks strip"
 
 src_prepare() {
+	default
 	ecvs_clean
 }
 
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 938b5e365a14..fe305c828e7a 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -1,7 +1,5 @@
-DIST papirus-icon-theme-20210501.tar.gz 27320777 BLAKE2B 4839189681e898eacc873a4077d92200085a1dbfb8e4d3298c8e6da0cc9966c9ceea903957abf8f4106538764fa73d27ec8375b8011b1196a4c97c6f8b23ce15 SHA512 65f096428756e52a4c373c206a320e2185fc176238100fd2e8dc9281c7772e3a3381a6ce2d4642be9ff0ea97f5e5292b1a5b631c07459d5863ee7e5cfcced8ac
-DIST papirus-icon-theme-20210601.tar.gz 27817563 BLAKE2B 3f0be519dfdba08f1cc4e43f7ca92e117185ec18b48fa7fb037db686449ffb4f7b4bff949b55d914620d2b29676e43f05542db31daf18ddd8f175ee64328e449 SHA512 30b59e4f05718efb7790fa4e734d91886408adeb7e0adc9d98e7572ba5f4163fa81574ac8811b88106eebefd1b0dc71ffb4be07aac8f4720aa7b2a206a00150a
 DIST papirus-icon-theme-20210701.tar.gz 28129228 BLAKE2B cb4b8891607bfa2b245858c746e590d4a1aca973037669268be682a06ada5074e298666a1d9a9ee9ce66be92778fcf34d3cf306c9864332ea7ebc25f52568f30 SHA512 0ec131bac6a0804d0a61d0c01c30d8d55f4438e93e17849a5c3cb741c4d8aa050977b24101d7f33416a7d617b53c5dca28ce38316e52bd5f72d9034147983d4d
-EBUILD papirus-icon-theme-20210501.ebuild 526 BLAKE2B e2d070dfe2862e3567eea4a27de10b02bd512361bcc10a320932dc9ca6d0569f87f13fc9382fabb387f0cb19c46266b938a8c2d5de0c0bdca169753ada0ace82 SHA512 003c299b5e41a702e059bf289ce95123e90df76340b9f39be0e2476d4e04aa9aff1327ad11c926a42b711903514a8877a1850860f0ac8c22719fb25c374f5ea3
-EBUILD papirus-icon-theme-20210601.ebuild 525 BLAKE2B 9e249794c8469d8c1c89a453e97c4b2c710b87936ec9d660701911e1076b0c29e1e44de2fdda7321c84d5ba4a42a5cc475537cbf59096b4575bafb263f1684ec SHA512 34dd9949f2acfebb50499f9d2d6d08f630dc6f8794eb501906cdf27e192577b200627ca3d415331a4c7f1eb2b507f2afc5eb590abbf913c82fdd7a5dc7a1acd8
-EBUILD papirus-icon-theme-20210701.ebuild 528 BLAKE2B fa548e79eaf5dc78baa49423599053003e2c29f3141277160a7e83efd9e490bf84ddedce4d9c0f47df783972638d874f08e9131e8dc99e7fec565f5c5c66995d SHA512 68fcb1553d7ec3bad175ab2ffea2de4d6b30a3490febc3f26542b79fbcb43f889ee4181b3c34c5b0774374077bcb5f85089eeaa57cdb954ac636f8244064fc79
-MISC metadata.xml 387 BLAKE2B aa7681245a4658ba3e9a802186a087771706513f70a4398ccfedfb830000b49397745c60e24fccb7905ba763d74d3614a2b116b432ecb03d4c2ad97f8ca300b7 SHA512 0803a532b7bfc3e00167e7c6b1c1d257226653f8a1c11578dcfeaf662fb016f4bbd9e1f910b617b9f310697702cd3b636849ff0424a289983b79209dcbb76e70
+DIST papirus-icon-theme-20211001.tar.gz 30024108 BLAKE2B 1212ea8f63617128f0b5436fc15c634ea8b8aad43044ebe6bc5135192250bc0c8171e36ad6e8df27bd88037425867c65ae58c129898e86d9d6a6434045cb422d SHA512 f6816e5a24d2337e4cda84f66116e35ca24c5e5db81f0f7a10895fadf93a48c108df8182250bfa3da3fe0be26a8165c279e92a353053357c34745db845458424
+EBUILD papirus-icon-theme-20210701.ebuild 524 BLAKE2B a1dbec3392b491627e6670aa2a76c81404f24572412ae70126265bf1033c14278e860f126464b67bf789e6f2e48f08bd2e5db1173aa40147d61a7c322ed94187 SHA512 6f2fb2232cc90868aece910f038ae6caba11826342a4b3ea58a69018bcc08fd3e28f0578517b2ad1a1e0ed0512fa2b95935e62445158484958cbe2cde8ea5f75
+EBUILD papirus-icon-theme-20211001.ebuild 596 BLAKE2B 00720e9172c23c62df28fdb36d8b8019e8b8b483c49e71797c2e0f6416ad545372c105adde5b6224e25076bbc3b33666a6e82bb29d017846700a15887573f7d3 SHA512 6f34fe72e28fbe3312b637a36b7529fdb4e454d6921f642d0495b7eb62125ee3f9762c0a2f6e06fac45d8bb6c926ecfa9d031f5f35f47492727db7185345b30e
+MISC metadata.xml 387 BLAKE2B 20fe242ee294bb30712274f9a8c99ebf35399c4cc1bc6507c60bf00a621d8e18b78344c374fdadf28ef6a3f62a6569df791713170d95603922af75bb0328936c SHA512 5124d3c6a8b1ab334da52fc49b1e78d41e25bb0e38ee8a27e3e240e5d966cd4f3c93f2c8c3f645cb40b7aa70305e7b32b26870a742d545aaa373ee37cedf7057
diff --git a/x11-themes/papirus-icon-theme/metadata.xml b/x11-themes/papirus-icon-theme/metadata.xml
index c6bdb5b76460..686d2988ff31 100644
--- a/x11-themes/papirus-icon-theme/metadata.xml
+++ b/x11-themes/papirus-icon-theme/metadata.xml
@@ -4,7 +4,7 @@
 	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">PapirusDevelopmentTeam/papirus-icon-theme</remote-id>
 		<bugs-to>https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/issues</bugs-to>
+		<remote-id type="github">PapirusDevelopmentTeam/papirus-icon-theme</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210601.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210601.ebuild
deleted file mode 100644
index 11cbbeabf451..000000000000
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210601.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-DESCRIPTION="Free and open source SVG icon theme"
-HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
-SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
-}
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210701.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210701.ebuild
index 27d277b2e336..8fd0ed502ff2 100644
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210701.ebuild
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20210701.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 
 src_compile() { :; }
 
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210501.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20211001.ebuild
index fa344b3837b2..e895bb5a1d48 100644
--- a/x11-themes/papirus-icon-theme/papirus-icon-theme-20210501.ebuild
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20211001.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit xdg
 
@@ -11,12 +11,11 @@ SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 src_compile() { :; }
 
 src_install() {
 	insinto /usr/share/icons
-	doins -r ePapirus Papirus{,-Dark,-Light}
-
+	doins -r ePapirus{,-Dark} Papirus{,-Dark,-Light}
 }
diff --git a/x11-themes/pidgin-penguins-smileys/Manifest b/x11-themes/pidgin-penguins-smileys/Manifest
index 79e45226c6b1..ba41bebd1e80 100644
--- a/x11-themes/pidgin-penguins-smileys/Manifest
+++ b/x11-themes/pidgin-penguins-smileys/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-penguins-smileys-1.0.tar.bz2 262178 BLAKE2B 31c81d4ef8e02ee2bd771424f66df0a155735bf73f34a5029486364d1903e48b3b7d1454f80cd93bfd836c74fc6bbc0e26fc5e58e2d103678bdf7122ae7cb2de SHA512 f4ac197d31f9b723eb96561540b57afbece3bfa239e70fbe823112087c81cb96246a1878ffd02b1bacf2c1b36c0ed5e1a987ad8852772f3d2f605e4bf8e877a9
-EBUILD pidgin-penguins-smileys-1.0.ebuild 580 BLAKE2B c8b70b9d41a85153dd656f509001983b88cedfe9b76496e031e9f9fa7eea0953bc66b574b01c996660700081376ed67a66afafca640fb1ad267a53445a714c9d SHA512 d0637055b5e47df2972a0b9e0f4d935265cfb2508915490d13eb24045572c902e26faa3a331bd3f437c23a298f52e866cdd492fb845d4e36de2c811ef5dd833f
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD pidgin-penguins-smileys-1.0.ebuild 573 BLAKE2B 4f682f9ca9d79ea7007446fa89b51642d9f3319bc46dcfaf00fc5a71a3cd69c158a1577cf09aee98542b2c38ef9898bd0b8925be43b2abaacefce13b57af0c48 SHA512 8490645b5fa59fb140ed081f52dd7640d2e9ff43818e8a50fc81e848538caa8626b699c9c2ff2387e4aab66c4ee608a6a42f62528e9006936cfecfef67e2630c
+MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-themes/pidgin-penguins-smileys/metadata.xml b/x11-themes/pidgin-penguins-smileys/metadata.xml
index 85e4ed814fa2..115e9d64a669 100644
--- a/x11-themes/pidgin-penguins-smileys/metadata.xml
+++ b/x11-themes/pidgin-penguins-smileys/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-themes/pidgin-penguins-smileys/pidgin-penguins-smileys-1.0.ebuild b/x11-themes/pidgin-penguins-smileys/pidgin-penguins-smileys-1.0.ebuild
index fa11a9d0fe46..a74aad86f304 100644
--- a/x11-themes/pidgin-penguins-smileys/pidgin-penguins-smileys-1.0.ebuild
+++ b/x11-themes/pidgin-penguins-smileys/pidgin-penguins-smileys-1.0.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 DESCRIPTION="Penguins pidgin smiley theme"
 HOMEPAGE="https://gnome-look.org/content/show.php?content=62566"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}/penguins"
 
 LICENSE="GPL-1+"
 SLOT="0"
-IUSE=""
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="net-im/pidgin"
 DEPEND="app-arch/unzip
 	!x11-themes/pidgin-smileys"
 
-S=${WORKDIR}/penguins
-
 src_install() {
 	dodoc readme.txt
 	rm {readme,emots}.txt || die
 	insinto /usr/share/pixmaps/pidgin/emotes/penguins
-	doins *
+	doins -r .
 }
diff --git a/x11-themes/vdr-channel-logos/Manifest b/x11-themes/vdr-channel-logos/Manifest
index 5dee4088e7cd..e28aada43085 100644
--- a/x11-themes/vdr-channel-logos/Manifest
+++ b/x11-themes/vdr-channel-logos/Manifest
@@ -1,4 +1,3 @@
 DIST logos-0.2.tar.gz 659476 BLAKE2B ed882e950fb5d1a8c1fea6194dc5311c43f68f92d25cb2e2b9298c2ef86ec165f30217b58f470cbc81d8122cedd1fa8441f6ab7249a448e3160f5d0c4f797810 SHA512 27b961a9c4da2e3d11e932f0ed69e85f5cac5e06666b1cff116cae483a32ab45c794ebb225900153745cb75ae51d211dbdb5a8dafb28997a5420859dd8ef55ad
-EBUILD vdr-channel-logos-0.2-r3.ebuild 910 BLAKE2B daf250c2bcb73700ce4858a94a9d4264f1e5c62e5ca5424178def751a286c619a52752f21fa55e57d97401ad41c45bbbadebedbf618c2e8169baa69a42555751 SHA512 351c3aa40973793ac44cdb8f6443c00600f7ad4d6a38af76009afb415b625761705a5653568f832e8902878d855e1b46b5ec0cf51ffc2f3682f071ba948a8159
-EBUILD vdr-channel-logos-0.2.ebuild 544 BLAKE2B ce3f3ae3048b889ff6959fca03af9d7298544cea927c4ed4678bec1f396acebc3b342ed0446df011be759af9842f121e89fb7f19aef7be2aba21edfc0a96f89b SHA512 b51d52c716a1c4d411ce68408ebf7c8628135f942ced4968cb15f539ba478ff6c6532994f8a9ff4f4b5eb22970192d77f9b42dea5813db0d3aade90fb1c84297
+EBUILD vdr-channel-logos-0.2-r3.ebuild 908 BLAKE2B 16f1ff26c3d34ec54bc5731029f4e37f52c6cfdf6ac794055ed95f832b5b309dfdfdd798f6bce7c360119cf910f35de5005cbe0577883a702066254958923ca0 SHA512 e1e2cf178f71cbd0215d11bed5e0c415da9d14b18140e23c80b91414a1ae2025783fef2f7be3d134052d27977804acc08cff7e20dc9c70d77c1503c10e1df98e
 MISC metadata.xml 363 BLAKE2B 911ebb6e42e2e927cea00f7aaaf406d52e33dbe04427fa7c922ea1199cec1115b7ef59fd9bd7fdbd0882609e6265c453bf65901ad35ebccd47df52d581dcfc27 SHA512 f4f468dc33240a5446b65861ab9872cb89017ed5d9f52468870c0ee39911a31a2198a7ee54afaf229a3948e02617e98d1f2c8f69fd6c0274ceae995e0b34e3fd
diff --git a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
index 427c4822d44b..b73de828c93d 100644
--- a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
+++ b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vdrskins.org/vdrskins/albums/userpics/10138/${MY_P}.tar.gz"
 
 LICENSE="fairuse"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S=${WORKDIR}/logos
diff --git a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2.ebuild b/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2.ebuild
deleted file mode 100644
index 196e464f3fce..000000000000
--- a/x11-themes/vdr-channel-logos/vdr-channel-logos-0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_P=${PN#vdr-channel-}-${PV}
-
-DESCRIPTION="Logos for vdr-skin*"
-HOMEPAGE="http://www.vdrskins.org/"
-SRC_URI="http://www.vdrskins.org/vdrskins/albums/userpics/10138/${MY_P}.tar.gz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/logos
-
-src_install() {
-	insinto /usr/share/vdr/channel-logos
-	find -maxdepth 1 -name "*.xpm" -print0|xargs -0 cp -a --target="${D}/usr/share/vdr/channel-logos/"
-}
diff --git a/x11-themes/xcursor-themes/Manifest b/x11-themes/xcursor-themes/Manifest
index 7eda2c588fab..93fca70005b4 100644
--- a/x11-themes/xcursor-themes/Manifest
+++ b/x11-themes/xcursor-themes/Manifest
@@ -1,3 +1,3 @@
 DIST xcursor-themes-1.0.6.tar.bz2 2363089 BLAKE2B faf6041152d9b42f37ab4d9691f4f11c6b5be52f968f57f88348c0630fb5d5f42ee866ba7ee6072bb4b5ff9121ac36bf49a524b3ceee7e069707dec72767e723 SHA512 2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3
-EBUILD xcursor-themes-1.0.6-r1.ebuild 373 BLAKE2B acc65889a0a014bdea47831288bb67692c724122dd9cd6376933dfd60123694e5e3d5f287fe401466c19c6f5a634d39ee3322b1885e0fe3d2036309ea467ccb0 SHA512 e5ba19e06eef74746b602b2d9c382add36b58828107b2722226124d23e314d45bc08a8587abe2e4ae00acd3abe4db4e27c12deee907a2f900c89ebbae50277a3
+EBUILD xcursor-themes-1.0.6-r1.ebuild 380 BLAKE2B 4893daf7b83baf9843b6b27b5f0dbaaefb230be37e6f635a3f6d03be9c95933a0483fca86ebc8fddd1a70f117c60b200eb535a4c7cde6b51d3a9add5fc23f6d2 SHA512 d5aff60632b60438c982716ae1e41fa25f3c2d08a40db8b1fde997a7c36676362a2f5365b61f71b0c1a88c6d9d33e400304721db442c9331795b40c375d92901
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-themes/xcursor-themes/xcursor-themes-1.0.6-r1.ebuild b/x11-themes/xcursor-themes/xcursor-themes-1.0.6-r1.ebuild
index 9c326b9d7d7f..dac2e6be8d6a 100644
--- a/x11-themes/xcursor-themes/xcursor-themes-1.0.6-r1.ebuild
+++ b/x11-themes/xcursor-themes/xcursor-themes-1.0.6-r1.ebuild
@@ -7,7 +7,7 @@ XORG_MODULE=data/
 inherit xorg-3
 
 DESCRIPTION="X.Org cursor themes: whiteglass, redglass and handhelds"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 BDEPEND="
 	x11-apps/xcursorgen
diff --git a/x11-themes/xxv-skins/Manifest b/x11-themes/xxv-skins/Manifest
index 3fbbbe731339..bfb7f7f8aca0 100644
--- a/x11-themes/xxv-skins/Manifest
+++ b/x11-themes/xxv-skins/Manifest
@@ -1,4 +1,4 @@
 DIST xxv-jason-1.6.1.tgz 892863 BLAKE2B 3181acfc4d13f32772413f7add4ee476b881e3e1be8f4767ff342b6df94aa5fa51258faf58f53e37405e80cd39d08beb91701c61ad8d5cd57005465829abf444 SHA512 fcab6c52106265209fa80c61b9ec24a063974f817225649be7bca3ec1468df7c8d82aba5372f5a7fcb7f0beff2dff275e0a1969e91fdce8c985b60d4514e2a4f
 DIST xxv-skins-1.6.1.tgz 537124 BLAKE2B 76e7a8f947e079db7677c013860f485f26dafc7e4af43526f52a423e2871260027597ef44e06ba7a60d242f221bca0740719cec8fb7f24b2096f305a102e6db1 SHA512 108240563d733af3853b72417f34f45638ffab1b9c487c5fd12068ced604da01c357376875679614b0ce6404c58dbf06f0f3481a1f0d47ae5eca0fbbd7f02bab
-EBUILD xxv-skins-1.6.1-r1.ebuild 597 BLAKE2B 3fd2c42a52e3b602e6b0a9ddfdcdeff97e90861e3258f68fb7c0c621c702b1eacf838cbd01b41fe5e6655f056368a2f048246e42397d74e54f1735d0fe46835f SHA512 95107a4179f8f2f8648fdc69b429a0232a6023da1e779ecc00f2cf8cecbf860f3641d7a94cea1c8405c2e78604290680a0dd854a6d717ef5d49fcc34d21383c0
+EBUILD xxv-skins-1.6.1-r1.ebuild 474 BLAKE2B 9e8272a87eaba1a9109dcf501fdf24481d15696b909802cfe6512361b6e8f2e1fb3ec9be4e7ad2173543336d57366b188806d191b56956ff66b6d167b679fd1b SHA512 0345ff21edf9af359d9a8f34ddde1ebfcb8c9f124a2c63834a46e829714defd37baba1e1322d375337643e077f59d59767242ac0f52680325958464f3b2d5ee1
 MISC metadata.xml 248 BLAKE2B ce343379858c62b2de8601b9691d403f0160395f4079731bb57169103e11ea7bba130891e8e6e5d002e7b0034e47ee98419c2926ed5fea5d25488a7991244668 SHA512 c9e5e395e45f693d09e7ed87de9df390693aedc01af0c74e25eae1bb7ccde2545debcc25b43c656987a3d6aa2a592dd0cb2f81396912382cbbc0575c1ee506cb
diff --git a/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild b/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild
index 6b5eb87ec4d4..0eb036735d60 100644
--- a/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild
+++ b/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=8
 
 DESCRIPTION="Additional skins for XXV"
 HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
@@ -13,23 +11,10 @@ SRC_URI="mirror://vdr-developerorg/719/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="~www-misc/xxv-${PV}"
 
-SKINROOT=/usr/share/xxv/skins
-
-src_compile() {
-:
-}
-
 src_install() {
-
-	insinto ${SKINROOT}
-
-	cd "${S}"
-	cp -a * "${D}${SKINROOT}"
-
-	cd "${WORKDIR}"
-	cp -a jason "${D}${SKINROOT}"
+	insinto /usr/share/xxv/skins
+	doins -r . "${WORKDIR}"/jason/.
 }