From 9543f52d502bd51105e46c45f8dadedfb8d4a65a Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 6 Dec 2019 13:45:59 +0100
Subject: xfce-base/garcon: libxfce4ui-4.15 dropped gtk2, adjust defaults
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 xfce-base/garcon/garcon-0.6.4-r1.ebuild | 42 -----------------------------
 xfce-base/garcon/garcon-0.6.4-r2.ebuild | 47 +++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 42 deletions(-)
 delete mode 100644 xfce-base/garcon/garcon-0.6.4-r1.ebuild
 create mode 100644 xfce-base/garcon/garcon-0.6.4-r2.ebuild

(limited to 'xfce-base')

diff --git a/xfce-base/garcon/garcon-0.6.4-r1.ebuild b/xfce-base/garcon/garcon-0.6.4-r1.ebuild
deleted file mode 100644
index 8865cc2564f4..000000000000
--- a/xfce-base/garcon/garcon-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
-HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
-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"
-
-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= )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
-
-src_configure() {
-	local myconf=(
-		$(use_enable gtk2)
-		$(use_enable gtk2 libxfce4ui)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/garcon/garcon-0.6.4-r2.ebuild b/xfce-base/garcon/garcon-0.6.4-r2.ebuild
new file mode 100644
index 000000000000..27b82ec1fdfa
--- /dev/null
+++ b/xfce-base/garcon/garcon-0.6.4-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Xfce's freedesktop.org specification compatible menu implementation library"
+HOMEPAGE="https://docs.xfce.org/xfce/exo/start"
+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"
+
+RDEPEND=">=dev-libs/glib-2.30:=
+	>=x11-libs/gtk+-3.20:3=
+	>=xfce-base/libxfce4util-4.12:=
+	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
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README STATUS TODO )
+
+src_configure() {
+	local myconf=(
+		$(use_enable gtk2)
+		$(use_enable gtk2 libxfce4ui)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
-- 
cgit v1.2.3-65-gdbad