gentoo resync : 29.01.2021

7 files changed, 48 insertions, 232 deletions

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>