gentoo resync : 10.02.2020

4 files changed, 74 insertions, 19 deletions

diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index 336fcb67d62b..15f31d6e5e0c 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,8 +1,10 @@
 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.9.tar.gz 211750 BLAKE2B bfce416c55cc03d1f98c4d14916bcecb6cdc857ed3f813d90cae2a9e92f607d4ae3798d0eb39b0e548f7b4c7964b60d4970c442b91eb78db02772b9a2c02f3a2 SHA512 d09638c78d74e26a428edfbbe00719208fac5e574db11eac2e538d25fa9f3270c9c7b636f770061807a59b200c8afa4252a9513cffe1f4af3d186425b6a14744
 EBUILD greybird-3.20.1-r2.ebuild 1334 BLAKE2B 9345926c3d85689c910c590ceb36a5368129c09790adcf091bd8cc358a9696706490451294149640a5d127c0167e01252f1c36687074103dd4a1af140b96a455 SHA512 3334a278c7ab07961de8e545aa75355136dbe770c1240ccd3ffc15bec2fe0498083a4e6566cfab9e5296993eca9f37fbc1b0b65e7b36d1bfe8ac29175150b783
 EBUILD greybird-3.22.10.ebuild 1338 BLAKE2B 74a2d975b43c6a238490c55c046f895e7f6c01d562f581e8ec826c8b1e31db6bb9548f2d1f5d9b2b73d79096c4fbe2f5ef1edd1074265dc846a2caa5e4226216 SHA512 f516d50df77b38d5378a7480557103f2447a1766912600fedbbef63fa74b212712c63d421a227b951a0e6bd384e63933051ffe3a32cf0466857558cc51e2dd52
+EBUILD greybird-3.22.11.ebuild 1489 BLAKE2B 5a0c4cf667325e1b70d5771cdc1b020d0ee51c006a57e56abf5731772882c07f12f686c121c127181dd7680da1fdcfb525fea73734d53b2c07940993096272e7 SHA512 59424fe7b5dc11b53eac4a749a0c464d69738d9df3aa275774aae7779c5dd9cff6442d8b57bbca4ddbb95c8526038ca92c22aca1ccc394df663e8c8bdc3f6b90
 EBUILD greybird-3.22.9.ebuild 1338 BLAKE2B 74a2d975b43c6a238490c55c046f895e7f6c01d562f581e8ec826c8b1e31db6bb9548f2d1f5d9b2b73d79096c4fbe2f5ef1edd1074265dc846a2caa5e4226216 SHA512 f516d50df77b38d5378a7480557103f2447a1766912600fedbbef63fa74b212712c63d421a227b951a0e6bd384e63933051ffe3a32cf0466857558cc51e2dd52
-EBUILD greybird-9999.ebuild 1263 BLAKE2B 10623ef97f49b0608dcbee136b273d5c56de5b4cf60c4d349f301a629127f15279b0d448cef72e2090cfd84b8bce2df90ec780d062171b7dd0cacee54586482a SHA512 0886455ee850ad11ad1b8f9b889a759abfde9e5b9737b8f3621c347d813652f69f22d9aeebb0e500fcbc6a65d511c8db64b8202e2c4bb28029ccd0579da9f480
-MISC metadata.xml 437 BLAKE2B 2c6f93604ac1c8b907f31e1a3ac813c13fd72a97bd0ecd5071c61d9729d05de4bb7dd1f4f35c1af2fd8c48beb674534d58a9b40e4b441ba75ca1210cb88b4a3a SHA512 06ee186a69379acc1e8dc3b353e3a86c4a914a1c529d9148eda9f9b11887d58183dc24da8a600fb37252f806d9703a9dc37b14ee7b080204d89d53c3d940193e
+EBUILD greybird-9999.ebuild 1423 BLAKE2B 4d46c23fe93336ecd0f163ca2fcc4d9c45d86c01cb4ab76ee035adb16aad442c41b4361bcdf1e1d4f187b68588eefbdd55c4ab76024977dd71bf2d27df630191 SHA512 faa7a410589d6e3278818c928cbb55a8a8dbcad474b65a5646203249b7c4a2c27e5692fe23c398eb2a402b15ec892483c38d4beeb246d3d8c56acf0c3826b5ea
+MISC metadata.xml 541 BLAKE2B 798da001d7f1035e3cf88fb0e9629368c85055bb349b1d7ae101e1daf1a435f7047aab1d6561a6c744dbd6d6771e42993724ae59b4f28af64b779164d8613d54 SHA512 0294f4f77e1f1e683d5f7596d410c3ce7f63fbf7cbcdaa5a195aaa6e762a54439ae782119e814bad0cfdae56fb4ec0b3aba21ef6c43dc59435d4e3de4ec88115
diff --git a/x11-themes/greybird/greybird-3.22.11.ebuild b/x11-themes/greybird/greybird-3.22.11.ebuild
new file mode 100644
index 000000000000..e1e28aa5a99d
--- /dev/null
+++ b/x11-themes/greybird/greybird-3.22.11.ebuild
@@ -0,0 +1,53 @@
+# 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 ~ppc ~ppc64 ~x86"
+IUSE="ayatana gnome gtk2 gtk3 xfce"
+REQUIRED_USE="
+	|| ( ayatana 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 ayatana || { 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-9999.ebuild b/x11-themes/greybird/greybird-9999.ebuild
index 5c63ed8b7137..683dbdd3528e 100644
--- a/x11-themes/greybird/greybird-9999.ebuild
+++ b/x11-themes/greybird/greybird-9999.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3
-
-MY_PN=${PN/g/G}
+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/${MY_PN}"
+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="ayatana gnome xfce"
+IUSE="ayatana gnome gtk2 gtk3 xfce"
+REQUIRED_USE="
+	|| ( ayatana gnome gtk2 gtk3 xfce )
+"
 
 RDEPEND="
 	>=x11-libs/gtk+-3.22:3
@@ -27,18 +28,15 @@ DEPEND="
 	dev-ruby/sass:3.5
 "
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_install() {
-	default
-
-	pushd "${ED}"/usr/share/themes/${MY_PN} > /dev/null || die
-	use ayatana || rm -rf unity
-	use gnome || rm -rf metacity-1
-	use xfce || rm -rf xfce* xfwm4*
+	meson_src_install
+
+	pushd "${ED}"/usr/share/themes > /dev/null || die
+	use ayatana || { 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
 }
 
diff --git a/x11-themes/greybird/metadata.xml b/x11-themes/greybird/metadata.xml
index ada89e0a62a0..2a50bd79b0d5 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -6,6 +6,8 @@
 <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>
 <upstream>