[gentoo-commits] repo/gentoo:master commit in: xfce-base/garcon/

[Michał Górny]

commit:     9543f52d502bd51105e46c45f8dadedfb8d4a65a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 12:45:59 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 14:19:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9543f52d

xfce-base/garcon: libxfce4ui-4.15 dropped gtk2, adjust defaults

Disable gtk2 by default since libxfce4ui no longer provides it (and we
apparently have no revdeps for it anymore).  Adjust deps.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../garcon/{garcon-0.6.4-r1.ebuild => garcon-0.6.4-r2.ebuild} | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/xfce-base/garcon/garcon-0.6.4-r1.ebuild 
b/xfce-base/garcon/garcon-0.6.4-r2.ebuild
similarity index 85%
rename from xfce-base/garcon/garcon-0.6.4-r1.ebuild
rename to xfce-base/garcon/garcon-0.6.4-r2.ebuild
index 8865cc2564f..27b82ec1fdf 100644
--- a/xfce-base/garcon/garcon-0.6.4-r1.ebuild
+++ b/xfce-base/garcon/garcon-0.6.4-r2.ebuild
@@ -10,13 +10,18 @@ 
SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2";
 LICENSE="LGPL-2+ FDL-1.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 
~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+gtk2"
+IUSE="-gtk2"
 
 RDEPEND=">=dev-libs/glib-2.30:=
        >=x11-libs/gtk+-3.20:3=
-       >=xfce-base/libxfce4ui-4.12:=[gtk2(+)?,gtk3(+)]
        >=xfce-base/libxfce4util-4.12:=
-       gtk2? ( >=x11-libs/gtk+-2.24:2= )"
+       gtk2? (
+               >=x11-libs/gtk+-2.24:2=
+               <xfce-base/libxfce4ui-4.15:=[gtk2(+),gtk3(+)]
+       )
+       !gtk2? (
+               >=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+       )"
 DEPEND="${RDEPEND}
        dev-util/glib-utils
        dev-util/gtk-doc-am