From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 6 Dec 2019 12:45:59 +0000 (+0100)
Subject: xfce-base/garcon: libxfce4ui-4.15 dropped gtk2, adjust defaults
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9543f52d502bd51105e46c45f8dadedfb8d4a65a;p=gentoo.git

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@gentoo.org>
---

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 8865cc2564f4..27b82ec1fdfa 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