x11-themes/greybird: Update live ebuild

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Bug: https://bugs.gentoo.org/708840
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/x11-themes/greybird/greybird-9999.ebuild b/x11-themes/greybird/greybird-9999.ebuild
index 5c63ed8b71371dd232da51b01a028dc69f435b85..683dbdd3528e44967a7b12edf48105b45a8b91c7 100644 (file)
--- 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 ada89e0a62a08915cd9c012c0ea1b1e684269d2d..2a50bd79b0d5fe3236945e72825048df83bbf228 100644 (file)
--- 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>