gentoo resync : 25.08.2020

42 files changed, 402 insertions, 150 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index a1e1848cd800..19b91c1096dd 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index f6e2a927e462..0f0056162710 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -2,5 +2,5 @@ AUX QGnomePlatform-0.6.1-qt5.15.patch 682 BLAKE2B 418b0c478d191e58186625cd2a307d
 DIST QGnomePlatform-0.6.0.tar.gz 28618 BLAKE2B af4ef5c54a8056a370a8d6299fd80bace2491a97c9bff99ce5a461a1c3ab07c6a5336fa88606805e37102ccc648217722331ec9e572ce3708581b713ee399d0d SHA512 c5aad4518e1c9d06b2561a6f8a6a169bf9a07ec0a63602d3bc5b0f91e1134504f5ca0e5a76bda3183165c72bf8de3e9297b51fe37879d80c1fbe4ca06e242a97
 DIST QGnomePlatform-0.6.1.tar.gz 28996 BLAKE2B 3d0da37fcc8e85bd59263dffb19865666d25dd50d2c1e00b4d6358d745eb7079f415058ffb75a8228c9c7ed956003a656b3e10a3467d9fc9dcd5eee2c14bf7cd SHA512 5e0bab45a8ff4c56e6e34d636ed719ce1a087f116942dd356253403d4be40aac348ccbdbfc917f65f6cc4df8619e1031734f0a46a36d4d9b7bb4838ded61570c
 EBUILD QGnomePlatform-0.6.0-r1.ebuild 634 BLAKE2B 8ae5634bbc6f11dd6c98d0f31646fd8432f0b47c58e987532946bc97be6212a05bce73cfd2cd79ec49c118fbc50939215a816bfd3d3ffb0c2b41a9d0dcb1e4ca SHA512 65d85f2c24164f9db965d1331533a4aa775158aa11bd20919c7201f2d9a6719cedf5cdc54c079577b9de42c3d3b6b075f0ae7fd0e75bd60c88b44422324d04a5
-EBUILD QGnomePlatform-0.6.1-r1.ebuild 698 BLAKE2B 49e67ca9b13b38d6fff352c544f042a6851c6fa1b0aed47ecac09dc82dc32084a0ba6fed73e04e0253dd32e255ff9d7c0c180ec15cefdf4236d9563bdfd7420e SHA512 fce4d78ccc11f95b45eba2278896b95d5c1c76f143b8093b787c5a1c6f91bff27898e0331a6fd1af1f93b03c7dc40ba8f9895a66a2b3ecc78f833b8089ddfb0e
+EBUILD QGnomePlatform-0.6.1-r1.ebuild 697 BLAKE2B ea7d467da40c27d288cb803bcad0146cc10d4564f87e267d59af94716cc9fedab98b84e23cc77010310c8240a6af5679934053f4776c28e059bcd6c15dbe4b8c SHA512 4a7c1e0559ca73ca961fc00e8b68663b37e62bec019875ce4e4b921fb7730e935dce5b2dad77198d6c6b6e607d4e7d0dba1421322a15222aceccac3128a190fa
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
index bbcb0579a22f..b35f4ef865d1 100644
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
 HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
 SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 308fd2b054ba..344b25969caa 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,4 +1,6 @@
 DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3d834e4147c3a3c5e6ca7c705ed2d16e8cf0a1255f5ae999d7e930b9716585b8c498c220f1ab40fec929dde7679efd56f3b18a45 SHA512 9609732cd51c6794d4d86598818bb2a589b0f4b6b795e57f3507dad69b21ef1b2fc2e83e24e937428bbace32fcccf587a5771cbc02c5768206e704f0456a6d1d
+DIST adwaita-icon-theme-3.36.1.tar.xz 17247020 BLAKE2B 51461ff3058f413cacea9b7ec76bedd13e7adc38fa2aa9a80e84718f371463d9cc2b2be80ef10e375bf670658d184680ecadc7f84089e8b5ee09a39bf9fa1924 SHA512 5df33c8592ebd17e05fb36590423177fa3e07345565302a5b7ef58fb7d7a9b2b3a1789907a81f5ca0abc7446f7e83af059ca9d6432e8182d5274394c79a24fb9
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.32.0.ebuild 1653 BLAKE2B cdb2f6f32ff05764cf1565dd791a542bfcf5feedae2e6c74d302489a4dd1052a23d7ae5bd151eff5c18ce77ac239a3c610e13780221859f0653f2f8aeb7d5afe SHA512 d23d394b6bf1d6897dc9f58cac0cc8bb0113dee3b22a99843065391739936cbf36ee115c15dfcc4bad5b3339e67d35f53b04fdd7ca257162dc2ee8cc103f0a76
+EBUILD adwaita-icon-theme-3.36.1.ebuild 2032 BLAKE2B 40c3e95e62ef14082181c780e595ef3742cf117c2de78ea212fc2f67ed352f7757723ebab09ba555043a0db2f9632c0160791550e2a8bf97ac627d0ec62f78c9 SHA512 fd98e04c504a83f07a73997d78428d578f15a91bcaa415afc5576a746d70154997c995bb818e4897d11b21c96a783bd1d2fa1e3930c8798146f680e9ac60ee5b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
new file mode 100644
index 000000000000..8628545b95aa
--- /dev/null
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.36.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2
+
+DESCRIPTION="GNOME default icon theme"
+HOMEPAGE="https://git.gnome.org/browse/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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+# 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
+RDEPEND="
+	>=x11-themes/hicolor-icon-theme-0.10
+	gnome-base/librsvg:2
+"
+DEPEND="${RDEPEND}
+	x11-libs/gtk+:3
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# 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() {
+	# less than 2.45 being a problem is just a guess, but we didn't carry anything between 2.40 and 2.48 in main tree
+	if has_version '<gnome-base/librsvg-2.45:2'; then
+		ewarn "You are building ${CATEGORY}/${PN} against an older"
+		ewarn "gnome-base/librsvg, which will result in various broken symbolic icons until"
+		ewarn "rebuild with newer librsvg, and misrendering of scalable icons at runtime"
+		ewarn "until gnome-base/librsvg is upgraded!"
+	fi
+
+	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
+}
diff --git a/x11-themes/adwaita-qt/Manifest b/x11-themes/adwaita-qt/Manifest
index c97259adef77..c48ec62723ee 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,5 +1,5 @@
 DIST adwaita-qt-1.1.1.tar.gz 435566 BLAKE2B c8ca8df84ce06311b0937d994a859bb6e71a4a45570c179bdf3ded144bee06c93d8d80b300db3786b1bcc8db7f2b1d78423c8d8b0456079c4563924b2a036abc SHA512 6d11fc8eecc94da4f2e3798ee5147258f277032b23a82d5bf8d3414943ac89c5ebd056d519338959c72a8a45d1638ab8cfeac01b3f3fd1118b4c89eb0c8b5608
 DIST adwaita-qt-1.1.4.tar.gz 436392 BLAKE2B 2a8ab80a2189cc7bbc21bb83c409b16c8824364cc768765246876dedab8ac4073f0325d28dd916b2173bb3cd7396bb2c4b19b07c8932d589200d91f3ea48e2b9 SHA512 78390787c4b080608036605c6c713bbd5d482b039796e76974ca8c034e0d8af694704e063d53f99a3e5e7ac4d48f6325ff1c90d67fbeb4bc9e49792485e11cb1
 EBUILD adwaita-qt-1.1.1.ebuild 872 BLAKE2B d560355c9a638a9d4d261091761d07374a51592b6fad05f75894335499d4ccc1b8a00e54d7f3519598efeaf86fef6fa852a8c94dddc84b3f09f9f4d0f9479fa0 SHA512 426e8787277aff420a4871a9f4b865a6353f221baa26dc308681f2315cce5e46e87c916c10b5a8ee7d2c2d170a28d4f49741c76d0014830bbf88074679b4ab80
-EBUILD adwaita-qt-1.1.4.ebuild 873 BLAKE2B 0dd86925908c20f0a1585deb6054f83e87cc550f73b154f6c9a3f651d33f808758673f13c98ef7a8d4984f667e9b5510b0b88e0e6c3776f48cc308911b51a10a SHA512 bfb3cd5d975bcc9d2d2673f99b80d69e845be4f5b0579f3345ecb88147eaf18a8862a02613a88fa345c6d11b41c35eb059339344e62465dfe67890103983d345
+EBUILD adwaita-qt-1.1.4.ebuild 872 BLAKE2B d560355c9a638a9d4d261091761d07374a51592b6fad05f75894335499d4ccc1b8a00e54d7f3519598efeaf86fef6fa852a8c94dddc84b3f09f9f4d0f9479fa0 SHA512 426e8787277aff420a4871a9f4b865a6353f221baa26dc308681f2315cce5e46e87c916c10b5a8ee7d2c2d170a28d4f49741c76d0014830bbf88074679b4ab80
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild b/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
index 83d5ee52a95a..662921101d5a 100644
--- a/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
+++ b/x11-themes/adwaita-qt/adwaita-qt-1.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FedoraQt/${PN}/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="gnome"
 
 DEPEND="
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index e9e8127583c7..e83f2c55260c 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,7 +1,7 @@
 DIST arc-theme-20190330-pngs.tar.xz 87632 BLAKE2B a860abe61d98c1ba2c7e13d21cb24e74e110b4e075eb53fc0d34b5e84eeed345a9b32e948e673b445d15e74b4c27991408139861b2d80124c8d97e417ecb3fb3 SHA512 0421530b99ebbe286e111477a056e17e7aa23a63e8c7d63443c4ffcdcb053f191a05fd16e54d9fa4efa9d1c870ff500ffb0c519d6604d6d7294cc1da711de5ba
 DIST arc-theme-20190330.tar.xz 227936 BLAKE2B 35815019884c55ce2d22dbb2d78892c00b35839b017fb7f0c1e9e1f1bad1bf94703e0c15205045eed96add556381c28fdd702c7657226fd75492304abaafd41d SHA512 ac4f1bde028e027314004999502dcc914abf6070ffd4345021df486084de2c943e6c110776b3b6af55143962a40b368c060a11754ffaf30300b87cb923bc55b9
-DIST arc-theme-20200502-pngs.tar.xz 88116 BLAKE2B 18dfee1f51a0e1e272f73523617600490584d9044539717d8a4712083d6cb87751449818b38d503bbc0a8ef016690d606a7f23ba253eda48aecfbadc0cb1b483 SHA512 c25df3088c6edcd88799200e33005b56bf048dff606a06678c8cc7af6d0d84eb9237fcc76b16057bbee538ffa01ae7e983ab94dd184b140ec45d12a8d06d3a1f
-DIST arc-theme-20200502.tar.gz 1090296 BLAKE2B 10feeecee89007b6ae1aab2e7ad95f2f3513660e2d4dafccf659b0829047b0cb551b4d8e6923d409ededba2ec5ff9f6c93f0b2c3959e3a68d5e51ccbb76861d5 SHA512 95ebf8e434af1b5976ebef7489b9b5c51c919cd161cb6dc86056559f7b34c56a8d5580b74a30bf32dc1a32636f1c7633ab20ad204f6102d92509cf1e21032fcd
+DIST arc-theme-20200819-pngs.tar.xz 85156 BLAKE2B bdfab7230d3e932b77f7dce9c7258c371fc708e0b3947fd39a718aa91f792501b8c64b38856da7673115b800e5ef2913f220ce6b909311b5d3fdbf171526d56c SHA512 d6709ad91cf8ee309606331550e43febbe200f24c07548bd3bcff646a6237bd5365d60abed8deb55317d6fb419a71627f3f9510bb117799f6fa3dd012ade992c
+DIST arc-theme-20200819.tar.xz 238792 BLAKE2B 94f7b2f073518031c6b47f4b5b245a5c73205a859528346dde51fb1e51051617c57969d1ff2359563803360c0bc46fe368aff34a9cc606389fe6fa9e4f8d22ed SHA512 bedff15a195c21934a813ca600b88ced81c3db66b7c25ab75b7193998a89338a7888711abb213877210a62d2460300bc32d40402bdd1f6c4d8fa903999eb1b0e
 EBUILD arc-theme-20190330.ebuild 1947 BLAKE2B 6b57679c082fd8cfdd6f9838737b6a6687e5a7e335233636457cda58f387a4271e4329854d5cdd1d6015d7ac1b694b7ecb9e32e00a146949a9b52a6094511fb4 SHA512 1200c505dcc9a24ad2a1d7e74405e1190ff59a5584bc2674703fc86ab72ea993476f1b2d205189f04f397f168e94eac65ee2f1d14c182593410e36fefe9d1992
-EBUILD arc-theme-20200502.ebuild 2342 BLAKE2B 9973fe7208e9c72b5dd7e54c3e09d5f54938951628d8685eb4ea5a2edde74976e5b05db4882827605a016b625391856630ba9897d1a365a90d6f1e7d92f1c7fb SHA512 f24a94332eddcfbedca4ede21ca3d6efef6e2f553907c7d85ce1b2bb9fb062726fe8aa12bf594c709786556a2f3c1c7d574bb13f8640cad6d085110d57fa9416
+EBUILD arc-theme-20200819.ebuild 2285 BLAKE2B f9370d167ab7e0f07f9ccfabc497f612bf1e58eecbc846b9c559809a5932c0f6e877b8267c5d34a3008b88c2b094804bf885b41c1991d8edf79234274bd0866a SHA512 5e00fbf9f72193648585b3913fa9f05eef8596f27495439c25fc1b8549447f6a14fe326a137463511141d75041171a09c8a4dd6a02de8852475d0784df9d11f2
 MISC metadata.xml 898 BLAKE2B dc323fe2b56b97d7cd5654cda904e96cc5d9c46e7afea98b6ae0a36b560098f58a9a9a66bdba461f260bc7b01bc5f9c3397527ad38d3fee9142a1fad51882d6c SHA512 6d608de81b85bf534dba5818fd5683fca97b178ab16bb43916f4d61f9284922d84fab69f37770cb709fd1048a37dd53580cb494f3d36d6b5e19a57aa7d14ec0f
diff --git a/x11-themes/arc-theme/arc-theme-20200502.ebuild b/x11-themes/arc-theme/arc-theme-20200819.ebuild
index b4b199aa370f..b3a90da75f7e 100644
--- a/x11-themes/arc-theme/arc-theme-20200502.ebuild
+++ b/x11-themes/arc-theme/arc-theme-20200819.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-COMMIT="958b9b554cde5a8be7280bdf4a908ebe833cbd81"
-
 # USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
 # cd ~portage/x11-themes/${P}/work
 # make -j -C */common/gtk-3.0/3.18
@@ -14,7 +12,7 @@ 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}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
+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"
@@ -35,10 +33,12 @@ SVG_DEPEND="
 # 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 but I don't know whether that's fixable.
+# 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}
@@ -67,8 +67,6 @@ RDEPEND="
 	)
 "
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 src_prepare() {
 	default
 	eautoreconf
@@ -79,7 +77,6 @@ src_configure() {
 		export INKSCAPE="${BROOT}"/bin/false OPTIPNG="${BROOT}"/bin/false
 
 	econf \
-		--disable-openbox \
 		--disable-plank \
 		--disable-unity \
 		$(use_enable cinnamon) \
diff --git a/x11-themes/e-flat-theme/Manifest b/x11-themes/e-flat-theme/Manifest
index 126c8f1827c0..69dff1031029 100644
--- a/x11-themes/e-flat-theme/Manifest
+++ b/x11-themes/e-flat-theme/Manifest
@@ -1,3 +1,5 @@
 DIST e-flat-theme-0_pre20200602.edj 45765496 BLAKE2B 008560100983b3e00782d9cfa7e0b8fe329085245b98ff335b5a29520e2379cacfc5e3958c9d474605631dc7e79f114f4a6a2eb8d0729216ef657cbc06732e84 SHA512 84bc4b9e84de581090409836d7c057aac7d0af971733767cdf8f8d8584d7c8f4e35ddfc775616df757d9cced8f8ad408a07d7f0c6222207b4579e850cd5c505e
+DIST e-flat-theme-0_pre20200824.edj 45979784 BLAKE2B 8b9d2ddba3c6cb213ded3768625ca900ed10292c918918afa9b29f2de83696fa83dc8c93865a9b5cb916875371d573012df4d5e734dc579b28f9e9cbceb475e0 SHA512 90774cd48e0f3de9fe1609836272de692339bd935ec1379a943f2bfa04f56a9b2cd091f5860eb570606ad517e3f01b6ae41c99caeb86b5f2755114e608736c15
 EBUILD e-flat-theme-0_pre20200602.ebuild 1030 BLAKE2B 2ca159a5e899f025df21fbf47ddc0baaf95405b3499f626e19d2207b12af6ee3d2583c54662ffd1e1d51f655e05c1adcc9193c5ce16e8cf0c5d5a2b9ccaaa6e4 SHA512 f1da95b5eafbc2933cbdf47c5705f353693a37019d2479cb51739983016aa699e79918ca5ef887415cac7aab5587ff67fd1e08eea68a5ac5928177d207c53ae5
+EBUILD e-flat-theme-0_pre20200824.ebuild 1030 BLAKE2B 2ca159a5e899f025df21fbf47ddc0baaf95405b3499f626e19d2207b12af6ee3d2583c54662ffd1e1d51f655e05c1adcc9193c5ce16e8cf0c5d5a2b9ccaaa6e4 SHA512 f1da95b5eafbc2933cbdf47c5705f353693a37019d2479cb51739983016aa699e79918ca5ef887415cac7aab5587ff67fd1e08eea68a5ac5928177d207c53ae5
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/x11-themes/e-flat-theme/e-flat-theme-0_pre20200824.ebuild b/x11-themes/e-flat-theme/e-flat-theme-0_pre20200824.ebuild
new file mode 100644
index 000000000000..1ce5c3e1babc
--- /dev/null
+++ b/x11-themes/e-flat-theme/e-flat-theme-0_pre20200824.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A modern, flat theme for Enlightenment WM"
+HOMEPAGE="https://www.enlightenment.org/ https://phab.enlightenment.org/T6726"
+SRC_URI="https://dev.gentoo.org/~juippis/distfiles/${P}.edj"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+
+RDEPEND="x11-wm/enlightenment"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# doins doesn't allow installing straight from DISTDIR.
+	cp "${DISTDIR}"/${P}.edj . || die "Failed to prepare theme file."
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/elementary/themes/
+	newins ${P}.edj flat-0.edj
+}
+
+pkg_postinst() {
+	elog "You'll find e-flat-theme under System themes in theme selector."
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn ""
+		ewarn "You're updating flat-0 theme. Please reload Enlightenment"
+		ewarn "through Menu -> Enlightenment -> Restart, or by issuing"
+		ewarn "  enlightenment -restart"
+		ewarn ""
+	fi
+}
diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index 9f10154081cf..2aeb4a237726 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1,5 +1,3 @@
 DIST elementary-xfce-0.15.1.tar.gz 6198394 BLAKE2B 18638aa2c55a01a48fc342a836c9271aeb09524ee1032bc8237fc864e92fa09f8784439ab793f474311465ef40710ac7665217496ce98444ae146c7c526d43da SHA512 e28524c0a1f3b2b35a43428ab4de58e0e7635b5ca4e57f88d44de356965dd978d34aeb514440d7413dd8cdaf1b869bd5024e63cb3bd668fe9b47b52872de9445
-DIST elementary-xfce-0.15.tar.gz 6178898 BLAKE2B 9b15a850a91c6d2fc598efe463c66dfeaecd70c45131c387e303ad471076b26f95c151cc3534e34e3d00c05334cfb601a2683492bcde64d326b4a2efa94fde68 SHA512 35434671d81ef5ad61562360faa54752da7351c1d885efc5dd3dffd5af86bb3ba91aa9f20433e237ccd6eb9ffadf1342a7c77a4a83154c8655fd076eca9107b3
 EBUILD elementary-xfce-icon-theme-0.15.1.ebuild 938 BLAKE2B 790f7285ae6010ecb4fe0326140580b0fc94defe912b333a48ceee9384e3f5866f5950bf1b22f260c990da05b35c74d3774ad784c3cc5dc39e36becd2db23b9d SHA512 5414aae8c23be14539f76e40b52c831904473a486bba172534bfce4eec678bc535622674378585b5c2b76d808a9a9709b4339ef028ce0bfc5ed7018dfd6aa4a0
-EBUILD elementary-xfce-icon-theme-0.15.ebuild 938 BLAKE2B 790f7285ae6010ecb4fe0326140580b0fc94defe912b333a48ceee9384e3f5866f5950bf1b22f260c990da05b35c74d3774ad784c3cc5dc39e36becd2db23b9d SHA512 5414aae8c23be14539f76e40b52c831904473a486bba172534bfce4eec678bc535622674378585b5c2b76d808a9a9709b4339ef028ce0bfc5ed7018dfd6aa4a0
 MISC metadata.xml 346 BLAKE2B aadbfac92004404037c41af003c6db9a99e9ed48f35ffd7c8561a4a624ea43f31a7262cc913a8ce75df4280f1d557672696e880712db5cbd90fc2be92e261f25 SHA512 41a313ca1a567e691e144d3e0aa1110cc1fc4110c63d7a72e8acafb83805e278360019e31b8d387604f4f932a16e6c3b57b77a2a81f32a1cee3b4e6e492f26cb
diff --git a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.15.ebuild b/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.15.ebuild
deleted file mode 100644
index 9d36aba20360..000000000000
--- a/x11-themes/elementary-xfce-icon-theme/elementary-xfce-icon-theme-0.15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils toolchain-funcs
-
-MY_P="${PN%-icon-theme}-${PV}"
-DESCRIPTION="Elementary icons forked from upstream, extended and maintained for Xfce"
-HOMEPAGE="https://github.com/shimmerproject/elementary-xfce"
-SRC_URI="https://github.com/shimmerproject/elementary-xfce/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="public-domain GPL-1 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="media-gfx/optipng
-	sys-apps/findutils
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# custom script
-	./configure --prefix="${EPREFIX}/usr" || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	default
-	# delete dangling doc links
-	find -L "${D}" -type l -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index 7e70847d434b..823b1ea19e39 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -6,5 +6,5 @@ EBUILD fvwm-crystal-3.2.3-r1.ebuild 1724 BLAKE2B 4de3ccb752dcfad49366d16adc6eca3
 EBUILD fvwm-crystal-3.2.5-r1.ebuild 1727 BLAKE2B 2e423065fc752668bf044dd43feb33c0956d470facd9ec351de59292f116f52cc014a1038bbec0ab3ba311411adf62fe9456672941c3c56adb66cb0e55ee203b SHA512 678c45323efb1c76d230ae78da1d6ac5706ca1f71eeb3a1ec9ebe3f65dbafb6ba396e8dfb97c35f0c116ebaa43ddc6932b6ee56e9a6290a6490b6033c16d45d9
 EBUILD fvwm-crystal-3.4.1-r1.ebuild 2398 BLAKE2B d5aa8c99468032a9d032950270beba1c89ef8584373e5a0f3c2413eeb99105dd0127ed05f11c2194bb5d4d429071d4815f3a58101555daa3fa94bad96d66e609 SHA512 18276923f50332792df31955076dba0bb9b04917cc41447b12f074d3b4ab16d9c5c8015e9e4dbfdc94c51e646edf9713bc535faf20031b4797d9ac34bfc81444
 EBUILD fvwm-crystal-3.4.1-r2.ebuild 2398 BLAKE2B 36f59cefa04a1e68b1864d86950936d4f9c78bf55f2e21a72037510317bafef983d5e7ac51edbdaef64782266cfe03495edd8221bb843d6010c57d2f421637b2 SHA512 d768c81319bf7d48a4108e19015324c6975e08ab5145a15c66d10a8056bf6ec17201207af648ac85e3cbdbb4c945c2000ae7a81f91df275c9fb5232a825fb56f
-EBUILD fvwm-crystal-3.6.5.ebuild 2518 BLAKE2B 79d3347dc90d306a80876d6b512d1b840c03f5ce9938963ddf14105afd921759c72508c6be2f7ec3aed21833fb10871dff3f30f382b03f867941bdf4f0fa1587 SHA512 806f7b8ee8cb1f6ba686bea0a59e3646ebc21fb491f64fc5f452bdb1d86c1e8cd59ed24182b9a1e14e388919497f361aa6782f89f6b24551bd77ce4a755f4cb6
+EBUILD fvwm-crystal-3.6.5.ebuild 2525 BLAKE2B 63ada16c0f874f093ad46021448569c5e1352a20748f068333d8f32b4363a261d63c1dd721bed67ef85ac80e5c20e0cfe4eb0f491be2ace07174cecc31d0af77 SHA512 d24b2db0422b22667b7096a08ffb99abac782ee2e4cb34ff75367c9e16ebd14777f1a7e7941b19a9919dc0acfe844c284f2ee23efebeb3945b64914ca0db7306
 MISC metadata.xml 1139 BLAKE2B af56bf2214314c067f3b6f913e882eb7951397d388dd3f51616a658c71100b7df8a8ba7eae451252ba146f3af5c69678d35a999b9390f8f8e5ff587d1d8842a7 SHA512 4e4ac9d975627fe48eaac181570c023fef881d573237bdc634bbfd6a4308d4e38e4636c8aa805e74a54f0a84c0a649f6db1dd7bb7dc5ea0bdd0b01d9c8fd2f87
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 302413058458..0c35ad5f394f 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.6.5.ebuild
@@ -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 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 case ${PV} in
@@ -20,7 +20,7 @@ case ${PV} in
 	inherit subversion
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/fvwm-crystal/code"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}"
 	src_unpack() {
 		subversion_src_unpack
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index 7d3422b38ae8..31151d8a2c5c 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-backgrounds-3.34.0.tar.xz 31634888 BLAKE2B 5d14bf6cff16880c5c3d296d5d6587afda4ba0367922ffdf4aac6edca5bd7cb5efe8b45b60c6139d4542e752a88b36d1300d475a921bba9587f6284c3d149ba0 SHA512 bea6df85611a845c1013091dfccfd1d1fc697781a74348d936c15f8cec1ace765c37e6f57fed403cc2c6a91a18e522c8cc3db74b2c2327cd3ed71371075a9834
+DIST gnome-backgrounds-3.36.0.tar.xz 50499380 BLAKE2B bd2e211e15a0994f78fa28b3e43ea64cb47dbacf740bc7137f997b9212d453d038dd7aa1c9126aa7e6dd4ac7bbb8d5d10543661547b95b300760bce31a127389 SHA512 5c30b6e70a49e85ddea5a46a37c2f690e4c62c68d582f040dfd4ecdd6d50f364469e27c51115a7b1ba72edd58776ad2005d9bbcfef337570e50111e9443d4a21
 EBUILD gnome-backgrounds-3.34.0.ebuild 478 BLAKE2B 33b733c489c6972081bbced24b1ea0b08ff84d693ecc83a7a1ca883f614579a6cb1282781b136cc965dbb7a7aebf0d2f2855ae61bfd371c64bcd5bb84890538b SHA512 6c0cc752fe6e4e2e7f2cc3605ffe45ff0350853873c303ac7d6a7b8e5a7ae17cf4d4b5160330c3459b71788eb240999f3152282c05425991b6f7423724688d47
+EBUILD gnome-backgrounds-3.36.0.ebuild 452 BLAKE2B d2c4435e2105cce41ddbc2842bca2ae89adde2ed1542eb462daf2cb54d6d5f6cc90c91fc3aa20240e1cb37e7dfa3570f3c7d50abdd2cc2908ffa531fb496045c SHA512 4cbfd13f6752fc8bf3c9eaee2b360f8e45c213567f555c5a6c3f105bfa6525e7583449d220665a357448da4169c6d1e9de5acd9ee7972dde3f156b6f9262501b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.36.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.36.0.ebuild
new file mode 100644
index 000000000000..aced4d1125fe
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.36.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 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://git.gnome.org/browse/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 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=">=sys-devel/gettext-0.19.8"
diff --git a/x11-themes/gtk-engines-aurora/Manifest b/x11-themes/gtk-engines-aurora/Manifest
index 38c322cddb58..c4a09f69f4f6 100644
--- a/x11-themes/gtk-engines-aurora/Manifest
+++ b/x11-themes/gtk-engines-aurora/Manifest
@@ -1,4 +1,4 @@
 AUX gtk-engines-aurora-1.5.1-glib-2.31.patch 229 BLAKE2B 5cb08af273de69609a4c0a08f88381e3e2bc044cc7af72ba181deb9c4bb515d88f5b1e75cbb5bcd7f955adfc111a13b18b2e9b0bce2bdebc563c37a5848895a1 SHA512 e5620b76eb4c9423eb6412d23c2bfdefbcb5467f24cedc2e73299e4857c87ee84b57081d7996dc56c858f14bda2bfd7dbe004555f2d54273ab441b749611308b
 DIST 56438-aurora-1.5.1.tar.bz2 371792 BLAKE2B da4a06c5fc51e74e536a1f6ff9934b4312cd74f61a885b958139300a3e5f9e19a2b70fa6cbfd9317654b70cc73cf1b137a6c8e08c97656d1a815b746948f2dca SHA512 d8e2a2b071ff66597232f8dd681324cba9b649c9884b69b8135c83de23ff371baac0420968677ea1e28153953b7b5a0a26c2cfba20ef95179d9140e9a9faa67e
-EBUILD gtk-engines-aurora-1.5.1.ebuild 883 BLAKE2B 92f0b387a88474a63d1597c141886bc32bbf5a28d349a9725104aa142c2317b2fdf939aff595f88e6850d4a670b521551457bec01706bfd9de09e4bd3aed994a SHA512 dee1b1cc6337e01953220bc6680d7f75f217c0dc116269ec3394d6b32091d7c38c2ba14b85f01d2d405b5319d5401df6dae573e31be418074ab86772673255b1
+EBUILD gtk-engines-aurora-1.5.1.ebuild 884 BLAKE2B 76736e9108921edbe0773e5a3a740867c3a27fd6a4bc84d30333d96046789ac0a48d6d20769443bdc52b0a773f7e149f5b19bcb4c29f770088eea1d3ff2b2dd9 SHA512 44ecca05ec4ad48e0ab56f44ab3964b51f85b9642bb24149eb6a76b58a6bdff93fb2f45a1da4ddddf7a8ea03c0883a777a60193440e19f27ec5b65e73aa97949
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
index ec067e806173..e2cd19b4d018 100644
--- a/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
+++ b/x11-themes/gtk-engines-aurora/gtk-engines-aurora-1.5.1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
 	dev-libs/glib:2
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
-BDEPED="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/aurora-${MY_MAJ}"
 
diff --git a/x11-themes/gtk-engines-rezlooks/Manifest b/x11-themes/gtk-engines-rezlooks/Manifest
index 14e36653fd7d..e83860eb2d9f 100644
--- a/x11-themes/gtk-engines-rezlooks/Manifest
+++ b/x11-themes/gtk-engines-rezlooks/Manifest
@@ -1,5 +1,4 @@
 AUX gtk-engines-rezlooks-0.6-glib-single-include.patch 198 BLAKE2B 1008d5bb3af370d03428b593b3a1d7b6851ad8f2088a0d5b109fcf47a72d09c944517799d8ebdce76e1510ca7c2458484d3d79e2efed89a7f74bbd84e011cccd SHA512 0a91046c290072fe75fbc62f67e1f50a60a992a10c871a2f8909bf2a28d91b8439e0cde8bbaffd7d8ec3e7f21178d7bd67e74f8167cbf123830425fbb3e30a05
 DIST 39179-rezlooks-0.6.tar.gz 290016 BLAKE2B d6d713ee2ebe24c8fe1259cde41c2a6f7db75c0351bde99d3e4347cd0c74403893107806dd047e1807ef8f0817b67667927d4e6203180dbe59b2493a1bcc9979 SHA512 98b1eda414c5a33f1357d408aa4bd4b01c140afed0981941004db81d34f8f76c0bd49434009b776eb8f9adb24bfce9f22b72fb463200401409caba8effd3f0bd
-EBUILD gtk-engines-rezlooks-0.6-r1.ebuild 944 BLAKE2B cd36c6b33e42a8c59be226f4b0fe5ffdb17c3eaaa5e1709c5974c34dcdea2050162f1b7ed0622aa7a1ecdaf6f3ba709619adf69f170812c7bc30712b34b93d7f SHA512 8d50a249260395ad14e9446058b4c82ce11192674b5cafcc2ea74373f0b8c5e954dd04f975afbcf0131bc1f62f6c2a41595a81cb2aae45045285cb4bedd801a7
-EBUILD gtk-engines-rezlooks-0.6.ebuild 955 BLAKE2B fd57a04843e2552077bcabdc154df560123ecfdec4ba8eea5bb5be7d74effe3359ba4e843f9e49185d6a3fa43d5295998e9d500f54d1cfa93a2756c006bfa014 SHA512 32b329ed1c4c45f63297b977bd0fc48441e5830b6b7107fea921ef6b88eeda78eee1249f369cc8ca588e8a978109c65ee25e822ac5c15316fe35f8557e7210f3
+EBUILD gtk-engines-rezlooks-0.6-r1.ebuild 942 BLAKE2B 84378f0b2293224afdf94ce67cc2294d09451b5ca1507efbbb6c4efcf046efa185f0591bd496b3f32641c7cba74bfedcd0028498e2f6f88984fa205bda594fd7 SHA512 a9715356de99c6ad4e3c53187c22d7d66112385564e8277a3425584f4290b02d23f5eb2c5e769b6605af3fa724403151ae554157f4859934baf76d6a5e1f1a9d
 MISC metadata.xml 404 BLAKE2B 51d32e00ae6e7368399cb1724e10d8c3c9c340fd6460c26eee80eefc2c43b4616b9e5ac7c9c0034cb430bb0ec90ed26c6ea57abb24e5123717d564a03e7eb279 SHA512 86358b1175dda7c2e0f69595eff87dd58c448eba3ccad9136f44b19e428c7abe0cabaf4ec250f1962eba36feb3946aa2382420743f8f7bc178252ae5c15a4577
diff --git a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
index 4886633ce530..201f5d4502e2 100644
--- a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
+++ b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.gnome-look.org/content/files/39179-rezlooks-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
diff --git a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6.ebuild b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6.ebuild
deleted file mode 100644
index 8f1fd5fb0d9e..000000000000
--- a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Rezlooks GTK+ Engine"
-HOMEPAGE="http://www.gnome-look.org/content/show.php?content=39179"
-SRC_URI="http://www.gnome-look.org/content/files/39179-rezlooks-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.8:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/rezlooks-${PV}
-
-src_prepare() {
-	# automake complains: ChangeLog missing. There however is a Changelog.
-	# to avoid problems with case insensitive fs, move somewhere else first.
-	mv Changelog{,.1}
-	mv Changelog.1 ChangeLog
-
-	epatch "${FILESDIR}/${PN}-0.6-glib-single-include.patch"
-
-	eautoreconf # required for interix
-}
-
-src_configure() {
-	econf --enable-animation
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
diff --git a/x11-themes/light-themes/Manifest b/x11-themes/light-themes/Manifest
index 4d94b27919dc..c719e392a133 100644
--- a/x11-themes/light-themes/Manifest
+++ b/x11-themes/light-themes/Manifest
@@ -1,4 +1,7 @@
 DIST Gentoo-Buttons-r1.tar.xz 80476 BLAKE2B 802ce2cc0d8dd3c639cbb1b8ca51732cfb87194ecc2bd0ca68c7945c8768b8662d206bf191f443f983e80e25a21ebf7d1909771b2f51b7825b763494a4edac81 SHA512 d1c093fe8ce905a409cd3ce85fde8490f26b918bb1dd3ccb6695eaa6c7a4908d7ba1e1d14a9443a16331168ca9b3fa58b5b28805fc583b4345932602f7c19168
 DIST ubuntu-themes_16.10+17.04.20170406.orig.tar.gz 13836108 BLAKE2B aeb2b33639c32c378b111c717099a79afb8688b48780bfa816a6ac9b4c0bfef5d1b475048f8c4906ee76787b503dcc207fbd617f1718883952917739012e2a11 SHA512 50d65dbe232237e1757b0d7a85ba7c2cafac18861211ca1b33a57de6a4961c325014851d1ee661adec57fac7472b7ae4f78439f30fa6f425eb751e94940d9f91
+DIST ubuntu-themes_19.04.orig.tar.gz 16081764 BLAKE2B f94545c5900c9eaab61f021d8a8f37ef6ee825045df88e5a5e51c5d7632109343ca0293ee9b590daa6edf3be109a05128803a8a2c787a333f6317f8dbe54529c SHA512 95b41c5d3a47fba9c4b5368b4e80d8924e09844783c66ca697ce0ff5d71f2b0fd4f56a9041dc142267e0eaf75fd5a8b47c0abae049fc3434b5e29f3f363d83e8
+EBUILD light-themes-17.04_p20170406-r1.ebuild 2110 BLAKE2B 30b7aed0ab3f8dd5f9bcceba134b9af679d21a673bf5a0a27de6052e079bb6baebd70035e56a3573e5b7523847242db21a4eeedb4b59e92eaef37b86df43f3a6 SHA512 64c2d15a88a1f0e240168981ea284f5a8269e86037443c01aa04a398f1defdc8ace8eaac4c574a562fa5ef2fe90a88a20228ff32a080ba4da911e6a423ad6d04
 EBUILD light-themes-17.04_p20170406.ebuild 2109 BLAKE2B 7047f793c2783c770b57ee7bf28846dda32ddf4d028aa6f128cc5a9578130f69bfa261e5eb18d927a1081e8a51ab3c96a7b484d1834ab2f902e887d7535ff17b SHA512 5f6421524dfe03c61803626f8cad5685c478f1b73c9ab04f505ad96db2f31d8e1d9f98ff4d3c66c73bf58b4b937aa920f9540273dae8512fe7b519fbf1635cd4
+EBUILD light-themes-19.04.ebuild 2099 BLAKE2B e047dde212ad6d32f90dab792eab2faa009d8f9809905f42aa13b350edb103c4c31cb74f3a25f1b7eaa4f795f1ba3057dc6a8f9289f0fa7ad65f7dc43df3753a SHA512 7d89e2e7559a535713906a1e2ad3432df8185489a2eb310e493b7586ca4218a826eb1c87a6baaa86a82ed2d693a62ddc8aaf2bb0978a6548fc366b65870d9ecb
 MISC metadata.xml 506 BLAKE2B 41dfe203ca428341cbd04463a7fd30725e8e24889be4561b21c4b765cc589b3a8659b318030aa11e2026ca8625eb450cc0f7f4e491216570a14b0aeab638f2e4 SHA512 dc5aadda298ca7f295a47b3c354f0a12b3560c76e920e4ce41a902ccc483e6e328eaf252da3ae2a2afb27f5269349a33c1ae075dfe81de3f6e7256e347de83fd
diff --git a/x11-themes/light-themes/light-themes-17.04_p20170406-r1.ebuild b/x11-themes/light-themes/light-themes-17.04_p20170406-r1.ebuild
new file mode 100644
index 000000000000..4a33d8bcdb60
--- /dev/null
+++ b/x11-themes/light-themes/light-themes-17.04_p20170406-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=ubuntu-themes
+MY_PV=16.10+${PV/_p/.}
+
+DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu"
+HOMEPAGE="https://packages.ubuntu.com/zesty/light-themes"
+SRC_URI="
+	mirror://ubuntu/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.orig.tar.gz
+	https://dev.gentoo.org/~pacho/${PN}/Gentoo-Buttons-r1.tar.xz
+"
+
+LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk3"
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="
+	x11-themes/gtk-engines-murrine
+	gtk3? ( x11-themes/gtk-engines-unico )
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	cp -RL Ambiance/ Ambiance-Gentoo || die
+	cp -RL Radiance/ Radiance-Gentoo || die
+	sed -i -e 's/Ambiance/Ambiance-Gentoo/g' Ambiance-Gentoo/index.theme \
+		Ambiance-Gentoo/metacity-1/metacity-theme-1.xml || die
+	sed -i -e 's/Radiance/Radiance-Gentoo/g' Radiance-Gentoo/index.theme \
+		Radiance-Gentoo/metacity-1/metacity-theme-1.xml || die
+	sed -i -e 's/nselected_bg_color:#f07746/nselected_bg_color:#755fbb/g' \
+		Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.*/settings.ini \
+		Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.*/settings.ini || die
+	sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \
+		Ambiance-Gentoo/gtk-3.*/gtk-main.css \
+		Radiance-Gentoo/gtk-3.*/gtk-main.css || die
+
+	cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Ambiance-Gentoo/metacity-1/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Radiance-Gentoo/metacity-1/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.0/assets/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.20/assets/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.0/assets/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.20/assets/. || die
+
+	eapply_user
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/themes
+	doins -r Radiance* Ambiance*
+
+	use gtk3 || {
+		rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die
+	}
+}
diff --git a/x11-themes/light-themes/light-themes-19.04.ebuild b/x11-themes/light-themes/light-themes-19.04.ebuild
new file mode 100644
index 000000000000..91b109330db3
--- /dev/null
+++ b/x11-themes/light-themes/light-themes-19.04.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=ubuntu-themes
+
+DESCRIPTION="GTK2/GTK3 Ambiance and Radiance themes from Ubuntu"
+HOMEPAGE="https://packages.ubuntu.com/zesty/light-themes"
+SRC_URI="
+	mirror://ubuntu/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz
+	https://dev.gentoo.org/~pacho/${PN}/Gentoo-Buttons-r1.tar.xz
+"
+
+LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk3"
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="
+	x11-themes/gtk-engines-murrine
+	gtk3? ( x11-themes/gtk-engines-unico )
+"
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+src_prepare() {
+	cp -RL Ambiance/ Ambiance-Gentoo || die
+	cp -RL Radiance/ Radiance-Gentoo || die
+	sed -i -e 's/Ambiance/Ambiance-Gentoo/g' Ambiance-Gentoo/index.theme \
+		Ambiance-Gentoo/metacity-1/metacity-theme-1.xml || die
+	sed -i -e 's/Radiance/Radiance-Gentoo/g' Radiance-Gentoo/index.theme \
+		Radiance-Gentoo/metacity-1/metacity-theme-1.xml || die
+	sed -i -e 's/nselected_bg_color:#f07746/nselected_bg_color:#755fbb/g' \
+		Ambiance-Gentoo/gtk-2.0/gtkrc Ambiance-Gentoo/gtk-3.*/settings.ini \
+		Radiance-Gentoo/gtk-2.0/gtkrc Radiance-Gentoo/gtk-3.*/settings.ini || die
+	sed -i -e 's/selected_bg_color #f07746/selected_bg_color #755fbb/g' \
+		Ambiance-Gentoo/gtk-3.*/gtk-main.css \
+		Radiance-Gentoo/gtk-3.*/gtk-main.css || die
+
+	cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Ambiance-Gentoo/metacity-1/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/*.png "${S}"/Radiance-Gentoo/metacity-1/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.0/assets/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Ambiance-Gentoo/gtk-3.20/assets/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.0/assets/. || die
+	cp -f "${WORKDIR}"/Gentoo-Buttons/assets/*.png "${S}"/Radiance-Gentoo/gtk-3.20/assets/. || die
+
+	eapply_user
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/themes
+	doins -r Radiance* Ambiance*
+
+	use gtk3 || {
+		rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die
+	}
+}
diff --git a/x11-themes/lxqt-themes/Manifest b/x11-themes/lxqt-themes/Manifest
index 6ab70a9b837c..ba5823b54320 100644
--- a/x11-themes/lxqt-themes/Manifest
+++ b/x11-themes/lxqt-themes/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-themes-0.14.0.tar.xz 3203820 BLAKE2B a8fd0e77f3c6844f13755bd5c6e0e48c194475c082cbcf83b3999e120f548f457293cc0bcf06cff2ab38ac4ddf54346cf07abb80d5f5f326eca5c5a6baee45da SHA512 622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2
 DIST lxqt-themes-0.15.0.tar.xz 3203876 BLAKE2B d2c1c15c70b3a90fec23287bdaa9eb31375a23257376e575572769faf91d27c79e5f0ea868bcbcde29964d4aa52d6eea355e82d63076e4ff7e558d9f2f98d06b SHA512 7ef0c5af9945ef450d78e4991e482781728867e7d4f6793832c822135a47288b0c08d883d207ee7f275585fa7ae17f2e6bdbdaf01295ae2810e01c43330f2f9d
-EBUILD lxqt-themes-0.14.0.ebuild 537 BLAKE2B fec4e01a8cbbb95f6181cc0530c1fff7faaa4904e62bd6c07fb958acb9b596b06346012d27f3c5dad2341267bb780ae3149e36a5cbf43fb972c913e35756d57d SHA512 f807304153c6ebc4242d84ad377b791d0e88b4961acd1c710697f5de667c2989ba933201e8ce3eaa4cfe5280f6777e94563c93057ac1840736c36405c20b183c
-EBUILD lxqt-themes-0.15.0.ebuild 490 BLAKE2B 74d5e6bb75cbb82ca096b80adb5f3e58178fe152ee02ecab44669998ba2e3660936bb273d412fa2a8c7f15686a404f1297b42f5301c4a8f5441457e948d16bd5 SHA512 224f2ee45bb9e5ed970b76faf35d8a86a7121c8e75b240a7578b9e88715f894d055e560e02122a68deb3041f0663c01c75de7004a5fef71210d90dfa4b2fbabc
+EBUILD lxqt-themes-0.15.0.ebuild 488 BLAKE2B b418b28e292f750614e6d87328930f4e3a5b323a72799e31a2dcdd9cc41a100ac5922ed9ca289f4650422d52f190d2a5faf8572bf84600dc1f05f274ca99c8f5 SHA512 3e5f70757db20cff99be8873f6e367911c4e6ca49d1fd6b13dcf41ad9f07a5511ad9b57f36e9cf9c3ccb17f3f67a86a5cef0c5e3f5523aca7ea554cfc0cf712c
 MISC metadata.xml 317 BLAKE2B 5570995b3ad6a8fbde584e6ec5d9d0e09e6000313c1b7e1caaea7fc36aed93f86af522fd4ce0ace8ad764135d7d07a3c3a27b97e8144c915a9d3621f53e77c3f SHA512 7ac9d03d1f2248513ae60d61ec213d18ac6757f66924d0273bf93f9c47e6b32a5f05d393c4c92484c59b23d7ddb8f4fd915bc31e45885bef91f44f6a9cabad41
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
deleted file mode 100644
index efe00eba3bb2..000000000000
--- a/x11-themes/lxqt-themes/lxqt-themes-0.14.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Themes, graphics and icons for LXQt"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild
index d241792f75d4..8b5cecb8fc2a 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.15.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/x11-themes/mate-backgrounds/Manifest b/x11-themes/mate-backgrounds/Manifest
index a2c31b65bab5..821da0c30486 100644
--- a/x11-themes/mate-backgrounds/Manifest
+++ b/x11-themes/mate-backgrounds/Manifest
@@ -1,5 +1,5 @@
 DIST mate-backgrounds-1.22.0.tar.xz 20888288 BLAKE2B 66b3d9fee7917e2a3bc3222f1e663d77532407dc3169329d66f9d4a7b0ac1aec91c30fdf4516672760a7cbf05b0091c6b57221504ef50abd16fa869ffadff145 SHA512 b7135cdb20972d50f43026cf98275faaa3c5e41bd0900bca7624a8f9ed03d0ec7f465c78aaf3da534ea6798e8cc690727a1fed8f14b3fb42a8a63bd82858ff30
 DIST mate-backgrounds-1.24.1.tar.xz 20958108 BLAKE2B 398e9c7dd9692829c0b5854f828ba911ed01deb300e40e09489971df1e453490f681098e7e85b367404956ef0c515eb07d4e898e44be07fd555f0daf818a27e9 SHA512 6af6bd1be186da3c4c594687ece1f6b50c3b05fb0619dd0062955e9e09c8007efe76a7625826cba0e4716c8ed61eac4d372b0a3bf2b87f00b7f170bb97709f09
 EBUILD mate-backgrounds-1.22.0.ebuild 355 BLAKE2B f82925133d95257fcbac0e8a5cde785897b8b990f1ce64f1090b0a1dd3e7929b01773c7211996d81bb4398dfd2b58c92568f7d3c12046b876fd7fcbccb27d972 SHA512 96c4db84c3d6beba377135688b4acc51e90d836c1ed82d46d3a3aa42b6d253d2b7da91d4c2a5b7c9080282c9c14677bf8545a5900bffa579d998923071e67aa1
-EBUILD mate-backgrounds-1.24.1.ebuild 343 BLAKE2B dda4dc9c2eebb4b666387ccefa5e91567c374added9b93f9e92daa452e84d3130bc0fd12f6022711073c60d78f0f4657a474c4613ad9196be035d34a9c3b40d4 SHA512 496674bbf9ccc93ec569fde0f842513a9fa2d00d25d6e68c0fee71df7952c247a392805641ba26f657c48ac56bc5835e03f1b96fc8c6ea2baa5d14508231a371
+EBUILD mate-backgrounds-1.24.1.ebuild 341 BLAKE2B fbcd10d8852be3baf3967fa84f9839c34270926011e3e8d310c1c57e02bf09bc6de158a74e7a613d6225ef3f853eb505f0f17b179964c2eac2b659526d79406e SHA512 44b393b9a278f40f2b3b165c00ddb48e13c4ac94756a47967cf5df334811d8e6ac5d9140a0a19a3379df738b7eabe4c9495c030db088dbcaeaabf8383ce31a71
 MISC metadata.xml 345 BLAKE2B 28aa7d5e9322cc6467efe367a61c8c6dfcb915155f071cdc2b5d7068d205e6d55dff935c975f1198f905d39995d8d86f26aeee2275bab05be094b65008a338c5 SHA512 9880e456177c6c1557c36c3dbf99a55f8abe497be5778db47a0b80f2a3d15bb8e3b3c9f3b00b3161d3aa4cf61dc6ed106ade41e8aba3ed99fc3a879bcf47bc8f
diff --git a/x11-themes/mate-backgrounds/mate-backgrounds-1.24.1.ebuild b/x11-themes/mate-backgrounds/mate-backgrounds-1.24.1.ebuild
index 7aefb42c4b23..e66008427c73 100644
--- a/x11-themes/mate-backgrounds/mate-backgrounds-1.24.1.ebuild
+++ b/x11-themes/mate-backgrounds/mate-backgrounds-1.24.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="A set of backgrounds packaged with the MATE desktop"
diff --git a/x11-themes/mate-icon-theme/Manifest b/x11-themes/mate-icon-theme/Manifest
index 2531e454829e..de96185a0075 100644
--- a/x11-themes/mate-icon-theme/Manifest
+++ b/x11-themes/mate-icon-theme/Manifest
@@ -1,5 +1,5 @@
 DIST mate-icon-theme-1.22.2.tar.xz 21450764 BLAKE2B 85135d017a701635735448bb2104e66b8147bd7251d1b1ad8d8deed3d35081f86f92c5f12ef048bfc4b26c8c4d98835a2fd8cf924fc1df9ee0dfd3f7f62e9968 SHA512 bea4676305b3b26b1a65080d960c33276c1ba30bcd442a200773745b2723700f1ff04affb2483f9c2389475b80700355e85a1fa7fe20c8ee645927d95e0d3b23
 DIST mate-icon-theme-1.24.0.tar.xz 22178384 BLAKE2B 7e1dbfcc83da49f30bad89106bfadf8d19d1ef3074d1302edad2934a46e6caac1aab003a126c823757e4a75127279107945e921d6463a05476ca98cf898ff74f SHA512 18ad6a236f02b7536697fed9086eadd997f0c47cc8311324e43641b21ccf942d0dbd52fa6c49623e679d3b23d82619cc256c98d9f8ccc3b3d4cda5d9a6e465f1
 EBUILD mate-icon-theme-1.22.2.ebuild 584 BLAKE2B 10c44c55a4dc2fd67c4a40cfe1a35fd2efb3f4a64b37b9de40fbb021946e3238902421a2bfc7d1b1f466c50e335d5e78c914a9bbd94d5d4f67ea031d5b5967e3 SHA512 fac448ec061409fa7d4a3c463b772b1991d08f813591d1c34f345d3a3f20e55c9768519f6a7d60afeb66eec146956d9f1aa9b21090e52d5c59c92c4a79fbeb71
-EBUILD mate-icon-theme-1.24.0.ebuild 569 BLAKE2B f977bbd7d6f17f281f2939e31e65607c185a7288cb1252dc308dcc5f48f0ae99da8b465513b1c9f7ff6484af42ca38def52da0dc3cb905038e2261745ee6e8b2 SHA512 b56fe538c84f16dd62fd2b67de4f03d2475b7107b0c7c55c674f0506fefc0f9917344e64ddb4819f8fae09f9216d9cf7a4cce667051f598b12f372d0c288203a
+EBUILD mate-icon-theme-1.24.0.ebuild 567 BLAKE2B 80afe25183dfa10b2a522c40365b19f7ea12cc8264ccb174186a3f460d0238c1210ff7fccadedf7dea62fe2723964e1acbd3d51579c5b37f33e928f86d9ca1b8 SHA512 1a2dfe0ad93407b7b1cce87013583e22f701b440a4c543e5c2cc6c7731cbd1286e9d22b181b5d07f72c5de188a19459228ce09b428e11d1911aa27ac3c9bfd8f
 MISC metadata.xml 344 BLAKE2B 68e920d9ee5bc270b90b69afd553a9010971d678bcaa94e11345369c0ac5be27719f2acb9d213ec48a42e6be609b2f8ea392a72d39b43bd24b2ebf76f162ce48 SHA512 fc069bbf06319886e8f884c8ffe2d869e4224a062f3aa26af997442db92015261c3e1ebe73e6e9c9e4d8dc69d1d3f7d8df12134967bebbbadaea98911dad05bf
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.24.0.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.24.0.ebuild
index 7643892dda78..464389f9be4b 100644
--- a/x11-themes/mate-icon-theme/mate-icon-theme-1.24.0.ebuild
+++ b/x11-themes/mate-icon-theme/mate-icon-theme-1.24.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE default icon themes"
diff --git a/x11-themes/numix-icon-theme-circle/Manifest b/x11-themes/numix-icon-theme-circle/Manifest
index 365a91f4ad57..e5ac22aadf24 100644
--- a/x11-themes/numix-icon-theme-circle/Manifest
+++ b/x11-themes/numix-icon-theme-circle/Manifest
@@ -10,6 +10,8 @@ DIST numix-icon-theme-circle-19.04.15.tar.gz 2159340 BLAKE2B a1f9808ea0e8596c411
 DIST numix-icon-theme-circle-19.05.07.tar.gz 2160219 BLAKE2B 3a172cd98b870d3f0b90b1fa2c82f52c991c428adb4b2608a6c3ca6e9ec52987810d82c685e10c59163eed6d2a3ab1fbd4de8709d175e4de54ca9c4433bf62e5 SHA512 9e15ffe7412d54b710fdd640fd1965fd7844f995d8b85eba8072d9bd7c07576ced5ab9cf2cffe58afff777b01174bec485aa7e41d3964cdff177524f78457074
 DIST numix-icon-theme-circle-19.09.20.tar.gz 2193017 BLAKE2B 495f4b2c1cb74ac43d59515ed03d9b4032fe3453f37fb20bd09c24aa3e1037654967149372cdc3294f0d21b2ae5d95e43604864b7fd7520bb626ce58ec333769 SHA512 bc0e80953e646c305d8af9f2360389850f7f67b5bfc35501c137f07dbb99db146e4de6e2afaa711b8eafe83315ab5f392ce1276bd54a431516c21171da20a9ff
 DIST numix-icon-theme-circle-19.12.27.tar.gz 2206572 BLAKE2B 0e66af8abbff88f978d7be82b1f5cae73fe0b7c37bdc7d501179f2e922b2d8b599138eab54b299c5b6cff5c94675890363c5bacaded84c56eae053911aef0a96 SHA512 204b67d28a673314a61802cf9303cbc437410315e7e7d12000f155e2dc095e0ebf0003e62e8bf0046c972a03353a114119e00353144803398881e4714b3d5aa3
+DIST numix-icon-theme-circle-20.06.07.tar.gz 2281791 BLAKE2B b056ab28a78e4c91684abc7527d39c68950a143f7bd9d9db67132b0622657f5c4e7b80decddf7bf3102d389af082ebfdbf39797f2eb16f1364adb70fa2d78b9f SHA512 21eeb521d0ab1a921ce126d63689317fe1b8031e7d661cf530e07bd6b6e51547a4fab2292986b4bf9cef26812011e46a62646fef2344c0d7573e9fe9b93ee137
+DIST numix-icon-theme-circle-20.07.11.tar.gz 2309911 BLAKE2B feab9f36671de413b15ebfbb122435c0bb6e632373526372680722137e9e74f5312aecc95682a0edd8ee356d070762b35bddb99e2781013a88dacd60e2286abe SHA512 21550994b798387c9e93ecd6d7d73611744fd7bacc061306d0671e27d309608992d148081840f9857728dfa72aff4b288a6f0e57d34af727f29a0b6f89553560
 EBUILD numix-icon-theme-circle-18.08.29.ebuild 656 BLAKE2B 2b8c3adfbe332b3d7756d932436dd91bbd4bb3980e1c771a3a40e34d84089fbad6bc77302bf9ea0cb71dadc02e3e85ae13f95cc70dbd13bfc8a79109fbfe5491 SHA512 13e9ef15122930c5bef8f06a69e9536cae6a87872d0872438989dee3422882e8a3c2d769eacbe3a4de6327a6d9563308969d1ffa6a77871b45314215548aa8a6
 EBUILD numix-icon-theme-circle-18.09.19.ebuild 653 BLAKE2B 26975b6f26f195b4f01a6e725368f777b62868e4ea86a07358086c0ecd8032c03d7592268aefd53b6eb047413df2406ada1edea2f70a2644ae0f172f57065fdb SHA512 fccb29eb884f727777a4a640ea01fc2831dfea7e767dc631547f24b48bce7dce27aaafc31f9f2cd2d3c06f74b4371843aec8ec4b39f24e197fb10409980b91da
 EBUILD numix-icon-theme-circle-18.10.03.ebuild 653 BLAKE2B 26975b6f26f195b4f01a6e725368f777b62868e4ea86a07358086c0ecd8032c03d7592268aefd53b6eb047413df2406ada1edea2f70a2644ae0f172f57065fdb SHA512 fccb29eb884f727777a4a640ea01fc2831dfea7e767dc631547f24b48bce7dce27aaafc31f9f2cd2d3c06f74b4371843aec8ec4b39f24e197fb10409980b91da
@@ -22,4 +24,6 @@ EBUILD numix-icon-theme-circle-19.04.15.ebuild 653 BLAKE2B 797c9df13d53cbd894126
 EBUILD numix-icon-theme-circle-19.05.07.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
 EBUILD numix-icon-theme-circle-19.09.20.ebuild 653 BLAKE2B 797c9df13d53cbd8941269a33bdc9deb8b4bfd3d9030c1114c638cd3dcdca8ea6e027a0164f9434a20faf657667992428a421b90f22a15727e1587074a89cc5d SHA512 db7bdd66e6a1f663ffb788b1a6060d6d0c026a4fa6f9612aa9bdb115cab72bddb3d55a291ef73dbbd4478c787eecd797ad2681bd601f6d151efed5f9b2a7b4ee
 EBUILD numix-icon-theme-circle-19.12.27.ebuild 655 BLAKE2B 5c8d6cac7efeb2f4c84500b680d0dd10b4059cea1a38a051954516b312290c2c1e64e853af405d00c23d6a703fe30a1850c175616113f2c9f0b5ea2d3212584e SHA512 b179a6d657bfccbbde7edc55dccc5708b0f358c82f706de261e143b73b8a650298b8552531433bfdff5209fbfa99b6bf9fd356b6f633495e5950150f8552a0bc
+EBUILD numix-icon-theme-circle-20.06.07.ebuild 655 BLAKE2B 5c8d6cac7efeb2f4c84500b680d0dd10b4059cea1a38a051954516b312290c2c1e64e853af405d00c23d6a703fe30a1850c175616113f2c9f0b5ea2d3212584e SHA512 b179a6d657bfccbbde7edc55dccc5708b0f358c82f706de261e143b73b8a650298b8552531433bfdff5209fbfa99b6bf9fd356b6f633495e5950150f8552a0bc
+EBUILD numix-icon-theme-circle-20.07.11.ebuild 655 BLAKE2B 5c8d6cac7efeb2f4c84500b680d0dd10b4059cea1a38a051954516b312290c2c1e64e853af405d00c23d6a703fe30a1850c175616113f2c9f0b5ea2d3212584e SHA512 b179a6d657bfccbbde7edc55dccc5708b0f358c82f706de261e143b73b8a650298b8552531433bfdff5209fbfa99b6bf9fd356b6f633495e5950150f8552a0bc
 MISC metadata.xml 341 BLAKE2B e5184c4dd30e2cb0aa7d87a8aab5cc9886b6f3ef0351bbaedefa7565231dc7933c4c37958bc5f4ede9286ae795edf16896576274882156b998b70bfd4b34d293 SHA512 a013dcf5530f09aac85d3098dc08eee4746f0a25439cdecf2824209177cf9a05759602bb5b3f5d7118ccf9e8c8e234fc7fc99d089c9f4749945b4c6b438374e9
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.06.07.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.06.07.ebuild
new file mode 100644
index 000000000000..8cf32c6a91bf
--- /dev/null
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.06.07.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils
+
+DESCRIPTION="An icon theme for Linux from the Numix project"
+HOMEPAGE="https://github.com/numixproject"
+SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-themes/numix-icon-theme"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r Numix-Circle{,-Light}
+
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.07.11.ebuild b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.07.11.ebuild
new file mode 100644
index 000000000000..8cf32c6a91bf
--- /dev/null
+++ b/x11-themes/numix-icon-theme-circle/numix-icon-theme-circle-20.07.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils
+
+DESCRIPTION="An icon theme for Linux from the Numix project"
+HOMEPAGE="https://github.com/numixproject"
+SRC_URI="https://github.com/numixproject/numix-icon-theme-circle/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-themes/numix-icon-theme"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r Numix-Circle{,-Light}
+
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 028b25ebf27f..678ebe8f81f0 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -7,6 +7,8 @@ DIST papirus-icon-theme-20200301.tar.gz 21896164 BLAKE2B fb2c11b3ebe893375283e7f
 DIST papirus-icon-theme-20200405.tar.gz 22279244 BLAKE2B 756402258dcc356cde2c4822c979e93096de6fd827037a21839e67a6f6bf81da7c86cb311255a6018676941ad1659cb5206dc8f3d1bfd8f320381232b5a0528e SHA512 116aefea7049f7bdffee12fde8fa7088dfb4cd52f78bba617390700ba292b664dde32d30119f2929121988fa46244d452407b82f61f113b38810743c6db7e451
 DIST papirus-icon-theme-20200430.tar.gz 22659357 BLAKE2B 55c68d06375f1713650e908df8d2a47725d656dc12cb02117f5b49abf662d36c3397fc13f1b806899e14ccc1bb84643fbcf32d716c9254f2c69133c13904ac53 SHA512 5be8e68f3b0bff32c8c1c8c6fc4d4358a1fa18b9395cefbde4b6056fd38d1fb68f2cc555b5aa98e0399c24ddeb119d501b00098c459d43a734ae831b7df9624c
 DIST papirus-icon-theme-20200602.tar.gz 23108544 BLAKE2B fced236cd7318ad26df0ccbf0ad2800a8678265d2060746a17143b20193d6a96193de0950b77cb29df160757dae833755d6489286a0f4b52db4164e8158d0704 SHA512 c860efd6ab863cbeb7b5f0d3afb7e652bbd9daca9c5028b0c466d1930f7bacba137fce40220f858b2cff0ef575d1c9eb979d7ba1c79481d7dccdbd6a273953c0
+DIST papirus-icon-theme-20200702.tar.gz 23456769 BLAKE2B 4e4c9466c14a18231526c3a6db33cc35841a1e5787f03e186914f57f67ee19579e4822099e82fb9b295a6da393b1097110b7ef3b86737794fe0f5aa8c62de50d SHA512 ff2aa30bb70361f2952be203b3e3d00aae248726b5413a3a8e9ad7d6e7d0759e9bfd156cc65520175aba0e5436e9e58453ae0058d7d639d5c9a818e7f158761c
+DIST papirus-icon-theme-20200801.tar.gz 23673134 BLAKE2B 6562a6445008de3b465a8c1b7db9ba62d057ba9937058de5355482a063df3b93db5cdd3867ffee113b1c2a0152735ac0b0fdb0dfa46119e7ed31ef8ebcd0765a SHA512 fd8262b4b56c825f145db466c7237f29322c76f8ec10c59a9cb97315b4a6ae3667c6e6e4910a8165529e762c5420298949f5b283ee4d37ac14135be35cdbf993
 EBUILD papirus-icon-theme-20191009.ebuild 639 BLAKE2B ef9a22646126e41e14a546df6026eb0debe8d5665e18a4954b78eadfe2b7e18778413806bdf376a96b0411bbcb3fccfe6c6eed43112a19a960cb971c1a3b4d1c SHA512 9b242cb7f2aef3725cb4a1b805111fe8440b039c8d824a74689c2594292e09fe03b41518950583fd7cbac095c87da1f7aa8cf38292bc319ae3f1476e764fab2d
 EBUILD papirus-icon-theme-20191101.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
 EBUILD papirus-icon-theme-20191201.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
@@ -16,4 +18,6 @@ EBUILD papirus-icon-theme-20200301.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6
 EBUILD papirus-icon-theme-20200405.ebuild 642 BLAKE2B 851b739b3eaab77f10dd8f74e6f87f3f41b55da71125794f302a35f2254b2f4596bfe70c07d00bcd06a1388f76cb1eac4ea0f4939de92736090861172cc32e65 SHA512 53efb1cfc6419f226295ef90e0d78296dfcb3eec19cd7442f40a49f5a47490dff1e76dc1267608e7a0f4f31600472639d7268b93e48b4123e0995e963deef73f
 EBUILD papirus-icon-theme-20200430.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
 EBUILD papirus-icon-theme-20200602.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
+EBUILD papirus-icon-theme-20200702.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
+EBUILD papirus-icon-theme-20200801.ebuild 644 BLAKE2B b25f19cf8efd8e58c1e1431362e6d31767ed385b1787d7610347519daba97e98e0b61278ef5d68db41ffe3c4b9003f238ce13b055b433641a7dfdebda043241a SHA512 c62035432dcc74695307f915d1ccc6b67264c21e6211ed4302464e63ef5d7467e8a6e33cc7414c86b8684046ad73ad12e9a4471388fb65e6449248e5773ecce6
 MISC metadata.xml 346 BLAKE2B 2d58a9d14140c9604368097a28fc9c0042172bf4d023cb8efe6cab6b06b43226e5ed6f221cf55a7b7ec02ce4724426ffca9c025e44a515fdf16f5f0f33ca9a9a SHA512 6e71bcff36afe7da780a7241f0a32d39d78b9ffdc1b3c7b9b1025ccd9c37b38d9b519e44584c78af431d124b97a7c6303921be3716f43c9769da0eff525e4235
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200702.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200702.ebuild
new file mode 100644
index 000000000000..72805a2a9317
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200702.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="icon theme for Linux"
+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 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r ePapirus Papirus{,-Dark,-Light}
+
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200801.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200801.ebuild
new file mode 100644
index 000000000000..72805a2a9317
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200801.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="icon theme for Linux"
+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 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r ePapirus Papirus{,-Dark,-Light}
+
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/x11-themes/sawfish-themes/Manifest b/x11-themes/sawfish-themes/Manifest
index 6a4c2fe78bb8..e33299e29dfb 100644
--- a/x11-themes/sawfish-themes/Manifest
+++ b/x11-themes/sawfish-themes/Manifest
@@ -51,4 +51,4 @@ DIST ultraclean-0.30.tar.gz 661214 BLAKE2B 6d6a2d050d97d2da97acbe20225f4f93bf576
 DIST whistlerk_-0.30.tar.gz 6896 BLAKE2B 68514eca78c7ceca4f0b34be87ce021370a85e7035f5c8152dd87ccb26eb945dc5bdef406ea495192dde987d6ca0d3af4e5084a2451d424c3b90b8b235bde514 SHA512 c1a5dd0b079076e25d6f392a71ac7cfa4016ef304e05e832b27f18ebb86d3fde88c737b4efbcd8be0fa2c41b057726cb4e4d8c3be38bc89d7af37d4e820b22c9
 DIST win98-0.30.tar.gz 5176 BLAKE2B 0e2cc34ed26c81b54a7de6548d9080e063a584c6f1948c6d07e6348736ff96059950d234f0b9266206563c2c3da98000486015f8c7a88d60ee433a037e071002 SHA512 5767b2e2da79e5417a15b1d747aaec1fe869e2084e81301092982a4d044afa18b53dda626d0e77058e8917e5598e502f38884de95b502f9a356fa3c7f892e535
 EBUILD sawfish-themes-0.0.1-r3.ebuild 2839 BLAKE2B 627b65ae30f732b9fcd10c60f1aaffc7a38f60a0e9939bb87d77ad43d125e78c9d55d03d36d73fe3b8ce8101477b90375780d700ffefc4bca955dba2c8a512e4 SHA512 6e42bb1305eb297888e92336e47ee603ca485d963ce80c10e13a240c188e3cc0bf7d1490023c820d3584a8ae94fd7fa72778f2f73caa374847dd4c7e224f1364
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-themes/sawfish-themes/metadata.xml b/x11-themes/sawfish-themes/metadata.xml
index 39980802b1da..7a38bb900964 100644
--- a/x11-themes/sawfish-themes/metadata.xml
+++ b/x11-themes/sawfish-themes/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-themes/slim-themes/Manifest b/x11-themes/slim-themes/Manifest
index 92889a0997e5..40a5b47d2433 100644
--- a/x11-themes/slim-themes/Manifest
+++ b/x11-themes/slim-themes/Manifest
@@ -20,5 +20,5 @@ DIST slim-scotland-road.tar.gz 224691 BLAKE2B a0cd1a53a7105f05645953fe21c4597e27
 DIST slim-subway.tar.gz 259307 BLAKE2B 71a096d95355e1ed3009a1590ceefdcf03dbdf316106663129a3850878adc441d030051150033bd591afafdef1542ca72d89e5d36bf8911a7d215ffb9c7e66c2 SHA512 af082f93028683970d9a5233ffd05b2aed175c5c51d8a08488db50335f61363c3df54cfba84b351aed5b529222e4253a607be643ab38af6dc29237502775a799
 DIST slim-wave.tar.gz 277774 BLAKE2B 48ecedf22ada97bf7fce3398e7a457c5568bbc334e6e710f8b1e1c0cbbf9986fd65217c515eb5752dd18880a51c58e14c8195f8772a7c4537bbe7863a51655fb SHA512 0e2ae1fbed9cc6d82bc7f46b0dfac1c837b2e09f5e6504e171eabcefbf0a7dc3f7d647328fce7a21a60c4eb59e16d3d6f4622800df2fdc9973fccf36d2806253
 DIST slim-zenwalk.tar.gz 337070 BLAKE2B 37696398590c4faa402ca15168505e7f5352e20792ccfd87c3728a37ad8f004b7ecc3397bad8d947d7a04195b51a08f71b885d411dfb403d6a430edff2a80d85 SHA512 8f0cdc4fe3830d3dc25d91781853af102d0c3f8f6a24ee917c1d5107c2ae353c590c257ff329fe549b981928d387340cacd9d87c17d7b6c9dd39f2a950ac491e
-EBUILD slim-themes-1.2.3a-r7.ebuild 2429 BLAKE2B c267acae48f82a11eb90d74d5269fe28a4178b33d8d0f8745b970e86e4f5f1d465eacbf0b6602ecfdfaaa4800db088ebb804af1f5f5a84e20004f9f18a8a0837 SHA512 7df652a5aed9bb3efd46e599ca6feab6e7d1ee125a9c5bed564fb6510bdc82ea6c90ee2fa6a58edb64720ce4a3a565cdca1380ff2ab57e142e7c786a5a75cd33
+EBUILD slim-themes-1.2.3a-r7.ebuild 2433 BLAKE2B 8c20a87d6a5dddd8a57932d52f071f8081b2cc2c1aa70b5bd4b2541b58d3837908646d3105d63e70450ef22ab6323761967b42f778df34a509d39ee09b2443b7 SHA512 058205a86520eb9c2805b9aa7257a746abae73bc75e843443da926ba98423306ca400a788853454a6ae0ff0354510b05d81fb1c3140fc579414a5b42fb47e122
 MISC metadata.xml 433 BLAKE2B cf362a211844ad9b4bd066f72afb18171fce6bb8c794eb4fe5d2e680e3adae414fb287274bf360c1de9597672d72b4a7783f65012e3b3e3d6fa3d74c1ae22cbf SHA512 e8ad87f6a2d8667f50d1ae933778aa1ec9ed62360236bc17cf38de1c289fbb37aa12b959a2d7d45649e59bf39737007fdce4c0de77003240bcf616a67d1ca76a
diff --git a/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild b/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
index 95baf2ccadd0..55fe88f83849 100644
--- a/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
+++ b/x11-themes/slim-themes/slim-themes-1.2.3a-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,7 +30,7 @@ SRC_URI="mirror://sourceforge/project/slim.berlios/slim-1.2.3-themepack1a.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="x11-misc/slim"