gentoo resync : 24.07.2021

18 files changed, 48 insertions, 384 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 7774705b01b3..7a1c4acde85c 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 1292b307b6ca..cdfb04f69438 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,12 +1,5 @@
-AUX meson-inkscape.patch 3785 BLAKE2B a83796183a73e9741a6347444ce161c9da89c702fc150e165e27b4658b3c4e41a5bf9b9f1d43575b8407c3263d30979f9de5869d3ec4fa9e070a1ff03dc98e92 SHA512 64cf610ec4ac979623a9eecd17ee47e031375e442ed81c67d9acc8fbfc5e83c389cd510d2ee7f143a7a5ce836453e60f733db82306edfbacafaeb6e2c3c67e48
 AUX pre-rendered.ini 46 BLAKE2B 1ce5b9c6033e544572ddc22f3630fbdf0c7cfcc49bb503c20fbd667c7188640d6f4dbd368f125d22d1c863e7f58c30e2f66341a69ce35b93d0921ab019f26574 SHA512 336de96005c8a0386c2769cd82ad3e70251a7a8810e8685f9835451c1c116fffa56a0cda22989b8a60bef0bb3e067b26938a29b9a6c90f1b2f1ebb7a7448e56f
-DIST arc-theme-20201013-pngs.tar.xz 85204 BLAKE2B fb1ef7e0d9618238cf6057777d1494d6247b237d060c4c6772aa5a7ce740218f45f0ee6b2328bc486b8b29d2741c4c44dadcb8db5abf4e333ce519c7db961f9c SHA512 d7d28fe99ac7fce7360905eea0ed1a2cac77612dc7dde05240bbb2cf8e7cc0956f63c35426c1dae34d8adb20553758f595e442e955a202e9c73af5b61ca30a86
-DIST arc-theme-20201013.tar.xz 241636 BLAKE2B 6f825b290c0f2cf1e67d72d9dbca0f23c83e7fc2ea89bc7b69013fb38bb7959205caad1b357a5cb1c4196e4b4460f13223515124c2012aa363a17765e89f992d SHA512 c1c70c80935af2b1f3c7c9bf79ee72d5fba907fd03caadecf96d6fd796bf70d325bbb16dbe93f95d9a63eff748c7d90bcb0bf837e446e5c2770cfdccb131f45c
-DIST arc-theme-20210127-pngs.tar.xz 159392 BLAKE2B 2a355e85766f44c21a4a85cacd184cb28ddb4ba19e7dff7cae70114c12422ed5d46a3930d780a6e2dd458684a944f5cbd17a769a0d3e331f94007b9fc9943238 SHA512 b0de3065e81979f2aa6b7f31edc1aad6dd6998776da2a1ba3b1030f6d8c552c9f1702e0bca0585e625e868541b0444b7a0d75631dfbeef517bdb9925e19e6159
-DIST arc-theme-20210127.tar.xz 256364 BLAKE2B 4e85d2ca801977588273715a94b91e199e3f16d304090789748e22b55c1339386a84938da1b1c143004655d8573678a51ff3b27e9ac3a2027de93625b0f39ada SHA512 bb0554c96cf6c3c3891698d973e7d719931fc316ea6cd910f69d21440110690aeef0e734b5f940ad1c81bdff238477b6353de4ae074cd54fbed09c680377d594
 DIST arc-theme-20210412-pngs.tar.xz 159340 BLAKE2B 40027335b8b44ae38bfadfa52e08858cf09646ed9c3e2fcddece8959d2f35845c4924002f36cea65cb27ecf61fdb3dffbf0d5c01024c34d16c31e21bf69b5a72 SHA512 85bdcd1fb81a5c33b479123bad178b1833a95ecf09310fa3b754c25f753ec10a7cada14983014b090c4a86d7a8497ac881fee9576737be29f4f772ccb59a8f1e
 DIST arc-theme-20210412.tar.xz 257248 BLAKE2B c525c3632670d8aa6b640baa8b3dddca6c5dd5f087734604c68d9140f810fc595f73db06f93b6193ba1c59a8cd85b87f5f6fda9777940adf36f3c436a8426810 SHA512 d3064546301e013a1e5a8db735346d74c73f37cbf808b7afeee6f88c820cea58ba6458fa63e1213377cdd33c8347167242e6f8f1eacf85ce212f3b2508c0bb80
-EBUILD arc-theme-20201013.ebuild 2290 BLAKE2B b857a0d484003c2a7501059ef894b222b4856e82ef1bab182480b1c9f5a12a003999ca61551bc535c581bf8fc1b214f64ffd611134ed65b475a90df05c54265e SHA512 e17c49db06eab011511bdd5db0105773fcec93dc44816ea2d5cb7bd2f3c7a7cf88c993d271d223d4eb3fc7e3664958b5676abc60b3472afa9ff4622439bb12e6
-EBUILD arc-theme-20210127.ebuild 2406 BLAKE2B e2840a54b0b27a40d4ef6494d737c86c4e479bd3eb15ec44759f78cf58073de4eff6983da4a45a40f9b990265c50ce9e52733b43c61df9acf2e12a204ee94ec8 SHA512 c7008d3816d84dbfa3f49f34ad74f0b379c15cf1edd6ba682f45dc685beba5000d93178d02bf07973ddcf2e681ace76a2530b35010547d26afeb03dbc79dc5bf
-EBUILD arc-theme-20210412.ebuild 2357 BLAKE2B 15748957c04f3fc5391195ce4bfbe1a85e0c48ca484a3e97b3d392d013648475af36f8a0c55df4605d030f9199890fe170cada93944f1822c92a41894d0a44ca SHA512 8caf9443cc0f1a8b52567777f877a161d7b86448de1a6d30940b5040f93c8ed9a51871f0f5d63f95f984a82db03c810480d5280e18a5d922ca7b3a15c5dbfe79
+EBUILD arc-theme-20210412.ebuild 2355 BLAKE2B ad3fef1485f56de1156d71c4c87b0266acc4536a0ddec4e409501513cb6f9cc1972e53c1549551adc1d88173600d685fefd48d79f363f72d68a3e5c9e7638e6b SHA512 9426f4794e66a1f320d71eff4627dbfd6ec4feeb199b1cce4d32b2d411dc00cbafe235040baa3a0fdd86a0bc3e69d38a4d0e15888284f5600d01ec6cda9e1c2f
 MISC metadata.xml 898 BLAKE2B dc323fe2b56b97d7cd5654cda904e96cc5d9c46e7afea98b6ae0a36b560098f58a9a9a66bdba461f260bc7b01bc5f9c3397527ad38d3fee9142a1fad51882d6c SHA512 6d608de81b85bf534dba5818fd5683fca97b178ab16bb43916f4d61f9284922d84fab69f37770cb709fd1048a37dd53580cb494f3d36d6b5e19a57aa7d14ec0f
diff --git a/x11-themes/arc-theme/arc-theme-20201013.ebuild b/x11-themes/arc-theme/arc-theme-20201013.ebuild
deleted file mode 100644
index 640c44b0ebe7..000000000000
--- a/x11-themes/arc-theme/arc-theme-20201013.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
-# cd ~portage/x11-themes/${P}/work
-# make -j -C */common/gtk-3.0/3.18
-# find */common/{gtk-2.0,gtk-3.0/3.*,xfwm4} -name "*.png" ! -path "*/menubar-toolbar/*" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root
-
-inherit autotools
-
-DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 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 mate +pre-rendered xfce"
-
-SASSC_DEPEND="
-	dev-lang/sassc
-"
-
-SVG_DEPEND="
-	!pre-rendered? (
-		media-gfx/inkscape
-		media-gfx/optipng
-	)
-"
-
-# Supports various GTK+3 versions and uses pkg-config to determine which
-# set of files to install. Updates will break it but only this fix will
-# help. See https://github.com/horst3180/arc-theme/pull/436. The same
-# applies to GNOME Shell and Cinnamon but I don't know whether those are
-# fixable.
-BDEPEND="
-	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.18:3
-	)
-	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_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use pre-rendered &&
-		export INKSCAPE="${BROOT}"/bin/false OPTIPNG="${BROOT}"/bin/false
-
-	econf \
-		--disable-plank \
-		--disable-unity \
-		$(use_enable cinnamon) \
-		$(use_enable gtk2) \
-		$(use_enable gtk3) \
-		$(use_enable gnome-shell) \
-		$(use_enable mate metacity) \
-		$(use_enable xfce xfwm)
-}
-
-src_compile() {
-	# fontconfig issue?
-	# https://bugs.gentoo.org/666418#c28
-	use pre-rendered ||
-		addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX
-
-	default
-}
diff --git a/x11-themes/arc-theme/arc-theme-20210127.ebuild b/x11-themes/arc-theme/arc-theme-20210127.ebuild
deleted file mode 100644
index e7a1d5c3bff4..000000000000
--- a/x11-themes/arc-theme/arc-theme-20210127.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# USE="-* gtk2 gtk3 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+3, GTK+2 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 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
-	)
-	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
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/meson-inkscape.patch
-)
-
-src_configure() {
-	local themes=$(
-		printf "%s," \
-		$(usev cinnamon) \
-		$(usev gnome-shell) \
-		$(usev gtk2) \
-		$(usev gtk3) \
-		$(usex mate metacity "") \
-		$(usex xfce xfwm "")
-	)
-
-	local emesonargs=(
-		-Dthemes="${themes%,}"
-		-Dgtk3_version=3.24
-	)
-
-	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/arc-theme-20210412.ebuild b/x11-themes/arc-theme/arc-theme-20210412.ebuild
index 8d4aefb69e32..606c5e1ed687 100644
--- a/x11-themes/arc-theme/arc-theme-20210412.ebuild
+++ b/x11-themes/arc-theme/arc-theme-20210412.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.t
 	pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
 
 SASSC_DEPEND="
diff --git a/x11-themes/arc-theme/files/meson-inkscape.patch b/x11-themes/arc-theme/files/meson-inkscape.patch
deleted file mode 100644
index dfec810aa53d..000000000000
--- a/x11-themes/arc-theme/files/meson-inkscape.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 6c2e91fb79177f64eae875e1091d35ad94a74f5a Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Thu, 28 Jan 2021 23:14:22 +0000
-Subject: [PATCH] build: Fix building with Inkscape 1.0
-
-This wasn't matching the >1.0.0 version check.
----
- common/gtk-2.0/dark/meson.build  | 2 +-
- common/gtk-2.0/light/meson.build | 2 +-
- common/gtk-3.0/meson.build       | 4 ++--
- common/xfwm4/dark/meson.build    | 2 +-
- common/xfwm4/light/meson.build   | 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/common/gtk-2.0/dark/meson.build b/common/gtk-2.0/dark/meson.build
-index 869beda9..c13608a8 100644
---- a/common/gtk-2.0/dark/meson.build
-+++ b/common/gtk-2.0/dark/meson.build
-@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-diff --git a/common/gtk-2.0/light/meson.build b/common/gtk-2.0/light/meson.build
-index 3df389a0..4dd32c63 100644
---- a/common/gtk-2.0/light/meson.build
-+++ b/common/gtk-2.0/light/meson.build
-@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-diff --git a/common/gtk-3.0/meson.build b/common/gtk-3.0/meson.build
-index fcb2e074..085bb739 100644
---- a/common/gtk-3.0/meson.build
-+++ b/common/gtk-3.0/meson.build
-@@ -50,7 +50,7 @@ foreach asset : gtk3_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-@@ -65,7 +65,7 @@ foreach asset : gtk3_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=192',
-       '@INPUT@'
-diff --git a/common/xfwm4/dark/meson.build b/common/xfwm4/dark/meson.build
-index a2820df2..9bb7d46b 100644
---- a/common/xfwm4/dark/meson.build
-+++ b/common/xfwm4/dark/meson.build
-@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
-diff --git a/common/xfwm4/light/meson.build b/common/xfwm4/light/meson.build
-index c65b891b..6ee79fc4 100644
---- a/common/xfwm4/light/meson.build
-+++ b/common/xfwm4/light/meson.build
-@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names
-     command : [
-       inkscape,
-       '--export-id-only',
--      inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+      inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-       '--export-id=' + asset,
-       '--export-dpi=96',
-       '@INPUT@'
--- 
-2.26.2
-
diff --git a/x11-themes/gnome-colors-common/Manifest b/x11-themes/gnome-colors-common/Manifest
index b01c0da399ea..2cc7b65b54fc 100644
--- a/x11-themes/gnome-colors-common/Manifest
+++ b/x11-themes/gnome-colors-common/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-colors-5.5.1.tar.gz 4919865 BLAKE2B 968d649d082154e0f627f58c2fa310fd4768f79276e45cf343146a3027f0c7116e7e532524419ef3e49c15d8e3cb1f9580ffd52342e0de9f117c4333801dd8e2 SHA512 23d1fb9b96cd4287acc0f540c8a7abed1b9f16d7e2bc952beedc365cfd71a3a0134382a7f4bb1c01c62dc376acb6aaf81332167869ec6e8c036679e89d325ff3
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gnome-colors-common-5.5.1-r1.ebuild 1306 BLAKE2B 94549dd27047263fbfe4ca4ad6e8c6dd7ae813a22db18ca6d4268e7b8d0ef2f7972c70032fdc3571c58706efaa51555f2cd498683755c7c2d727d2108cca6b17 SHA512 393bd3478a981818a69c131d4e50c09e06a2c7a9f26fdc7b3c681b28ecd29030dbbafea8ce5f1c56cdaff020b478a49dfcc8eaa369cbd98666e3c6f650305c90
+EBUILD gnome-colors-common-5.5.1-r1.ebuild 1225 BLAKE2B f18dba18234e094cd7999bc2881718a2be3acf608bfcafec08c94f8e503b926ddfc768ef4b079de5dafc275ebcc96eb150eaa4fd7e63d267911f89c0aaa3f0fa SHA512 b0cb7e79b95284d691d720b7411d143e16f9dfa86e4ea00835b70a0ba5243788954d976a7fd36bb91676d83da126a416ba09682f2c8ad2b1d20ca9c940777144
 MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
diff --git a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild
index 6d9348d2499c..2370f83c992f 100644
--- a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild
+++ b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit gnome2-utils
 
 DESCRIPTION="Colorized icons shared between all gnome-colors iconsets"
 HOMEPAGE="https://code.google.com/p/gnome-colors/"
-
 SRC_URI="https://gnome-colors.googlecode.com/files/gnome-colors-${PV}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )"
+S="${WORKDIR}"
 
 LICENSE="
 	GPL-2
@@ -20,33 +20,28 @@ KEYWORDS="amd64 x86"
 IUSE="+branding"
 
 RDEPEND="x11-themes/adwaita-icon-theme"
-DEPEND=""
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}"
-
 src_prepare() {
 	default
+
 	if use branding; then
 		for i in 16 22 24 32 ; do
 			cp tango-gentoo-v1.1/${i}x${i}/gentoo.png \
-			gnome-colors-common/${i}x${i}/places/start-here.png \
+				gnome-colors-common/${i}x${i}/places/start-here.png \
 			|| die "Copying gentoo logos failed"
 		done
+
 		cp tango-gentoo-v1.1/scalable/gentoo.svg \
-		gnome-colors-common/scalable/places/start-here.svg \
+			gnome-colors-common/scalable/places/start-here.svg \
 		|| die "Copying scalable logo failed"
 	fi
 }
 
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
-	dodir /usr/share/icons
 	insinto /usr/share/icons
 	doins -r "${WORKDIR}/${PN}"
+
 	einstalldocs
 }
 
diff --git a/x11-themes/gnome-colors-themes/Manifest b/x11-themes/gnome-colors-themes/Manifest
index cd24f5b7d7cc..4f6333d75b0b 100644
--- a/x11-themes/gnome-colors-themes/Manifest
+++ b/x11-themes/gnome-colors-themes/Manifest
@@ -1,4 +1,4 @@
 DIST gnome-colors-5.5.1.tar.gz 4919865 BLAKE2B 968d649d082154e0f627f58c2fa310fd4768f79276e45cf343146a3027f0c7116e7e532524419ef3e49c15d8e3cb1f9580ffd52342e0de9f117c4333801dd8e2 SHA512 23d1fb9b96cd4287acc0f540c8a7abed1b9f16d7e2bc952beedc365cfd71a3a0134382a7f4bb1c01c62dc376acb6aaf81332167869ec6e8c036679e89d325ff3
 DIST gnome-gentoo-5.5.1.tar.gz 354390 BLAKE2B 591c67d1f96f296a427b6846ab4764bfeca3762690bfc75934c8fae3dbdfa64b55ac94a5788e4ff9b344076e1f6a79c13e1b66538d2b6bdb4d6b67280110b13c SHA512 b6a171bdadfef4e01bd2e96efe91ebfc99cab0f7da3def6dd473857c1e51fc9832cf825949f8a84ee8dc5daf4d19e8bdba114d5a92caeb31a0642d0e954bcf1b
-EBUILD gnome-colors-themes-5.5.1.ebuild 910 BLAKE2B d9be70049657dad927e90317c9523a9f75a7e91f549ed73a7c85e0dcc6abb5c261130cb77d3f326d4a5c4e4bc562d02dfdd5f9fbe01e0d5ddb5a4e18bec581a8 SHA512 7769b0fbf848cb68b484e5cd3445e3770c82a2a0d80ceb8b68288016a51b59ab5cf021696d7b6c7077b04d32abe1574c10a31510122316ee96dd07445b2b0a46
-MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
+EBUILD gnome-colors-themes-5.5.1.ebuild 832 BLAKE2B b0ead8de442463352ad461b8ea9aee7184eb7486ea71287970839a5a8334336af244b7549f89c9c4829f2998870f1ac2783b7f90e51df8198e970a78c79d9cf0 SHA512 e2809171172002177731da59856a688216a61db8895fdb0df9d25cb55f73099957e42122b4090dd331ae19348cd24942bb2d1884c6cde33ec62a94fb837ad848
+MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
index 5fb52b368dcc..94ffa1b9f6c7 100644
--- a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
+++ b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
@@ -1,39 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit gnome2-utils
 
 DESCRIPTION="Some gnome-colors iconsets including a Gentoo one"
 HOMEPAGE="https://code.google.com/p/gnome-colors/"
-
 SRC_URI="https://gnome-colors.googlecode.com/files/gnome-colors-${PV}.tar.gz
 	https://dev.gentoo.org/~pacho/gnome-gentoo-${PV}.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="x11-themes/gnome-colors-common"
-DEPEND=""
 
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}"
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
-	dodir /usr/share/icons
 	insinto /usr/share/icons
+
+	local i
 	for i in gnome*; do
-		if [ "$i" != "gnome-colors-common" ]; then
+		if [[ "${i}" != "gnome-colors-common" ]]; then
 			doins -r "${i}"
 		fi
 	done
+
 	einstalldocs
 }
 
diff --git a/x11-themes/gnome-colors-themes/metadata.xml b/x11-themes/gnome-colors-themes/metadata.xml
index e945e1307667..2ba8e9e851e4 100644
--- a/x11-themes/gnome-colors-themes/metadata.xml
+++ b/x11-themes/gnome-colors-themes/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>desktop-misc@gentoo.org</email>
 		<name>Gentoo Desktop Miscellaneous Project</name>
 	</maintainer>
diff --git a/x11-themes/murrine-themes/Manifest b/x11-themes/murrine-themes/Manifest
index fe8cda7f0de2..ac28ad6ce2f7 100644
--- a/x11-themes/murrine-themes/Manifest
+++ b/x11-themes/murrine-themes/Manifest
@@ -10,5 +10,5 @@ DIST MurrinaVerdeOlivo.tar.bz2 1320 BLAKE2B cb3401d2617261d4b2bc1f919d13c61e238d
 DIST MurrineThemePack.tar.bz2 3003 BLAKE2B 38c0be6fe48452741ef9fa37634218f2fae912433224030892ad61cb267d085dce3afb43fa123050d3df088d8272ed2a791d42769c81bbfaebd565a3d35caa54 SHA512 d70da08e3dae99255d5fd9217edba6c76b497aea303c1c0b50bc7230861936b0ae51bc2e1e6fbcd645d3759d67878c9dc535f1b13a2d220607331cf38253d0dd
 DIST MurrineXfwm.tar.bz2 6408 BLAKE2B 6f8574a09362d2c2e55023c95c82a9d566a475f13c0fa126080d31bb5ff3c0293bef6afac8636608e7b885681de7ad3fab89d76ddb844f61b8d18a1a9a51c3f7 SHA512 48b8e3fec3f75cf704b0d2e2d43ef1ea6ac1f1c691d7ff84d0551491e6f399d70c0f1958fefd95247a387a69041aae5b7059ea28ded8ecb1ed7dfb67fa4adebe
 DIST NOX-svn-r22.tar.gz 7318 BLAKE2B 481a35d9fb871089af6fee2bccaad5c003a866bae723397f8f6bda16be93235ab3203539d88a431f837794f9513422a25f765d1e2ce9a5736a5655fabbf2dc24 SHA512 25bf7f38a0d2566926f7f708b6bd6b042a7259943f58be4f54f05f7fd553f6974d6532ec5ee5e628afa57401d4ffa1c15ac7e89d9769e79cca95ff7cd1f67af4
-EBUILD murrine-themes-0.98.0-r1.ebuild 1073 BLAKE2B 044ab42dbaecfe38d760db02362f0f2a729b9653219c9ec6e074c1c8bbdc889ef865a0ce2b62e47e76bca7be03f6926eca2099764cdd71d27c8d5efdeace85ad SHA512 1f75cfcedfb1684ee035c6b87fe01b6f5c8a88843e348ad20b677920bc5d8511839a13914aa0cb7656b03d7aa87daae4186a578419882ddb1d4764922eacf6c5
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD murrine-themes-0.98.0-r1.ebuild 1036 BLAKE2B 4a557a7d4115c256862ef1e18ae746fb9cacbd87fe3cc49b0770b219d8bea17f178a52ec50beb712fba726e332e53a8bc0d5c582022e636837dec4bdefca98da SHA512 43b26764823f8251efd85b1bbd7c0d5d8bf43362885584588db951b7775e2c62a199f506fdfb935e0a86f0a5e6e86ac46816f942e354c951c33b4e7e8011337d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-themes/murrine-themes/metadata.xml b/x11-themes/murrine-themes/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/x11-themes/murrine-themes/metadata.xml
+++ b/x11-themes/murrine-themes/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-themes/murrine-themes/murrine-themes-0.98.0-r1.ebuild b/x11-themes/murrine-themes/murrine-themes-0.98.0-r1.ebuild
index 2ed35e061bc2..a15708fed824 100644
--- a/x11-themes/murrine-themes/murrine-themes-0.98.0-r1.ebuild
+++ b/x11-themes/murrine-themes/murrine-themes-0.98.0-r1.ebuild
@@ -1,40 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Themes for the Murrine GTK+2 Cairo Engine"
 HOMEPAGE="http://www.cimitan.com/murrine/"
-
 URI_PREFIX="http://www.cimitan.com/murrine/files"
 SRC_URI="${URI_PREFIX}/MurrinaAquaIsh.tar.bz2
-${URI_PREFIX}/MurrinaBlu-0.32.tar.gz
-${URI_PREFIX}/MurrinaCandido.tar.gz
-${URI_PREFIX}/MurrinaGilouche.tar.bz2
-${URI_PREFIX}/MurrinaFancyCandy.tar.bz2
-${URI_PREFIX}/MurrinaLoveGray.tar.bz2
-${URI_PREFIX}/MurrineThemePack.tar.bz2
-${URI_PREFIX}/MurrinaVerdeOlivo.tar.bz2
-${URI_PREFIX}/MurrineXfwm.tar.bz2
-${URI_PREFIX}/MurrinaCream.tar.gz
-${URI_PREFIX}/NOX-svn-r22.tar.gz
-http://gnome-look.org/CONTENT/content-files/93558-Murreza.tar.gz
-"
+	${URI_PREFIX}/MurrinaBlu-0.32.tar.gz
+	${URI_PREFIX}/MurrinaCandido.tar.gz
+	${URI_PREFIX}/MurrinaGilouche.tar.bz2
+	${URI_PREFIX}/MurrinaFancyCandy.tar.bz2
+	${URI_PREFIX}/MurrinaLoveGray.tar.bz2
+	${URI_PREFIX}/MurrineThemePack.tar.bz2
+	${URI_PREFIX}/MurrinaVerdeOlivo.tar.bz2
+	${URI_PREFIX}/MurrineXfwm.tar.bz2
+	${URI_PREFIX}/MurrinaCream.tar.gz
+	${URI_PREFIX}/NOX-svn-r22.tar.gz
+	http://gnome-look.org/CONTENT/content-files/93558-Murreza.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE=""
 
 RDEPEND=">=x11-themes/gtk-engines-murrine-0.98.0"
-DEPEND=""
-
-S="${WORKDIR}"
 
 src_install() {
-	dodir /usr/share/themes
 	insinto /usr/share/themes
 	doins -r "${WORKDIR}"/Murrin* "${WORKDIR}"/NOX*
+
 	cd "${WORKDIR}"/Murreza || die
 	doins -r Murreza*
 }
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 96f8c1aa9bb1..c73fe05ad5bc 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -4,4 +4,4 @@ DIST papirus-icon-theme-20210701.tar.gz 28129228 BLAKE2B cb4b8891607bfa2b245858c
 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 614 BLAKE2B 267c9f0f783830dfb301b27762e98525ee0acef15b6b11aba2d6d21418e9e0c114a0d9893583d4c98120bc6f96d8730034a1af9461517c1d429358a42c445b7c SHA512 a9099c1f35dd984fa9364aaba6ee943102a2165c141e1977d018ec9460e12cda70655871029d834fd4cc59886b1e4b556c4c8fe612aa6dcd73bd09fb1ba99433
+MISC metadata.xml 386 BLAKE2B cc6c195fe1437148fa30ceea559ab1a197069cc73f6e95feb5c27972fb258781671e1bf4a4579c59409e6169ced02a297d10fd2b3fc0d36e2328bbd1e29d3ef8 SHA512 9e00224eaf8452d7333ed4e8ec4fc6736fded28dafe29cfc8248e938e3d22ae6bc9ea36156fab0429cd64a05c96a45bdb2331fbfa914827c938034755386b065
diff --git a/x11-themes/papirus-icon-theme/metadata.xml b/x11-themes/papirus-icon-theme/metadata.xml
index 0e70860b1b8b..de18d5b6737c 100644
--- a/x11-themes/papirus-icon-theme/metadata.xml
+++ b/x11-themes/papirus-icon-theme/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">PapirusDevelopmentTeam/papirus-icon-theme</remote-id>
diff --git a/x11-themes/shiki-colors/Manifest b/x11-themes/shiki-colors/Manifest
index a8db37721989..becbaf1bf21f 100644
--- a/x11-themes/shiki-colors/Manifest
+++ b/x11-themes/shiki-colors/Manifest
@@ -1,4 +1,4 @@
 DIST Shiki-Gentoo-4.6.tar.bz2 5725 BLAKE2B 5bf777b55ad393b118a030f77f88f19a2ae73829d7d7a498ae71cc16912e6c95d470ca55e50a801bb4bf7d2778fca0d2a86df55d9aed052954a1c583010f36ef SHA512 5b329973aab7b36d39c1e5397f968a594a998869e4770dab0f9b051d9559f970f81bfb40ed8b91415c39645a78da56bb5842a017866d3d6eaa42b1839e7717ef
 DIST shiki-colors-4.6.tar.gz 254607 BLAKE2B b8ef2276ca010f4c9c25df86f2e36d89a2f440b7e9a13795c09a0753b447383889e57636a421626e9cdbf3cdf6fe207129565a923596dec232d5dbd22e854960 SHA512 862ac3f904b012d602b3ec624563bf57b5622c571819e55b2c37f9708c50e21e5a575d75863d3cc89a69c6594732fac6a961d981c4da8ed8dc1bb46d81313156
-EBUILD shiki-colors-4.6.ebuild 755 BLAKE2B 9524dd2db483b5701d5fe68ec8fa45980b5b5a327f93991b68b016782d16487c48d5c0f9b97a38a993f184c8c4c0ff0cc2ad80339b5447f8cf53fc26a925bca1 SHA512 ea6113ca66edc33edea5a21a4f0d01f348c76dd86690d9de6124e16606ea59ceaeabee54dbea5d82ff2a9a6e774baf8602eaf10997d8dccb19de730716ae1fa1
+EBUILD shiki-colors-4.6.ebuild 659 BLAKE2B 3d40d7783b2870c536e6a98086d36948bae9b4772f002c11a064adea2c39d57fa84304c890dcfff82f890a72174d61f5848fbd71b3bb86a574fac6e390b40e0d SHA512 e43a4c6ada30dc562011726c35fdad411403d79153dc5790900dc8ded8acb5591449a42b1e8437d201ce1f79b5fc8ace33b75a9d96171138f5024dbd3ba1dedf
 MISC metadata.xml 275 BLAKE2B 1d7a40dcd1ff56ed2b121a26c14db27d87f2b5417aa1068231041d59bd9f4af2bed01f5a92a346d8fb78013d921c812655d14906e2ee6ce3d25f24bf302a966b SHA512 f6ba8749c28efdef180ce22a3be528d6843d1c73cb6e8e41a5d009e6a0b707053daf3821dcab94389d51d7f2c07fc4dc9e0c3d349aa03f6c136b897deadb0c58
diff --git a/x11-themes/shiki-colors/shiki-colors-4.6.ebuild b/x11-themes/shiki-colors/shiki-colors-4.6.ebuild
index b12471328667..1cba381bd5da 100644
--- a/x11-themes/shiki-colors/shiki-colors-4.6.ebuild
+++ b/x11-themes/shiki-colors/shiki-colors-4.6.ebuild
@@ -1,34 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Mixes the elegance of a dark theme with the usability of a light theme"
 HOMEPAGE="https://code.google.com/p/gnome-colors/"
-
 SRC_URI="https://gnome-colors.googlecode.com/files/${P}.tar.gz
 	https://dev.gentoo.org/~pacho/Shiki-Gentoo-${PV}.tar.bz2"
+S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="
 	|| ( x11-wm/muffin x11-wm/mutter xfce-base/xfwm4 )
 	x11-themes/gtk-engines:2
 "
-DEPEND=""
 RESTRICT="binchecks strip"
 
-S="${WORKDIR}/"
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
-	dodir /usr/share/themes
 	insinto /usr/share/themes
 	doins -r "${WORKDIR}"/Shiki*
 	dodoc AUTHORS ChangeLog README