Fix introspection deps, use slot-deps, bump EAPI to 3. Remove old.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 18 insertions, 67 deletions

diff --git a/media-libs/gst-plugins-base/ChangeLog b/media-libs/gst-plugins-base/ChangeLog
index adbff8f8c6dd..53232c35edc2 100644
--- a/media-libs/gst-plugins-base/ChangeLog
+++ b/media-libs/gst-plugins-base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gst-plugins-base
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.173 2011/07/25 17:50:29 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/ChangeLog,v 1.174 2011/08/25 18:29:37 nirbheek Exp $
+
+  25 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gst-plugins-base-0.10.31.ebuild, gst-plugins-base-0.10.35.ebuild:
+  Fix introspection deps, use slot-deps, bump EAPI to 3. Remove old.
 
   25 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
   gst-plugins-base-0.10.32.ebuild:
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.31.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.31.ebuild
deleted file mode 100644
index cdb7d1b256d5..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.31.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.31.ebuild,v 1.11 2011/07/07 22:24:34 leio Exp $
-
-EAPI=1
-
-# order is important, gnome2 after gst-plugins
-inherit gst-plugins-base gst-plugins10 gnome2 flag-o-matic eutils
-# libtool
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="http://gstreamer.freedesktop.org/"
-SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+introspection nls +orc"
-
-RDEPEND=">=dev-libs/glib-2.20
-	>=media-libs/gstreamer-0.10.31
-	dev-libs/libxml2
-	app-text/iso-codes
-	orc? ( >=dev-lang/orc-0.4.11 )
-	!<media-libs/gst-plugins-bad-0.10.10"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.11.5 )
-	dev-util/pkgconfig"
-	# Only if running eautoreconf: dev-util/gtk-doc-am
-
-GST_PLUGINS_BUILD=""
-
-DOCS="AUTHORS NEWS README RELEASE"
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "$FILESDIR/${P}-fix-tag-test-linking.patch"
-}
-
-src_compile() {
-	# gst doesnt handle opts well, last tested with 0.10.15
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	gst-plugins-base_src_configure \
-		$(use_enable introspection) \
-		$(use_enable nls) \
-		$(use_enable orc)
-	emake || die "emake failed."
-}
-
-src_install() {
-	gnome2_src_install
-}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild
index cf7607b51ed4..483cd2cdc7b3 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild,v 1.2 2011/07/07 22:24:34 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-base/gst-plugins-base-0.10.35.ebuild,v 1.3 2011/08/25 18:29:37 nirbheek Exp $
 
-EAPI=1
+EAPI="3"
 GCONF_DEBUG="no"
 
 # order is important, gnome2 after gst-plugins
@@ -17,10 +17,11 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~amd64-linux ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~sparc-solaris ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection nls +orc"
 
-RDEPEND=">=dev-libs/glib-2.22
-	>=media-libs/gstreamer-0.10.34
-	dev-libs/libxml2
+RDEPEND=">=dev-libs/glib-2.22:2
+	>=media-libs/gstreamer-0.10.34:0.10[introspection?]
+	dev-libs/libxml2:2
 	app-text/iso-codes
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	orc? ( >=dev-lang/orc-0.4.11 )
 	!<media-libs/gst-plugins-bad-0.10.10"
 DEPEND="${RDEPEND}
@@ -32,20 +33,19 @@ GST_PLUGINS_BUILD=""
 
 DOCS="AUTHORS NEWS README RELEASE"
 
-src_compile() {
-	# gst doesnt handle opts well, last tested with 0.10.15
-	strip-flags
-	replace-flags "-O3" "-O2"
-
-	# Avoid sandbox violation with USE="introspection", bug #356283
-	export GST_REGISTRY=${T}/registry.cache.xml
-
+src_configure() {
 	gst-plugins-base_src_configure \
 		$(use_enable introspection) \
 		$(use_enable nls) \
 		$(use_enable orc) \
 		--disable-examples \
 		--disable-debug
+}
+
+src_compile() {
+	# gst doesnt handle opts well, last tested with 0.10.15
+	strip-flags
+	replace-flags "-O3" "-O2"
 	emake || die "emake failed."
 }