gentoo (valentine's day) resync : 14.02.2021

5 files changed, 3 insertions, 119 deletions

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