gentoo (valentine's day) resync : 14.02.2021

14 files changed, 89 insertions, 164 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 7e14d9dc539f..414b3ae434b8 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/e-flat-theme/Manifest b/x11-themes/e-flat-theme/Manifest
index 351b379c00f1..57162bea80af 100644
--- a/x11-themes/e-flat-theme/Manifest
+++ b/x11-themes/e-flat-theme/Manifest
@@ -1,3 +1,5 @@
 DIST e-flat-theme-0_pre20210121.edj 45282525 BLAKE2B baf27345585d45ca57c2826271dcd377628ef6e733ee98a06020fb4c303034bbe7866cb8704cc33361019cfb00f186839972835e9119390caf833a7a51a0cb7a SHA512 dbced249ff0fc4fd775e8c6bba524a1636f02854f7ccd42d1c038f426edea2e12c1ec677e7e1666c7a1ff74d11cbcd96c8959997dae8f8f36eb77dbcdef84822
+DIST e-flat-theme-0_pre20210212.edj 45211061 BLAKE2B 591b10cf7c2ac001fdac007903625f642d7e02ca73c9ea600b5bcb05b83e8ae2a0eff3a8b4ef0f038f6a0c1aeb3b66ea56244ad12e84b1179c426b9868acdc59 SHA512 61b3a68e1a0c60e47b6b93b9fb7a874f3b8586625eabb7f2f5c4c70c70bfe43f3325c3bc4b9fe1041866a3697511a769326dab9e424443363a81ec8a5acfe0b3
 EBUILD e-flat-theme-0_pre20210121.ebuild 1030 BLAKE2B 016e3a9ac92dbf1fcb207ff6c60f7b4c2e2fa87d45c343905853cbf859fcabc62c6cf7cac71b89f48fdec9421209ba204644992abaf16e641af314c361403e6c SHA512 6fa4e78403c498530a7d862d5f50fca147fb633b00b9d9d634f2d3e275efc8faf5048faf36238aa6ebb2919cf5a7a6eadbc7dd48fb9f366b3bdab2f88460aa69
+EBUILD e-flat-theme-0_pre20210212.ebuild 1030 BLAKE2B 016e3a9ac92dbf1fcb207ff6c60f7b4c2e2fa87d45c343905853cbf859fcabc62c6cf7cac71b89f48fdec9421209ba204644992abaf16e641af314c361403e6c SHA512 6fa4e78403c498530a7d862d5f50fca147fb633b00b9d9d634f2d3e275efc8faf5048faf36238aa6ebb2919cf5a7a6eadbc7dd48fb9f366b3bdab2f88460aa69
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/x11-themes/e-flat-theme/e-flat-theme-0_pre20210212.ebuild b/x11-themes/e-flat-theme/e-flat-theme-0_pre20210212.ebuild
new file mode 100644
index 000000000000..d9b011896102
--- /dev/null
+++ b/x11-themes/e-flat-theme/e-flat-theme-0_pre20210212.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2021 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/gentoo-artwork/Manifest b/x11-themes/gentoo-artwork/Manifest
index 8b5a95b8424e..91c8fc970585 100644
--- a/x11-themes/gentoo-artwork/Manifest
+++ b/x11-themes/gentoo-artwork/Manifest
@@ -6,5 +6,5 @@ DIST gentoo-artwork-0.4.1.tar.bz2 2794643 BLAKE2B 9798517f1f6c2260a7735499e90f73
 DIST gentoo-artwork-0.4.2.tar.bz2 612218 BLAKE2B d99af474be50469d17ebe60570ba86bbf2b1605dccb40bc60527a53826ebed63588340e899682c8da6df7807522b6acab5181cc2ce964f40d4453cc5303e6a08 SHA512 cf8283f0743ff8ab8b39b7c39cc12c74d5c3ff7b8b0e84f2b3ba34657b16ed3657e155aa17ec1602b0e70f57e30fae5869c9f3405f825a1c67a0e7b48c73edd1
 DIST gentoo-artwork-0.4.tar.bz2 26804896 BLAKE2B fd146c388cb2b91ef6564f1075ee70eee5483c01a79c17e18d79b6b8609cb8f7cf11fe696ab8f1ddf24c8e8a96b2882fdbf350cc709ebe7189236686262d9cea SHA512 62b0e3043fad711acef01aefb5e56a216e890bb99eaa31b78e3b37c3d0495eeffbf19b1b332febfd5f791a7098225816f729f4159b945d2466e91ef78db668c4
 DIST gentoo-bubble-icons-20060811.tar.gz 2340198 BLAKE2B 1d54be19bcb3ce3edafbf07cacf23ac7d179f12789c31027035c9d983be40ae45d328e511ad1500d153103ec80f3ba06021e144dfe18ca18939fcf9cd539059a SHA512 5a208fb82240f13edeb87019977cc4788a2f9b84465b298133a717e589c483e91fcb40b9c8a9a459d6030fc984a8855059edf5f774233e8142ecfc39473d5850
-EBUILD gentoo-artwork-0.4.2-r1.ebuild 4472 BLAKE2B 60ed1720f2bd2b4ab088b011db2a14ed4d3db497bca6de9957d7063f99e4f6402b9c7d5146998c3559548289ab90a1e75ff87db60e1c28ed5d7e8c6d8ac15e11 SHA512 ccaf7d67e389b1816a70efd7370e68b8c6bc505863ab6215968e51a00a342127fb82e8e6d35f186e6e12580f6d36cbede2a4d420d539b83aa8c14b9ae67b7e37
+EBUILD gentoo-artwork-0.4.2-r1.ebuild 4544 BLAKE2B dc29b6d00e8db0e121138de7ca67bd6abec1bbb41f36b4762da72a2d5dff92896275354404064c09d4f1e95edee01952afb06593680dd6aec28d96a936f8d016 SHA512 73a428afccdab938166383dd9876361947af51e3c6be6e966f9f23d191af89aa8aa465fff0496dea393e27659d45b048c966f50920ab65e20388ddcd1ac8af33
 MISC metadata.xml 409 BLAKE2B 355ce0971b70a4e0bfc13718b073bfb6ce1e3e5ed7e71b85837d33dc952da5896bb5f33aebe50834dd1d96923298222703d52dd94efbf3e6e52175d06595c393 SHA512 58a204f9af94164a259bff6a127e1cc85ce0efd95e0f2d512ef67cc2ac49fabd0b27de81e584ed030c2734ad2807a41cc863c113d6dc56a76aa9c95a45d55839
diff --git a/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild b/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild
index dc4b33a158cc..274e05b862ba 100644
--- a/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild
+++ b/x11-themes/gentoo-artwork/gentoo-artwork-0.4.2-r1.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 BI_VER="20060811"
 
-DESCRIPTION="A collection of miscellaneous Gentoo Linux logos and artwork"
-SRC_URI="pixmaps? (
+DESCRIPTION="Collection of miscellaneous Gentoo Linux logos and artwork"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Artwork"
+SRC_URI="
+	pixmaps? (
 		mirror://gentoo/gentoo-artwork-0.2.tar.bz2
 		mirror://gentoo/gentoo-artwork-0.3.tar.bz2
 		mirror://gentoo/gentoo-artwork-0.4.tar.bz2
 		mirror://gentoo/gentoo-artwork-0.4.1.tar.bz2
-		mirror://gentoo/gentoo-artwork-0.4.2.tar.bz2
+		mirror://gentoo/gentoo-artwork-${PV}.tar.bz2
 		icons? ( mirror://gentoo/gentoo-bubble-icons-${BI_VER}.tar.gz )
 	)
 	!pixmaps? (
@@ -19,7 +21,7 @@ SRC_URI="pixmaps? (
 			mirror://gentoo/gentoo-artwork-0.2.tar.bz2
 			mirror://gentoo/gentoo-artwork-0.3.tar.bz2
 			mirror://gentoo/gentoo-artwork-0.4.tar.bz2
-			mirror://gentoo/gentoo-artwork-0.4.2.tar.bz2
+			mirror://gentoo/gentoo-artwork-${PV}.tar.bz2
 			mirror://gentoo/gentoo-bubble-icons-${BI_VER}.tar.gz
 		)
 		!icons? (
@@ -28,36 +30,32 @@ SRC_URI="pixmaps? (
 			lilo? ( mirror://gentoo/gentoo-artwork-0.4.tar.bz2 )
 		)
 	)"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Artwork"
 
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="kde offensive +icons +pixmaps +grub lilo"
+KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86"
+IUSE="+grub +icons kde lilo offensive +pixmaps"
 RESTRICT="binchecks strip"
 
-DEPEND=""
-RDEPEND="${DEPEND}"
-
 src_unpack() {
-	mkdir -p "${WORKDIR}"/${PN}-0.2
+	mkdir -p "${WORKDIR}"/${PN}-0.2 || die
 	if use pixmaps || use icons || use kde || use grub; then
 		unpack ${PN}-0.2.tar.bz2
 	fi
 	# rename unpacked dir so that updated files get overwritten
-	mv "${WORKDIR}"/${PN}-0.2 "${WORKDIR}"/${PN}-0.3
+	mv "${WORKDIR}"/${PN}-0.2 "${WORKDIR}"/${PN}-0.3 || die
 	if use pixmaps || use icons; then
 		unpack gentoo-artwork-0.3.tar.bz2
 	fi
-	mv "${WORKDIR}"/${PN}-0.3 "${WORKDIR}"/${PN}-0.4
+	mv "${WORKDIR}"/${PN}-0.3 "${WORKDIR}"/${PN}-0.4 || die
 	if use pixmaps || use icons || use lilo; then
 		unpack ${PN}-0.4.tar.bz2
 	fi
-	mv "${WORKDIR}"/${PN}-0.4 "${WORKDIR}"/${PN}-0.4.1
+	mv "${WORKDIR}"/${PN}-0.4 "${WORKDIR}"/${PN}-0.4.1 || die
 	if use pixmaps; then
 		unpack ${PN}-0.4.1.tar.bz2
 	fi
-	mv "${WORKDIR}"/${PN}-0.4.1 "${WORKDIR}"/${PN}-0.4.2
+	mv "${WORKDIR}"/${PN}-0.4.1 "${WORKDIR}"/${PN}-0.4.2 || die
 	if use pixmaps || use icons; then
 		unpack ${PN}-0.4.2.tar.bz2
 	fi
@@ -65,47 +63,47 @@ src_unpack() {
 	if use icons ; then
 		# Gentoo Bubble Icons
 		unpack gentoo-bubble-icons-${BI_VER}.tar.gz
-		cd "${WORKDIR}"/${PN}-0.4.2/icons/gentoo
+		cd "${WORKDIR}"/${PN}-0.4.2/icons/gentoo || die
 
-		cp "${FILESDIR}"/index.theme .
+		cp "${FILESDIR}"/index.theme . || die
 
-		mv l33t/l33t_BRO_lynx.png l33t/l33t_BRO_lynx2.png
-		mv "${WORKDIR}"/gentoo-bubble-icons/README bubble-icons-README
+		mv l33t/l33t_BRO_lynx.png l33t/l33t_BRO_lynx2.png || die
+		mv "${WORKDIR}"/gentoo-bubble-icons/README bubble-icons-README || die
 		find "${WORKDIR}"/gentoo-bubble-icons -name '*.png' \
-			-exec mv "{}" l33t/ \;
+			-exec mv "{}" l33t/ \; || die
 
 		# fix errors in filenames
-		mv l33t/l33t_nero.png l33t/l33t_UTI_nero.png
+		mv l33t/l33t_nero.png l33t/l33t_UTI_nero.png || die
 		# fix permissions (bug #213385)
 		fperms 644 l33t/l33t_MAI_mutt.png
 
 		# remove misspelled files
-		rm "${S}"/icons/gentoo/{32x32,48x48,64x64}/slypheed.png
+		rm "${S}"/icons/gentoo/{32x32,48x48,64x64}/slypheed.png || die
 	fi
 
 	if use pixmaps ; then
 		# bug #132271
-		rm "${S}"/pixmaps/1024x768/gentoo-blue-leaf-1024x768.jpg
-		rm "${S}"/pixmaps/1024x768/gentoo-blue-ute-1024x768.jpg
+		rm "${S}"/pixmaps/1024x768/gentoo-blue-leaf-1024x768.jpg || die
+		rm "${S}"/pixmaps/1024x768/gentoo-blue-ute-1024x768.jpg || die
 
 		# move images with wrong size to misc
 		mv "${S}"/pixmaps/800x600/OpenSource_in_the_sun-1280x960.png \
-			"${S}"/pixmaps/misc/OpenSource_in_the_sun-1280x960.png
+			"${S}"/pixmaps/misc/OpenSource_in_the_sun-1280x960.png || die
 		mv "${S}"/pixmaps/1024x768/Gentoo_2parts_1024x768.png \
-			"${S}"/pixmaps/misc/Gentoo_2parts_1024x786.png
+			"${S}"/pixmaps/misc/Gentoo_2parts_1024x786.png || die
 		mv "${S}"/pixmaps/1024x768/Gentoo_transparant_1024x768.png \
-			"${S}"/pixmaps/misc/Gentoo_transparant_960x768.png
+			"${S}"/pixmaps/misc/Gentoo_transparant_960x768.png || die
 		mv "${S}"/pixmaps/1280x1024/gentoo-freedom-1280x1024,jpg \
-			"${S}"/pixmaps/misc/gentoo-freedom-1280x1012.jpg
+			"${S}"/pixmaps/misc/gentoo-freedom-1280x1012.jpg || die
 		mv "${S}"/pixmaps/1280x1024/gentoowired.jpg \
-			"${S}"/pixmaps/misc/gentoowired-1280x960.jpg
+			"${S}"/pixmaps/misc/gentoowired-1280x960.jpg || die
 		mv "${S}"/pixmaps/1600x1200/gentoo-slip-1600x1200.jpg \
-			"${S}"/pixmaps/misc/gentoo-slip-1200x1024.jpg
+			"${S}"/pixmaps/misc/gentoo-slip-1200x1024.jpg || die
 	fi
 
 	if ! use offensive ; then
 		for i in $(<"${FILESDIR}"/offensive_list) ; do
-			rm -f "${S}/${i}"
+			rm "${S}/${i}" || die
 		done
 	fi
 }
@@ -114,9 +112,9 @@ src_install() {
 	if use pixmaps ; then
 		# pixmaps
 		dodir /usr/share/pixmaps/gentoo/
-		cd "${S}"/pixmaps
-		cp -pPR . "${D}"/usr/share/pixmaps/gentoo/
-		rm "${D}"/usr/share/pixmaps/gentoo/CREDITS
+		cd "${S}"/pixmaps || die
+		cp -pPR . "${D}"/usr/share/pixmaps/gentoo/ || die
+		rm "${D}"/usr/share/pixmaps/gentoo/CREDITS || die
 		dodoc "${S}"/pixmaps/CREDITS
 	fi
 
@@ -129,22 +127,20 @@ src_install() {
 	if use icons ; then
 		# Gentoo icons
 		dodir /usr/share/icons/gentoo
-		cp -pR "${S}"/icons/gentoo/* "${D}"/usr/share/icons/gentoo/
+		cp -pR "${S}"/icons/gentoo/* "${D}"/usr/share/icons/gentoo/ || die
 	fi
 
 	if use grub ; then
 		# grub splash images
-		dodir /usr/share/grub/splashimages
 		insinto /usr/share/grub/splashimages
 		doins "${S}"/grub/*.xpm.gz
 	fi
 
 	if use lilo ; then
 		# lilo splash images
-		dodir /usr/share/lilo/splashimages
 		insinto /usr/share/lilo/splashimages
 		doins "${S}"/lilo/*
-		rm "${D}"/usr/share/lilo/splashimages/lilo.txt
+		rm "${D}"/usr/share/lilo/splashimages/lilo.txt || die
 		dodoc "${S}"/lilo/lilo.txt
 	fi
 }
diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index 153c24812dab..7f33d502f6ab 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,7 +1,3 @@
-DIST greybird-3.20.1.tar.gz 193824 BLAKE2B d4e5cba92e9acf2fd084ee5b1bb5db332bb541193980ee7c74ba98da3b1bb675efd171078fac6051be21d2c2fd03b88f45bf7dff3101ec91578dc28bed212ec9 SHA512 9fe8662fa1c3c9b51aa1ba6d9cb9a54a8e7640386dc43cb695e87ed733a40893067bd86277a03d1c17c48596ba0897a0a41ed48db985727b0d65f2ce2de2227e
-DIST greybird-3.22.12.tar.gz 283646 BLAKE2B f276833bafd7ff0043025074e4476f7407a18428326a5e938254064ab42fe7a865366f12d5022e177a15a80f4d77889b2e143bc79430d552fa78f4ffbf953282 SHA512 95e1a743b16152f95c1dad01416ed54595ec1ffa5b50c6ae4599b5962aae0259d2a224d2fb71292a8f832adeba5e3a5534a0a7fbcdac136a3e322a15726d3401
 DIST greybird-3.22.14.tar.gz 283933 BLAKE2B 68f0b71dc71d260cf8f2a6971fac15ecedf345655309558c600848b531b3338ba3670c09c13182c24baa90f2fec24fdacc7498ee12bc1b1f00416bf12f68ac39 SHA512 766099b80eb81cfca07b52671e721ab281bb120ea252e369be2f83b6f38f1b7be5c0a2cc2d25b35f565063589e28982393f5c911b8c3ade608999339c93a490e
-EBUILD greybird-3.20.1-r2.ebuild 1341 BLAKE2B b339e7a573aaa418bc5ec4b6045b82ab7005ea0923a0548abc25a31133cc0969fda83b545ff654457a3d063cdf587e2462316fb58615d2572ba216bc26e74042 SHA512 0a1f817bf4a6b02b384b54e871c46a28612c87c7287f22a671fb026813f0528214bab6dad6bcb5f03d7aba9ceef68cbaca32aa73ee9f5a7c63541118b6b1ee5f
-EBUILD greybird-3.22.12.ebuild 1511 BLAKE2B c5f5770f64f85570807afd6bf0366338ee8e2f1fc38a504ebc07e915b8a6d3b2ce8562463bcbb950ae28d375f7ae83f96563e396fd09f5ceb2ec87ec45ae533c SHA512 f638d19d3739fc422ec3b43e033e492f5873cb381eb9bb0379ec38136dd92de3acff73907756aa1f14b69e416d990ee5a0ea6ac57e98aa6117d0bd4ed9880102
-EBUILD greybird-3.22.14.ebuild 776 BLAKE2B b322e1e082b63ca65ef975f3f36db6ab7a953960f93cc799d9be1a3eb0c871dc6ae5de1e7bf698c3152e7b9027836d703fec40de529086072e97866e462e86c8 SHA512 2f38f1239aea2268ef12e39648e4ef5d36fec3f7a5cd07f741dee664cb815c53b19f74d1d626ed64448db54c3363d9726bb23798aa7eb2b2e8e3b30ad792fc16
-MISC metadata.xml 803 BLAKE2B 086858da8495701f21ed96a7e27e3da510f065d2072f6c70549736c260fc11456256e3aceeac065b5b7c58627a4b0440087f2d0f93380a10c5c557e7e1a948a5 SHA512 f9c589e3dbaa3d68e1d185781a1b2725d81946abb86dfae127f65a8d7124e161f2ae39619cbebc935b7011396881bf0abeff39397b754833ee0d10f362965e73
+EBUILD greybird-3.22.14.ebuild 775 BLAKE2B ddd39cb7f4b09694478916973516ec033622011970834b34d239d13922b823c5664d45be309764aca4a0f3cc9eb0142260f95a57e6289a66afd804e5bf11d881 SHA512 214ba180ec0781f23e0f7c4d8453c8ada7588787a6d31bbf64e9f2a9ac4b7886b5e6df7c868b99efcf677f9ee6b8e3ae4e6195ea22399b86b30103bef4c0b6ef
+MISC metadata.xml 600 BLAKE2B 8292b4bbe1cefd66b352383d9465596eff9caef4d06f51206773045e9c42f1b2bf67bac7c5737a99a216fb3532c43b604dc6bff8bf33b2badbf00c6ba6b76867 SHA512 215586945ec72802c2ad61a73550e259a9d360fc8ffd881321c4cc053201c29425de118bc92205c5e2b8944fe4cb1880acb395e36f7c04721801f022bf323d1c
diff --git a/x11-themes/greybird/greybird-3.20.1-r2.ebuild b/x11-themes/greybird/greybird-3.20.1-r2.ebuild
deleted file mode 100644
index 2f0155ff830f..000000000000
--- a/x11-themes/greybird/greybird-3.20.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_PN=${PN/g/G}
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="appindicator gnome"
-
-RDEPEND="
-	>=x11-themes/gtk-engines-murrine-0.90
-	>=x11-libs/gtk+-3.20.0:3
-"
-DEPEND="${RDEPEND}
-	dev-ruby/sass
-	dev-libs/glib:2
-"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-#RESTRICT="binchecks strip"
-
-src_prepare() {
-	eapply_user
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	pushd "${ED}"usr/share/themes/${MY_PN} > /dev/null || die
-	use appindicator || rm -rf unity
-	use gnome || rm -rf metacity-1
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	if ! has_version x11-themes/elementary-xfce-icon-theme ; then
-		elog "For upstream's default icon theme, please emerge"
-		elog "x11-themes/elementary-xfce-icon-theme"
-	fi
-	if ! has_version x11-themes/vanilla-dmz-xcursors ; then
-		elog "For upstream's default cursor theme, please emerge"
-		elog "x11-themes/vanilla-dmz-xcursors"
-	fi
-}
diff --git a/x11-themes/greybird/greybird-3.22.12.ebuild b/x11-themes/greybird/greybird-3.22.12.ebuild
deleted file mode 100644
index fa58cb9e287c..000000000000
--- a/x11-themes/greybird/greybird-3.22.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-SRC_URI="https://github.com/shimmerproject/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="appindicator gnome gtk2 gtk3 xfce"
-REQUIRED_USE="
-	|| ( appindicator gnome gtk2 gtk3 xfce )
-"
-
-RDEPEND="
-	>=x11-libs/gtk+-3.22:3
-	>=x11-themes/gtk-engines-murrine-0.90
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/sassc
-	dev-libs/glib:2
-	dev-ruby/sass:3.5
-"
-S=${WORKDIR}/${P^}
-
-src_install() {
-	meson_src_install
-
-	pushd "${ED}"/usr/share/themes > /dev/null || die
-	use appindicator || { rm -r ${PN^}*/unity || die; }
-	use gnome || { rm -r ${PN^}*/metacity-1 || die; }
-	use gtk2 || { rm -r ${PN^}*/gtk-2.0 || die; }
-	use gtk3 || { rm -r ${PN^}*/gtk-3.0 || die; }
-	use xfce || { rm -r ${PN^}*/xfce* ${PN^}*/xfwm4* || die; }
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	if ! has_version x11-themes/elementary-xfce-icon-theme ; then
-		elog "For upstream's default icon theme, please emerge"
-		elog "x11-themes/elementary-xfce-icon-theme"
-	fi
-	if ! has_version x11-themes/vanilla-dmz-xcursors ; then
-		elog "For upstream's default cursor theme, please emerge"
-		elog "x11-themes/vanilla-dmz-xcursors"
-	fi
-}
diff --git a/x11-themes/greybird/greybird-3.22.14.ebuild b/x11-themes/greybird/greybird-3.22.14.ebuild
index c11576a9a471..9b41f8fae753 100644
--- a/x11-themes/greybird/greybird-3.22.14.ebuild
+++ b/x11-themes/greybird/greybird-3.22.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shimmerproject/${PN^}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 # Theme files, no test case available.
 RESTRICT="test"
diff --git a/x11-themes/greybird/metadata.xml b/x11-themes/greybird/metadata.xml
index cb5c75bb339f..9efc6922bc5a 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -5,11 +5,6 @@
     <email>desktop-misc@gentoo.org</email>
     <name>Gentoo Desktop Miscellaneous Project</name>
   </maintainer>
-  <use>
-    <flag name='gtk2'>Install theme for GTK+-2.0</flag>
-    <flag name='gtk3'>Install theme for GTK+-3.0</flag>
-    <flag name='xfce'>Install theme for <pkg>xfce-base/xfwm4</pkg></flag>
-  </use>
   <longdescription>
     Greybird Xfce Desktop Suite. Contains the default Xubuntu theme for 
     gnome-shell, gtk-2, gtk-3, metacity, pantheon, unity and Xfce. Comes with 
diff --git a/x11-themes/gtk-engines-unico/Manifest b/x11-themes/gtk-engines-unico/Manifest
index 0fd5e6c81c13..12599223b50e 100644
--- a/x11-themes/gtk-engines-unico/Manifest
+++ b/x11-themes/gtk-engines-unico/Manifest
@@ -1,4 +1,4 @@
 DIST unico_1.0.3+14.04.20140109.orig.tar.gz 19416 BLAKE2B f34ed477406acb36cb9533218d0fdcf57418fc25ff043ec90d2aaa05ee3ad8fe4e3c430d83001a0e399859adaaf720ca2b3d2e6d70543c460f367cbe03529c0f SHA512 8112240d63ffca2cbbaecc6731ef446153d8dd8b2b100c2d258013faa20b683761ba4768e71e91bdc885d1174874341e68400d1d3ebf95dc92db47cca7221de5
-EBUILD gtk-engines-unico-1.0.3_pre20140109-r1.ebuild 1115 BLAKE2B 2b369680b862bfcf0fbfd610095ef5ee6c1e627e96298c83d4dc1c0c67e9a3d31780d0bab95db4a111c78396bd724769d021cbb2914423f8fb7b6d188e09c7cf SHA512 4375087a092d82ee77980d31a0334847cdce563746ab567c94d1747fb25a51433d2b06b4ffc4fae18d6c3c616ddadf13262e76cf1720e3faf28e920f386d43f3
+EBUILD gtk-engines-unico-1.0.3_pre20140109-r1.ebuild 1114 BLAKE2B 1f804554ce3d3cb08365dc8d13112629883e2dab57d5959e8b5f4e9774b67b007578d18a4af6e7078873ae53e0405b4819715a2c284c93b34aefa2edded5c729 SHA512 40c1477ef6ec2758d2266033cd1bfc8e4f46330242402786a351811e93e9f36de9bf96098c23133a9b077cd3e690811cfbcc7576f34492703480bc6c19b94d54
 EBUILD gtk-engines-unico-1.0.3_pre20140109.ebuild 991 BLAKE2B f7ae6886ccb1420fab51c43b03029c8a6e71d2c344a4ab1ed083777c71ec8c178320444107b1503258e3f6e8537e890a866001b47209d478d4e44e3854e6bdb5 SHA512 34e814cf5af7527097d5571c32982b169193f6a58583afec69ba8e700fb4d445ac6945025beb8a996d16ffbdc1342364a5c4a3887eb9904760a369e44ccee0ba
 MISC metadata.xml 327 BLAKE2B a1f9e9275d1cc8493acf4651d23e41ae74410d65be0535398fecb4a881ceb8c5a81487a7e09c4fe0ee04f80d159ef3fe1403a8f4b3318b53279880cb319a17d0 SHA512 50637d6e2095fd5da68a15cbbb984c66fdf50301f32d036dfa38600f517f8d602093506b1e294fca5e041c219e8e41803cf011dabc71c8dbc17db804b91c6370
diff --git a/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild b/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild
index f2451ccc2fa1..353b1de94125 100644
--- a/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild
+++ b/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_P}.orig.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-themes/light-themes/Manifest b/x11-themes/light-themes/Manifest
index d6aaa9574eb5..8ed268ef5806 100644
--- a/x11-themes/light-themes/Manifest
+++ b/x11-themes/light-themes/Manifest
@@ -5,5 +5,5 @@ DIST ubuntu-themes_20.10.orig.tar.gz 15679746 BLAKE2B bcb1bae746379fe26700b7e88d
 EBUILD light-themes-17.04_p20170406-r2.ebuild 2110 BLAKE2B 33431e6c09562aaf49c2f73abcbbe76aee1351d763b18e15d0beb433adf83d14d5797f25ab07409ce8f6b977fe8c72a82bbfe9402b0c2208af6a551aa2779d81 SHA512 662a50c42b4d239a0ff8cd302c2c5de75fd375a7655e912c6d0323e869ca8c26800e8b561bcfa4c0764241576a49275a7418553c658f8b3bc6ebbcc2633d2c6f
 EBUILD light-themes-17.04_p20170406.ebuild 2109 BLAKE2B 7047f793c2783c770b57ee7bf28846dda32ddf4d028aa6f128cc5a9578130f69bfa261e5eb18d927a1081e8a51ab3c96a7b484d1834ab2f902e887d7535ff17b SHA512 5f6421524dfe03c61803626f8cad5685c478f1b73c9ab04f505ad96db2f31d8e1d9f98ff4d3c66c73bf58b4b937aa920f9540273dae8512fe7b519fbf1635cd4
 EBUILD light-themes-19.04-r2.ebuild 1987 BLAKE2B 131c10bf2c7b113edd1392bf45d12443058da8c12242a1b8df215c244c65e4b6191d4fbf639460605210e9334c49bdf94bfa69fdd94e3651198d36804b03d0d3 SHA512 60b424897d1df24fd090ff6590542d4c8e5af73a89dd998430d4aeced8e52b3993fa00e361cea8fefaeef5b1a615c2e536a3ba4475b571570a30a45413cf12ff
-EBUILD light-themes-20.10-r2.ebuild 1987 BLAKE2B 131c10bf2c7b113edd1392bf45d12443058da8c12242a1b8df215c244c65e4b6191d4fbf639460605210e9334c49bdf94bfa69fdd94e3651198d36804b03d0d3 SHA512 60b424897d1df24fd090ff6590542d4c8e5af73a89dd998430d4aeced8e52b3993fa00e361cea8fefaeef5b1a615c2e536a3ba4475b571570a30a45413cf12ff
+EBUILD light-themes-20.10-r2.ebuild 1986 BLAKE2B 9d51ab0ec51537ceabfade817d0ea817f9d0bfa677da270a601a3c762fa7fff2642e4e661dcda9994a9655898ae51dc85ba07c0f4299aad50b48cc7864429303 SHA512 cf19a0f174ad7efb5ccc1c21ed878718ef077705a04a35eb3650d60bc8fee451da9d8b9bb9fc9d9e7dc10d2c6e69cc59ba79d73bcbdb727d4aa59692bafaec38
 MISC metadata.xml 506 BLAKE2B 41dfe203ca428341cbd04463a7fd30725e8e24889be4561b21c4b765cc589b3a8659b318030aa11e2026ca8625eb450cc0f7f4e491216570a14b0aeab638f2e4 SHA512 dc5aadda298ca7f295a47b3c354f0a12b3560c76e920e4ce41a902ccc483e6e328eaf252da3ae2a2afb27f5269349a33c1ae075dfe81de3f6e7256e347de83fd
diff --git a/x11-themes/light-themes/light-themes-20.10-r2.ebuild b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
index 115ed1fee18b..78e6584d3690 100644
--- a/x11-themes/light-themes/light-themes-20.10-r2.ebuild
+++ b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"