Finally fix gir-repository live ebuild, also use flags actually work now

svn path=/; revision=204

3 files changed, 44 insertions, 46 deletions

diff --git a/dev-libs/gir-repository/Manifest b/dev-libs/gir-repository/Manifest
index f7fa93d..dff6528 100644
--- a/dev-libs/gir-repository/Manifest
+++ b/dev-libs/gir-repository/Manifest
@@ -1,4 +1,5 @@
 AUX gir-repository-0.6.5-fix-worlds-worst-automagic-configure.patch 18388 RMD160 6a1443d892a9138d494f3bb11ab3471147398b9d SHA1 69015a5ee2c452be1881385bf444deb782a7a26a SHA256 21a5ec40b83d4a409aebce513c3b405579a22eac98263406590af2c021edf418
+AUX gir-repository-config-nogstbase.diff 449 RMD160 4b519c6da036814e9aada47dccd96e176cb74143 SHA1 6b94a71f36948d1ebc57c2cf68b6785da70d9f40 SHA256 50d58e204852d0f7d471abf56b36131e1a2b47f14f019d5ae53e47a5746c8677
 DIST gir-repository-0.6.5.tar.bz2 264148 RMD160 fd4bd2f4fd2dbd7e471694cb9add900e754b5c10 SHA1 0a036f32227a41096d394ff822a6a631688ee47f SHA256 cbeadc6c701f376134c9fe288fe0d95a725d9fa398daaeeb6621c35e8bafcae1
 EBUILD gir-repository-0.6.5.ebuild 2353 RMD160 b58fbff54d810bb4162c6436c95c0e77c99abe6c SHA1 2073ab6cbfc9655321f40abaa5352dd7208184e6 SHA256 412dfd20262ca8743013ee69dc162b8eeb0e3149f2e3d402a9b1cadec33756bb
-EBUILD gir-repository-9999.ebuild 2433 RMD160 ccbac57cb2c1e801da50d7b9cb8815f723306415 SHA1 93b011ef9096e4c3bc4b2d8dc08937d82e093325 SHA256 f7792558e8c3a0522944acd28f369b9b864602eb4dde19b19c4d08c695ed059c
+EBUILD gir-repository-9999.ebuild 2312 RMD160 8821883b83d32c0a07ebd54e5ae80ebb58f015d5 SHA1 f594979068125c30823bd4dab1064f8e44c761ef SHA256 d33f9a7015b2474441b1fcda64d858c73742d6f84645e1522ba42d6c6a8a4c5e
diff --git a/dev-libs/gir-repository/files/gir-repository-config-nogstbase.diff b/dev-libs/gir-repository/files/gir-repository-config-nogstbase.diff
new file mode 100644
index 0000000..a003e58
--- /dev/null
+++ b/dev-libs/gir-repository/files/gir-repository-config-nogstbase.diff
@@ -0,0 +1,12 @@
+--- configure.ac 
++++ configure.ac 
+@@ -114,7 +114,7 @@
+ 
+ dnl gst-plugins-base supports introspection starting from 0.10.25
+ PKG_CHECK_MODULES(GSTREAMER_PLUGINS_BASE, [gstreamer-plugins-base-0.10 >= 0.10.0],
+-                  have_gstreamer_plugins_base=true,
++                  have_gstreamer_plugins_base=false,
+                   have_gstreamer_plugins_base=false)
+ AM_CONDITIONAL(BUILD_GSTREAMER_PLUGINS_BASE, $have_gstreamer_plugins_base)
+ 
+
diff --git a/dev-libs/gir-repository/gir-repository-9999.ebuild b/dev-libs/gir-repository/gir-repository-9999.ebuild
index 8f8364a..170f1af 100644
--- a/dev-libs/gir-repository/gir-repository-9999.ebuild
+++ b/dev-libs/gir-repository/gir-repository-9999.ebuild
@@ -17,21 +17,23 @@ SRC_URI=""
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="atk avahi babl dbus gconf gnome-keyring goocanvas +gtk gtksourceview gupnp
-libnotify libsoup libwnck nautilus pango poppler vte webkit"
+IUSE="atk avahi babl dbus gconf gnome-keyring gnome-menus goocanvas +gtk gtksourceview gupnp
+libnotify libsoup libwnck nautilus pango poppler vte"
 
 RDEPEND=">=dev-libs/gobject-introspection-0.6.5"
 DEPEND="${RDEPEND}
 	atk? ( >=dev-libs/atk-1.12.0 )
 	avahi? ( >=net-dns/avahi-0.6 )
-	babl? ( media-libs/babl )
+	babl? ( =media-libs/babl-0.0 )
 	dbus? ( dev-libs/dbus-glib )
 	gconf? ( gnome-base/gconf )
 	gnome-keyring? ( gnome-base/gnome-keyring )
+	gnome-menus? ( gnome-base/gnome-menus )
 	goocanvas? ( x11-libs/goocanvas )
 	gtk? (
 		>=dev-libs/atk-1.12.0
-		x11-libs/gtk+:2 )
+		x11-libs/gtk+:2
+		x11-libs/pango )
 	gtksourceview? ( x11-libs/gtksourceview )
 	gupnp? (
 		net-libs/gssdp
@@ -43,56 +45,39 @@ DEPEND="${RDEPEND}
 	pango? ( x11-libs/pango )
 	poppler? ( >=app-text/poppler-0.12.3-r3 )
 	vte? ( x11-libs/vte )
-	webkit? ( >=net-libs/webkit-gtk-1.0 )
 "
+pkg_setup() {
 
-_auto_dep() {
-	if use ${1} && ! use ${2}; then
-		ewarn "${2} is disabled, but ${1} needs ${2}. Auto-enabling..."
-		G2CONF="${G2CONF} --enable-${3:-$2}"
-	fi
-}
+	# pango and atk are automatically enabled when using gtk 
+	SKIP=""
+	use !gtk && use !atk && SKIP="${SKIP},Atk"
+	use !avahi && SKIP="${SKIP},Avahi"
+	use !babl && SKIP="${SKIP},BABL"
+	use !dbus && SKIP="${SKIP},DBus"
+	use !gconf && SKIP="${SKIP},GConf"
+	use !gnome-keyring && SKIP="${SKIP},GnomeKeyring"
+	use !gnome-menus && SKIP="${SKIP},GMenu"
+	use !goocanvas && SKIP="${SKIP},GooCanvas"
+	use !gtk && SKIP="${SKIP},Gtk"
+	use !gtksourceview && SKIP="${SKIP},GTKSOURCEVIEW"
+	use !gupnp && SKIP="${SKIP},GUPNP"
+	use !libnotify && SKIP="${SKIP},Notify"
+	use !libsoup && SKIP="${SKIP},Soup"
+	use !libwnck && SKIP="${SKIP},Wnck"
+	use !nautilus && SKIP="${SKIP},Nautilus"
+	use !gtk && use !pango && SKIP="${SKIP},Pango"
+	use !poppler && SKIP="${SKIP},Poppler"
+	use !vte && SKIP="${SKIP},Vte"
 
-pkg_setup() {
-	# FIXME: installs even disabled stuff if it's a dependency of something enabled
-	G2CONF="${G2CONF}
-		--disable-clutter
-		--disable-clutter-gtk
-		--disable-clutter-cairo
-		--disable-gnio
-		--disable-gstreamer
-		--disable-unique
-		$(use_enable atk)
-		$(use_enable avahi)
-		$(use_enable babl)
-		$(use_enable dbus)
-		$(use_enable gconf)
-		$(use_enable gnome-keyring gnomekeyring)
-		$(use_enable goocanvas)
-		$(use_enable gtk)
-		$(use_enable gtksourceview)
-		$(use_enable gupnp gssdp)
-		$(use_enable libnotify notify)
-		$(use_enable libsoup soup)
-		$(use_enable libwnck wnck)
-		$(use_enable nautilus)
-		$(use_enable pango)
-		$(use_enable poppler)
-		$(use_enable vte)
-		$(use_enable webkit)
-	"
+	# Disable some stuff by default
+	G2CONF="${G2CONF} --with-skipped-gir-modules=Gst,Gnio,WebKit,Unique,${SKIP}"
 
-	# XXX: Auto-enabling is for Makefile-level dependencies
-	# FIXME: these dependencies are incomplete
-	_auto_dep gtk atk
-	_auto_dep gtk pango
-	_auto_dep webkit libsoup soup
 }
 
 src_unpack() {
 	git_src_unpack	
 	cd ${S}
-#	epatch "${FILESDIR}/${PN}-0.6.5-fix-worlds-worst-automagic-configure.patch"	
+	epatch "${FILESDIR}/${PN}-config-nogstbase.diff"	
 
 	eautoreconf
 }