gentoo resync : 29.01.2021

23 files changed, 272 insertions, 356 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 85de34a3c124..f5d8f7e90042 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 c379c73bae24..351b379c00f1 100644
--- a/x11-themes/e-flat-theme/Manifest
+++ b/x11-themes/e-flat-theme/Manifest
@@ -1,5 +1,3 @@
-DIST e-flat-theme-0_pre20201018.edj 45600078 BLAKE2B 28f1949aa1bb316726d81fbc3fc056b29d101528be55bf26ea7e4dd8e1f96410b6d5d2c6c7d4e7742d124709a9c968cf86507dd0392aa4a1ed8142a6c0dd0c69 SHA512 def07d7d92c8dd05d0cefe6205c3af2b67ab81ba9472b070dc5acd3cce60e9f6aa1e374086efcad787aedfc4d755818f7d170e1139c104804e0154921d03ca8b
 DIST e-flat-theme-0_pre20210121.edj 45282525 BLAKE2B baf27345585d45ca57c2826271dcd377628ef6e733ee98a06020fb4c303034bbe7866cb8704cc33361019cfb00f186839972835e9119390caf833a7a51a0cb7a SHA512 dbced249ff0fc4fd775e8c6bba524a1636f02854f7ccd42d1c038f426edea2e12c1ec677e7e1666c7a1ff74d11cbcd96c8959997dae8f8f36eb77dbcdef84822
-EBUILD e-flat-theme-0_pre20201018.ebuild 1030 BLAKE2B 2ca159a5e899f025df21fbf47ddc0baaf95405b3499f626e19d2207b12af6ee3d2583c54662ffd1e1d51f655e05c1adcc9193c5ce16e8cf0c5d5a2b9ccaaa6e4 SHA512 f1da95b5eafbc2933cbdf47c5705f353693a37019d2479cb51739983016aa699e79918ca5ef887415cac7aab5587ff67fd1e08eea68a5ac5928177d207c53ae5
 EBUILD e-flat-theme-0_pre20210121.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_pre20201018.ebuild b/x11-themes/e-flat-theme/e-flat-theme-0_pre20201018.ebuild
deleted file mode 100644
index 1ce5c3e1babc..000000000000
--- a/x11-themes/e-flat-theme/e-flat-theme-0_pre20201018.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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/greybird/Manifest b/x11-themes/greybird/Manifest
index 1c1832e0c002..bce3f1b44144 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,12 +1,7 @@
 DIST greybird-3.20.1.tar.gz 193824 BLAKE2B d4e5cba92e9acf2fd084ee5b1bb5db332bb541193980ee7c74ba98da3b1bb675efd171078fac6051be21d2c2fd03b88f45bf7dff3101ec91578dc28bed212ec9 SHA512 9fe8662fa1c3c9b51aa1ba6d9cb9a54a8e7640386dc43cb695e87ed733a40893067bd86277a03d1c17c48596ba0897a0a41ed48db985727b0d65f2ce2de2227e
-DIST greybird-3.22.10.tar.gz 212225 BLAKE2B d38d05d3a2523e58ed8fc8474bd8607a45b4f63d33f6053f5b9cc749504be3c3930d6f156a26abae9dfcd9214e68f92343bbcd0ecef7e53640a597b28562875e SHA512 c950de36c9733f98b454fde1ff5f8005169fab3b2782ab9f13a95a1aba938766f38666ad1229ab429fa163cf0e97cf5ecc8a84f3eb63cc378c35d79ea54b513c
-DIST greybird-3.22.11.tar.gz 330760 BLAKE2B f95bca90057f09e78bb5024491ba21f883d6f3e844056bbf55d2dab572373d52590048080c7ae4a1d61608362878c7940f51bd3d0a246abd9e185183361517bf SHA512 18f7735cd0f746ebbbb4c9fc112f28ecd73e17e8065a1f99027ceb0201639a531663e387b70f408d21c437b6a4504fed1e73b308fc90fc6dd00646e62a6dc68e
 DIST greybird-3.22.12.tar.gz 283646 BLAKE2B f276833bafd7ff0043025074e4476f7407a18428326a5e938254064ab42fe7a865366f12d5022e177a15a80f4d77889b2e143bc79430d552fa78f4ffbf953282 SHA512 95e1a743b16152f95c1dad01416ed54595ec1ffa5b50c6ae4599b5962aae0259d2a224d2fb71292a8f832adeba5e3a5534a0a7fbcdac136a3e322a15726d3401
-DIST greybird-3.22.9.tar.gz 211750 BLAKE2B bfce416c55cc03d1f98c4d14916bcecb6cdc857ed3f813d90cae2a9e92f607d4ae3798d0eb39b0e548f7b4c7964b60d4970c442b91eb78db02772b9a2c02f3a2 SHA512 d09638c78d74e26a428edfbbe00719208fac5e574db11eac2e538d25fa9f3270c9c7b636f770061807a59b200c8afa4252a9513cffe1f4af3d186425b6a14744
+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.10.ebuild 1348 BLAKE2B 7d2f1e5ebdb90032661de5e39b53ec37c26e4ee52a30d4a1c8f71daa6d988d7ad3fd37099a1ab79c5cbb317e44b7017dab06990da65bb45abca5032d3a75ec42 SHA512 d36b3878b7bbac29d34c654ad482a91a642d1ebde0221fdaf8c3ae15aec3124d21cd124a6281bb84132c1c2f71da5cea86ae18c4304090dd73f1767e8ce8dc23
-EBUILD greybird-3.22.11.ebuild 1511 BLAKE2B c5f5770f64f85570807afd6bf0366338ee8e2f1fc38a504ebc07e915b8a6d3b2ce8562463bcbb950ae28d375f7ae83f96563e396fd09f5ceb2ec87ec45ae533c SHA512 f638d19d3739fc422ec3b43e033e492f5873cb381eb9bb0379ec38136dd92de3acff73907756aa1f14b69e416d990ee5a0ea6ac57e98aa6117d0bd4ed9880102
 EBUILD greybird-3.22.12.ebuild 1511 BLAKE2B c5f5770f64f85570807afd6bf0366338ee8e2f1fc38a504ebc07e915b8a6d3b2ce8562463bcbb950ae28d375f7ae83f96563e396fd09f5ceb2ec87ec45ae533c SHA512 f638d19d3739fc422ec3b43e033e492f5873cb381eb9bb0379ec38136dd92de3acff73907756aa1f14b69e416d990ee5a0ea6ac57e98aa6117d0bd4ed9880102
-EBUILD greybird-3.22.9.ebuild 1348 BLAKE2B 7d2f1e5ebdb90032661de5e39b53ec37c26e4ee52a30d4a1c8f71daa6d988d7ad3fd37099a1ab79c5cbb317e44b7017dab06990da65bb45abca5032d3a75ec42 SHA512 d36b3878b7bbac29d34c654ad482a91a642d1ebde0221fdaf8c3ae15aec3124d21cd124a6281bb84132c1c2f71da5cea86ae18c4304090dd73f1767e8ce8dc23
-EBUILD greybird-9999.ebuild 1438 BLAKE2B 205793f20324d32bcd2705c593991834542797782efe46dc745a43552ed1c7cdcb44817ef18153c3a58f672993bfea8ff6f8eb9875e0b29c5cb76f67e7142fb6 SHA512 ac2e8e1f3b15613022d22c8d81698af11949c00d39966e6306691a0c23a1214321e5a1def3334abada45044ec8ec7e6344c262cf363f965ac4e5f27659cd1a9a
-MISC metadata.xml 541 BLAKE2B 798da001d7f1035e3cf88fb0e9629368c85055bb349b1d7ae101e1daf1a435f7047aab1d6561a6c744dbd6d6771e42993724ae59b4f28af64b779164d8613d54 SHA512 0294f4f77e1f1e683d5f7596d410c3ce7f63fbf7cbcdaa5a195aaa6e762a54439ae782119e814bad0cfdae56fb4ec0b3aba21ef6c43dc59435d4e3de4ec88115
+EBUILD greybird-3.22.14.ebuild 777 BLAKE2B bf0ec38e3af136e8578a99b1a2f36326a8c77680f26e0cc3fd4689131a157cc3c31883a2e61b6eecee7a906f351692f1eecdbc62618ddc733ef3dbf5893d9eba SHA512 31cf00185e87c490431afb19c885e2040c9af999ae3532532a65bf365bbbc8053429dc0f8889734b4926f786f33f19fb0967e0321aeaad7efa58a51139bfd8b5
+MISC metadata.xml 803 BLAKE2B 086858da8495701f21ed96a7e27e3da510f065d2072f6c70549736c260fc11456256e3aceeac065b5b7c58627a4b0440087f2d0f93380a10c5c557e7e1a948a5 SHA512 f9c589e3dbaa3d68e1d185781a1b2725d81946abb86dfae127f65a8d7124e161f2ae39619cbebc935b7011396881bf0abeff39397b754833ee0d10f362965e73
diff --git a/x11-themes/greybird/greybird-3.22.10.ebuild b/x11-themes/greybird/greybird-3.22.10.ebuild
deleted file mode 100644
index 93f614fd5e18..000000000000
--- a/x11-themes/greybird/greybird-3.22.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 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}/${MY_PN}-${PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	pushd "${ED}"/usr/share/themes/${MY_PN} > /dev/null || die
-	use appindicator || rm -rf unity
-	use gnome || rm -rf metacity-1
-	use xfce || rm -rf xfce* xfwm4*
-	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.11.ebuild b/x11-themes/greybird/greybird-3.22.11.ebuild
deleted file mode 100644
index fa58cb9e287c..000000000000
--- a/x11-themes/greybird/greybird-3.22.11.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
new file mode 100644
index 000000000000..04169b5ab38c
--- /dev/null
+++ b/x11-themes/greybird/greybird-3.22.14.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson optfeature
+
+DESCRIPTION="Greybird Desktop Suite"
+HOMEPAGE="https://github.com/shimmerproject/Greybird"
+SRC_URI="https://github.com/shimmerproject/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+# Theme files, no test case available.
+RESTRICT="test"
+
+RDEPEND="x11-libs/gtk+:3
+	x11-themes/gtk-engines-murrine"
+DEPEND="${RDEPEND}
+	dev-lang/sassc
+	dev-libs/glib:2"
+
+S="${WORKDIR}/${P^}"
+
+pkg_postinst() {
+	elog "Optional uninstalled features:"
+	optfeature "matching icon theme" x11-themes/elementary-xfce-icon-theme
+	optfeature "matching cursor theme" x11-themes/vanilla-dmz-xcursors
+}
diff --git a/x11-themes/greybird/greybird-3.22.9.ebuild b/x11-themes/greybird/greybird-3.22.9.ebuild
deleted file mode 100644
index 93f614fd5e18..000000000000
--- a/x11-themes/greybird/greybird-3.22.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 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}/${MY_PN}-${PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	pushd "${ED}"/usr/share/themes/${MY_PN} > /dev/null || die
-	use appindicator || rm -rf unity
-	use gnome || rm -rf metacity-1
-	use xfce || rm -rf xfce* xfwm4*
-	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-9999.ebuild b/x11-themes/greybird/greybird-9999.ebuild
deleted file mode 100644
index c97399187421..000000000000
--- a/x11-themes/greybird/greybird-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit git-r3 meson
-
-DESCRIPTION="The default theme from Xubuntu"
-HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-EGIT_REPO_URI="https://github.com/shimmerproject/${PN^}"
-
-# 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=""
-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
-"
-
-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/metadata.xml b/x11-themes/greybird/metadata.xml
index 2a50bd79b0d5..cb5c75bb339f 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<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>
+  <maintainer type="project">
+    <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 
+    light and dark variants (>=3.22.14).
+  </longdescription>
 <upstream>
 <remote-id type="github">shimmerproject/Greybird</remote-id>
 </upstream>
diff --git a/x11-themes/gtk-engines-unico/Manifest b/x11-themes/gtk-engines-unico/Manifest
index ea6e097acb38..0fd5e6c81c13 100644
--- a/x11-themes/gtk-engines-unico/Manifest
+++ b/x11-themes/gtk-engines-unico/Manifest
@@ -1,3 +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.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
new file mode 100644
index 000000000000..f2451ccc2fa1
--- /dev/null
+++ b/x11-themes/gtk-engines-unico/gtk-engines-unico-1.0.3_pre20140109-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN/gtk-engines-}
+MY_PV=${PV/_pre/+14.04.}
+MY_P=${MY_PN}_${MY_PV}
+inherit autotools multilib-minimal
+
+DESCRIPTION="The Unico GTK+ 3.x theming engine"
+HOMEPAGE="https://launchpad.net/unico"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_P}.orig.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.10[glib,${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.5.2:3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# $(use_enable debug) controls CPPFLAGS -D_DEBUG and -DNDEBUG but they are currently
+	# unused in the code itself.
+	local myeconfargs=(
+		--disable-static
+		--disable-debug
+		--disable-maintainer-flags
+	)
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index 0f332d244f5f..1af990813810 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -1,10 +1,11 @@
 AUX gtk-engines-2.20.2-auto-mnemonics.patch 615 BLAKE2B 80f41a0b2b9d7cd863cb264f6535ed81f69600bd93f69ef1818d624935cae0f6011d29e29dd0ac8e7399969503613b7e1c11e229c996198054d8deca8e59638b SHA512 10951784f8e2c03e83cf63ff15ba596281d2fc870466e9018036b3c876b1abe3eb3774bcb98bd47fbd4d7037223bde7cbb4db11ab1186aae6b76a27d1b1e878b
+AUX gtk-engines-2.20.2-automake-1.14.patch 2105 BLAKE2B 281714d925f0f0d4f65069cc2e11b574bb21937ba8601a14b6c5251e972de38a372dd33a37047ed2db4f16f7891af10ffc183b5b5ed9a551c57217c79346a87c SHA512 744b0c2011b001a8b3d37079e2bcf03f61cd05be6ff036660fb3420352d79eaf1f371f9294ce1d5b459a6ae2608387c78e8d843548dcb6b01c6eee2bd48905bf
 AUX gtk-engines-2.20.2-change-bullet.patch 372 BLAKE2B e8618b970c139924a1b223fe0a93b0f6628eb4300be3e724ff6eba328e5cb7ad86eaf151b3355b51264c6c2ed2f51491f9a26e2d09bef18103b190033482ce30 SHA512 b9848c95d40fd18e0a9877d1f4d314330b806fce101f6032761d61afc1303ff9b6ffaeb9502ce8c5d867553b4fdad17981b811a175dcc84feb10509c6edf88a5
 AUX gtk-engines-2.20.2-glib.h.patch 729 BLAKE2B c5aee267866e93fa3c806ac02df9822fbe8871e1c9ac0160a90ad3f42ba85a43e2ebef149c0e6c25b133edf3fb0bd4f3f41e2aad821f12713ad30b06e2d6bf63 SHA512 4e9f6bdf42b5c4a8695f2d529ed57d345539eec1af8672181dc8c050b507f492d92fb0b902246b8ecaa8cd8e2c14042207ef36fa25d86e4792a8e51a7579a4af
 AUX gtk-engines-2.20.2-java-look.patch 602 BLAKE2B bd9625acae0c7ce7f81089c716b2d1d662ef97ace9124e15b50d6bee9553de41a6bd7790e4e648e4ce1464da9a308ea2a70852bf030420718d8497c248a39ecc SHA512 b2ff1ecd1981d704e86802a878286ddc153317796d805578da7f7a8c411257c964a18aafa93e47e75f8753b207e40495c30c13f2d56c092e9f0bfd9bb07fca2e
+AUX gtk-engines-2.20.2-slibtool.patch 2028 BLAKE2B a92115b28523fc359eb8c4b1aa5086ebc0273d31504a116752e192852602d95db4a49583dd1010c5cfd2ba0295e05aaa3ddc93a6858e413ac4b5e365213b2b22 SHA512 a2c36f5e83a8072d52b05e298386fbe5f68f9e134f83776dc7c666b9923502eeb5280b69aba64b7d9b2e1c579666d991d62c6c597d5252a48b2cb949fb2f8311
 AUX gtk-engines-2.20.2-tooltips.patch 1116 BLAKE2B ad050dbff4bba6c7172a449eec7b001d3f9cffc0c79043356ad1fda851d94aac8c1322caa1aedde9cb8931e6f73ac8e1f411e17c9e363a420f7612c8a6ad3ecf SHA512 0e89d704f883f0dce086f83b4dc27decc3e022f1ad7ec46e9a0ca9d5ab2e3a997826c8ca3d1340e3e51ed3e4433c7e30eac833b02f76409f66a08b178cdd3b30
 AUX gtk-engines-2.20.2-window-dragging.patch 466 BLAKE2B 851f633db234986b9855dffae2cdda3b812f48e9e221f14b601c1f65764fac0d88f5dd70cc96a50949725da52e64fb60ba59ab491856279b468dc255201cdebb SHA512 4f3f20c007a1b3fc001485fdd0c84450f8bbf3c2e95decd058b552adfeecc75a84ae2be7da3984c058df940bcb87ce6cd149d24a5e86486befd085d339c65a77
 DIST gtk-engines-2.20.2.tar.bz2 688171 BLAKE2B 1eb80f1bfa7f58cdcde6d461bcd6a41d7fe8b7ca20e11f1f59b350b3b5ce8c196c5f35330ec027d0ff1d9de19f28d412e0e3c6460487ac7ea61284fc1858a90c SHA512 049ae20d47a28b60fe5b0484e3c11bc6cd62d6167478f1d83df3066d618827ca9204767ab1b7a9ca02f542c3fc7929efc1bb85f65d66aaf5d5b15718b6de19e9
-EBUILD gtk-engines-2.20.2-r100.ebuild 1738 BLAKE2B ee12827839b3a155ef9275d690cfde8efc601a4d8e6cc1e6fe9e7a2582769535ec024236342d38f356d97245b9605b6335a7db34a0644832d2bc5eb037c5d4ad SHA512 1ef2608e8e99f6b663850ee9e3ec31be53f5b8ff4920252440514af26056b68d03b30a7d16d46c63a112d5e717a7db0a605f7112bf717aa436e4ee9639e8ea22
-EBUILD gtk-engines-2.20.2-r2.ebuild 1372 BLAKE2B a601d0e384fc36159b4afc87b20e37415ac41e767acba88b0b040b17f0ddf3dea4abea048c23fba1ecda844091131b54d073d7fe6ad33a4933128c64dfa82844 SHA512 4bf4966c4aa68977ddba75613ab72451fe1b8fcb8f457ea00c86ecf9b5d6dd01dd7cf8b341929a789093b1e3165211e3cbc30c68f264e413319865523f59f225
+EBUILD gtk-engines-2.20.2-r100.ebuild 1746 BLAKE2B 9d103df0cc4c1eabef300ac89433557cea18e2fa17b7a22cad4b757df1a2ee868506e94d717ccb6a3eaedcd8ad7213cff61752799b66b6ba92921ec11721049b SHA512 4cb1f29c29ecb3ffc20781803ef5ee8540e46c8bd94570f8283539707ca8af5014f8a1d26e4a4a40920454eccec3e5a3c58c9ec8ee96fec4512edfc2beed135a
 MISC metadata.xml 667 BLAKE2B 4f110a2598845c8930ca8567655e34e87c9517cd68b41957d1450367b7e0ed783848bd7ce1213b407229fd7eea3b4a36760ddc7b921424821ae55fcb664e2788 SHA512 62bb1508fe80e89238a57dffb44b7e8951f5d5b8c50ddd412fdf84778e77a2e13c16bb6ff1045802fbd71a1dea038695b76febd024cb50b96258bfd67b32ad47
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-automake-1.14.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-automake-1.14.patch
new file mode 100644
index 000000000000..f23f929bbfbe
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-automake-1.14.patch
@@ -0,0 +1,49 @@
+Description: Work around FTBFS due to automake 1.14 bug
+ Automake generates invalid Makefiles when patsubst is used in
+ Makefile.am. To work around this problem configure injects the
+ patsubsts to the Makefile now.
+ .
+Author: Balint Reczey <balint@balintreczey.hu>
+Bug-Debian: http://bugs.debian.org/713353
+--- gtk2-engines-2.20.2.orig/configure.ac
++++ gtk2-engines-2.20.2/configure.ac
+@@ -142,6 +142,8 @@ fi
+ AC_SUBST(BUILD_ENGINES)
+ AC_SUBST(BUILD_THEMES)
+ AC_SUBST(BUILD_SCHEMAS)
++AC_SUBST([auto_find_tests], ['$(patsubst %,exported_%,$(BUILD_ENGINES)) torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))'])
++
+ 
+ if test $animation = "yes"; then
+ 	AC_DEFINE_UNQUOTED(HAVE_ANIMATION, 1, [Defines whether to compile with animation support])
+--- gtk2-engines-2.20.2.orig/test/Makefile.am
++++ gtk2-engines-2.20.2/test/Makefile.am
+@@ -64,9 +64,10 @@ VALGRIND_ENV=G_SLICE=always-malloc G_DEB
+ # Exported Symbols Test - Tests all engines unconditionally
+ #############################################################
+ # Prefix with exported_
+-EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
++# disabled to work around automake bug #14561
++# EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES))
+ 
+-TESTS += $(EXPORTED_SYMBOLS_TESTS)
++#TESTS += $(EXPORTED_SYMBOLS_TESTS)
+ 
+ 
+ #############################################################
+@@ -85,10 +86,13 @@ SUPPORTED_TORTURE_TEST_ENGINES = \
+ # Filter engines that are not build from the set of engines
+ TORTURE_TEST_ENGINES = $(filter $(SUPPORTED_TORTURE_TEST_ENGINES),$(BUILD_ENGINES))
+ # Prefix with torture_
+-TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
++# disabled to work around automake bug #14561
++# TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES))
+ 
+ # Add TORTURE_TEST_ENGINES to list of tests
+-TESTS += $(TORTURE_TEST_TESTS)
++# disabled to work around automake bug #14561
++#TESTS += $(TORTURE_TEST_TESTS)
++TESTS += @auto_find_tests@
+ 
+ # Possible other tests:
+ #  - An extensive theme switch tests that loads/unloads the engine
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.20.2-slibtool.patch b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-slibtool.patch
new file mode 100644
index 000000000000..69c409c9e7e3
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.20.2-slibtool.patch
@@ -0,0 +1,47 @@
+This fixes build with sys-devel/slibtool
+
+--- gtk-engines-2.20.2/configure.ac
++++ gtk-engines-2.20.2/configure.ac
+@@ -27,6 +27,9 @@
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+ AM_GLIB_GNU_GETTEXT
+ 
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
++
+ AC_ARG_ENABLE(all, 		[  --disable-all           skip all engines/themes by default], [defaultval=$enableval], 	[defaultval="yes"])
+ AC_ARG_ENABLE(clearlooks, 	[  --disable-clearlooks    skip ClearLooks engine/theme], 	[clearlooks=$enableval], 	[clearlooks="$defaultval"])
+ AC_ARG_ENABLE(crux, 		[  --disable-crux          skip Crux engine/theme], 		[crux=$enableval], 		[crux="$defaultval"])
+--- gtk-engines-2.20.2/engines/hc/Makefile.am
++++ gtk-engines-2.20.2/engines/hc/Makefile.am
+@@ -38,7 +38,7 @@
+ 	./src/hc-style.c
+ 
+ libhcengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
+-libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
++libhcengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LIBM)
+ 
+ -include $(top_srcdir)/git.mk
+ 
+--- gtk-engines-2.20.2/engines/mist/Makefile.am
++++ gtk-engines-2.20.2/engines/mist/Makefile.am
+@@ -16,7 +16,7 @@
+ 	./src/mist.c
+ 
+ libmist_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
+-libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
++libmist_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LIBM)
+ 
+ -include $(top_srcdir)/git.mk
+ 
+--- gtk-engines-2.20.2/engines/thinice/Makefile.am
++++ gtk-engines-2.20.2/engines/thinice/Makefile.am
+@@ -18,7 +18,7 @@
+ 	./src/thinice_main.c
+ 
+ libthinice_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
+-libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
++libthinice_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LIBM)
+ 
+ -include $(top_srcdir)/git.mk
+ 
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
index ea8b1c8467e4..c5622f9a10ac 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r100.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+GNOME2_EAUTORECONF="yes"
 GNOME2_LA_PUNT="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 LUA_COMPAT=( lua5-{1..4} )
@@ -14,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="accessibility lua"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -38,15 +39,16 @@ PATCHES=(
 	"${FILESDIR}"/${P}-change-bullet.patch
 	"${FILESDIR}"/${P}-tooltips.patch
 	"${FILESDIR}"/${P}-window-dragging.patch
+	"${FILESDIR}"/${P}-slibtool.patch #766680
+	"${FILESDIR}"/${P}-automake-1.14.patch # taken from Debian
 )
 
 src_prepare() {
-	gnome2_src_prepare
 	# pkgconfig wrapper set up by lua-single.eclass is not multilib-compatible
 	# at present so point Autoconf directly to the correct implementation.
-	# We patch configure rather than configure.ac because running 'eautoreconf'
-	# results for some reason in corrupted test Makefiles.
-	sed -i -e "s|\"lua\"|\"${ELUA}\"|g" configure || die
+	sed -i -e "/PKG_CHECK_MODULES(LUA,/s|lua|${ELUA}|" configure.ac || die
+
+	gnome2_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
deleted file mode 100644
index 2a380d0be67b..000000000000
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="GTK+2 standard engines and themes"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="accessibility lua"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-	lua? ( dev-lang/lua:0[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.31
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Patch from 2.21.x, fixes building with glib-2.32, bug #410455
-	epatch "${FILESDIR}/${P}-glib.h.patch"
-
-	# Fix java apps look, bug #523074
-	epatch "${FILESDIR}/${P}-java-look.patch"
-
-	# Apply Fedora fixes/improvements
-	epatch "${FILESDIR}"/${P}-auto-mnemonics.patch
-	epatch "${FILESDIR}"/${P}-change-bullet.patch
-	epatch "${FILESDIR}"/${P}-tooltips.patch
-	epatch "${FILESDIR}"/${P}-window-dragging.patch
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--enable-animation \
-		$(use_enable lua) \
-		$(use_with lua system-lua) \
-		$(use_enable accessibility hc)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-}
diff --git a/x11-themes/light-themes/Manifest b/x11-themes/light-themes/Manifest
index c719e392a133..d6aaa9574eb5 100644
--- a/x11-themes/light-themes/Manifest
+++ b/x11-themes/light-themes/Manifest
@@ -1,7 +1,9 @@
 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
+DIST ubuntu-themes_20.10.orig.tar.gz 15679746 BLAKE2B bcb1bae746379fe26700b7e88db4e91b0220e7145f55c59b951a31d768c2311d843c5d92c989b049e1009afbfc6e918e65726408298858e8fd689d0bbab1ca42 SHA512 0118f7c2404856216ff2df0246ea2fa98d0d5b25973abc3df13a998f7a41f2eeb32ca08281ba41399a91fa16ab046e3b3292f504503958983a6488c1e3001ac4
+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.ebuild 2099 BLAKE2B e047dde212ad6d32f90dab792eab2faa009d8f9809905f42aa13b350edb103c4c31cb74f3a25f1b7eaa4f795f1ba3057dc6a8f9289f0fa7ad65f7dc43df3753a SHA512 7d89e2e7559a535713906a1e2ad3432df8185489a2eb310e493b7586ca4218a826eb1c87a6baaa86a82ed2d693a62ddc8aaf2bb0978a6548fc366b65870d9ecb
+EBUILD light-themes-19.04-r2.ebuild 1987 BLAKE2B 131c10bf2c7b113edd1392bf45d12443058da8c12242a1b8df215c244c65e4b6191d4fbf639460605210e9334c49bdf94bfa69fdd94e3651198d36804b03d0d3 SHA512 60b424897d1df24fd090ff6590542d4c8e5af73a89dd998430d4aeced8e52b3993fa00e361cea8fefaeef5b1a615c2e536a3ba4475b571570a30a45413cf12ff
+EBUILD light-themes-20.10-r2.ebuild 1987 BLAKE2B 131c10bf2c7b113edd1392bf45d12443058da8c12242a1b8df215c244c65e4b6191d4fbf639460605210e9334c49bdf94bfa69fdd94e3651198d36804b03d0d3 SHA512 60b424897d1df24fd090ff6590542d4c8e5af73a89dd998430d4aeced8e52b3993fa00e361cea8fefaeef5b1a615c2e536a3ba4475b571570a30a45413cf12ff
 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-r2.ebuild
index 4a33d8bcdb60..3db72c12aeaf 100644
--- a/x11-themes/light-themes/light-themes-17.04_p20170406-r1.ebuild
+++ b/x11-themes/light-themes/light-themes-17.04_p20170406-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,6 +59,6 @@ src_install() {
 	doins -r Radiance* Ambiance*
 
 	use gtk3 || {
-		rm -R "${D}"/usr/share/themes/*/gtk-3.0 || die
+		rm -R "${D}"/usr/share/themes/*/gtk-3.* || die
 	}
 }
diff --git a/x11-themes/light-themes/light-themes-19.04.ebuild b/x11-themes/light-themes/light-themes-19.04-r2.ebuild
index 91b109330db3..115ed1fee18b 100644
--- a/x11-themes/light-themes/light-themes-19.04.ebuild
+++ b/x11-themes/light-themes/light-themes-19.04-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,12 +15,11 @@ SRC_URI="
 LICENSE="CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk3"
+IUSE=""
 
 DEPEND="app-arch/xz-utils"
 RDEPEND="
 	x11-themes/gtk-engines-murrine
-	gtk3? ( x11-themes/gtk-engines-unico )
 "
 
 S="${WORKDIR}"/${MY_PN}-${PV}
@@ -56,8 +55,4 @@ 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-20.10-r2.ebuild b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
new file mode 100644
index 000000000000..115ed1fee18b
--- /dev/null
+++ b/x11-themes/light-themes/light-themes-20.10-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 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=""
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="
+	x11-themes/gtk-engines-murrine
+"
+
+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*
+}
diff --git a/x11-themes/lxqt-themes/Manifest b/x11-themes/lxqt-themes/Manifest
index 9f332bc9a6ef..f5fe064e46a4 100644
--- a/x11-themes/lxqt-themes/Manifest
+++ b/x11-themes/lxqt-themes/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-themes-0.15.0.tar.xz 3203876 BLAKE2B d2c1c15c70b3a90fec23287bdaa9eb31375a23257376e575572769faf91d27c79e5f0ea868bcbcde29964d4aa52d6eea355e82d63076e4ff7e558d9f2f98d06b SHA512 7ef0c5af9945ef450d78e4991e482781728867e7d4f6793832c822135a47288b0c08d883d207ee7f275585fa7ae17f2e6bdbdaf01295ae2810e01c43330f2f9d
 DIST lxqt-themes-0.16.0.tar.xz 3220864 BLAKE2B 93f5b7c964f7907204234164db602842fb2247b7fe27c27647cd6981f114c111f5ae4b0c9efd220e1c1283d8dd689d1b90e0a112cd23289d58ccb29ae8e334e2 SHA512 fce067e621df4e3cad62a73f552c06ecf413e83ee2d67643424c4bdc0752c2c0acd1095c92714294ecc3ef96d137a2685860e360e09b81880fadf69b2c041258
 EBUILD lxqt-themes-0.15.0.ebuild 488 BLAKE2B b418b28e292f750614e6d87328930f4e3a5b323a72799e31a2dcdd9cc41a100ac5922ed9ca289f4650422d52f190d2a5faf8572bf84600dc1f05f274ca99c8f5 SHA512 3e5f70757db20cff99be8873f6e367911c4e6ca49d1fd6b13dcf41ad9f07a5511ad9b57f36e9cf9c3ccb17f3f67a86a5cef0c5e3f5523aca7ea554cfc0cf712c
-EBUILD lxqt-themes-0.16.0.ebuild 489 BLAKE2B 076b170485b07b02efc33461696773cb878a4db3dfa6dc239cc8f52ef7c04cae2b7f618949fe0916500ce0b770a36bf4cb830fa05910b064bd0bcd4a875aa79e SHA512 ceeda8a5a64dbf845087be816cfc909f77beeaadb64ad0b18d3f80a154d350a7572c6c9b1f565dfe646f5d2a8fa2cf3dd8ddfce6861f2f41fe96ccd5a432e59b
+EBUILD lxqt-themes-0.16.0.ebuild 488 BLAKE2B e52598acf4eabdebdb649824aafbc70aead2e4cc588403bdd4354ca3c30266d270183c2bdc9b390d2cf61f6c28391b5a59f6efab04b95c04a6a9f44a10987d84 SHA512 26656382bef9132b883e9d4fdccf3c3a0b64b35bfc98ce5bccd045a2868dd7030fc9ee895f2ac813f597123fd664a8a3297f55967f9e41afe4d820119994ebfa
 MISC metadata.xml 317 BLAKE2B 5570995b3ad6a8fbde584e6ec5d9d0e09e6000313c1b7e1caaea7fc36aed93f86af522fd4ce0ace8ad764135d7d07a3c3a27b97e8144c915a9d3621f53e77c3f SHA512 7ac9d03d1f2248513ae60d61ec213d18ac6757f66924d0273bf93f9c47e6b32a5f05d393c4c92484c59b23d7ddb8f4fd915bc31e45885bef91f44f6a9cabad41
diff --git a/x11-themes/lxqt-themes/lxqt-themes-0.16.0.ebuild b/x11-themes/lxqt-themes/lxqt-themes-0.16.0.ebuild
index b2af86ac9d36..1920c2762231 100644
--- a/x11-themes/lxqt-themes/lxqt-themes-0.16.0.ebuild
+++ b/x11-themes/lxqt-themes/lxqt-themes-0.16.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+"