[patch] changes to the 2.0.3 ebuild

ebuild-changes.patch (text/plain), 1.24 KB, created by Rafał Mużyło on 2011-12-23 20:18:48 UTC

--- /usr/portage/app-editors/bluefish/bluefish-2.0.3.ebuild	2011-06-05 11:33:51.000000000 +0200
+++ bluefish-2.2.0.ebuild	2011-12-23 20:52:19.281761018 +0100
@@ -17,10 +17,17 @@
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="gucharmap nls python spell"
+IUSE="gtk3 gucharmap nls python spell"
 
 RDEPEND="
+	!gtk3? (
 	>=x11-libs/gtk+-2.12:2
+	gucharmap? ( gnome-extra/gucharmap:0 )
+	)
+	gtk3? (
+	x11-libs/gtk+:3
+	gucharmap? ( gnome-extra/gucharmap:2.90 )
+	)
 	spell? ( app-text/enchant )"
 
 DEPEND="${RDEPEND}
@@ -28,7 +35,6 @@
 	dev-libs/libxml2:2
 	dev-util/pkgconfig
 	x11-libs/pango
-	gucharmap? ( gnome-extra/gucharmap )
 	nls? ( sys-devel/gettext dev-util/intltool )"
 
 S=${WORKDIR}/${MY_P}
@@ -48,7 +54,7 @@
 
 	# Fixes automagic installation of charmap plugin
 	# Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=570990
-	epatch "${FILESDIR}"/${PN}-2.0.0-gucharmap-automagic.patch
+	epatch "${FILESDIR}"/${PN}-2.2.0-gucharmap-automagic.patch
 	eautoreconf
 }
 
@@ -58,6 +64,7 @@
 		--disable-dependency-tracking \
 		--disable-update-databases \
 		--disable-xml-catalog-update \
+		$(use_with !gtk3 gtk2) \
 		$(use_enable nls) \
 		$(use_enable spell spell-check) \
 		$(use_enable gucharmap charmap) \