Sync gnome-shell stuff to the ebuilds from the gnome overlay

svn path=/; revision=162

1 files changed, 19 insertions, 13 deletions

diff --git a/dev-libs/gir-repository/gir-repository-9999.ebuild b/dev-libs/gir-repository/gir-repository-9999.ebuild
index 1d90e73..3758559 100644
--- a/dev-libs/gir-repository/gir-repository-9999.ebuild
+++ b/dev-libs/gir-repository/gir-repository-9999.ebuild
@@ -17,10 +17,10 @@ SRC_URI=""
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="atk avahi babl dbus gconf gnome-keyring gstreamer +gtk gtksourceview gupnp
-libnotify libsoup libunique libwnck pango poppler vte webkit"
+IUSE="atk avahi babl dbus gconf gnome-keyring goocanvas +gtk gtksourceview gupnp
+libnotify libsoup libwnck nautilus pango poppler vte webkit"
 
-RDEPEND=">=dev-libs/gobject-introspection-0.6.3"
+RDEPEND=">=dev-libs/gobject-introspection-0.6.5"
 DEPEND="${RDEPEND}
 	atk? ( >=dev-libs/atk-1.12.0 )
 	avahi? ( >=net-dns/avahi-0.6 )
@@ -29,9 +29,6 @@ DEPEND="${RDEPEND}
 	gconf? ( gnome-base/gconf )
 	gnome-keyring? ( gnome-base/gnome-keyring )
 	goocanvas? ( x11-libs/goocanvas )
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-base:0.10 )
 	gtk? (
 		>=dev-libs/atk-1.12.0
 		x11-libs/gtk+:2 )
@@ -41,7 +38,6 @@ DEPEND="${RDEPEND}
 		net-libs/gupnp )
 	libnotify? ( x11-libs/libnotify )
 	libsoup? ( net-libs/libsoup:2.4 )
-	libunique? ( >=dev-libs/libunique-1.0.0 )
 	libwnck? ( x11-libs/libwnck )
 	nautilus? ( gnome-base/nautilus )
 	pango? ( x11-libs/pango )
@@ -50,15 +46,22 @@ DEPEND="${RDEPEND}
 	webkit? ( >=net-libs/webkit-gtk-1.0 )
 "
 
+_auto_dep() {
+	if use ${1} && ! use ${2}; then
+		ewarn "${2} is disabled, but ${1} needs ${2}. Auto-enabling..."
+		G2CONF="${G2CONF} --enable-${3:-$2}"
+	fi
+}
+
 pkg_setup() {
 	# FIXME: installs even disabled stuff if it's a dependency of something enabled
-	# XXX: Seemingly unrelated enabling is for Makefile-level dependencies
-	# FIXME: Above mentioned dependencies are incomplete
 	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)
@@ -66,27 +69,30 @@ pkg_setup() {
 		$(use_enable gconf)
 		$(use_enable gnome-keyring gnomekeyring)
 		$(use_enable goocanvas)
-		$(use_enable gstreamer)
 		$(use_enable gtk)
-		$(use_enable gtk atk)
 		$(use_enable gtksourceview)
 		$(use_enable gupnp gssdp)
 		$(use_enable libnotify notify)
 		$(use_enable libsoup soup)
-		$(use_enable libunique unique)
 		$(use_enable libwnck wnck)
 		$(use_enable nautilus)
 		$(use_enable pango)
 		$(use_enable poppler)
 		$(use_enable vte)
 		$(use_enable webkit)
-		$(use_enable webkit soup)
 	"
+
+	# 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"	
+
 	eautoreconf
 }