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

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 33 insertions, 76 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/Manifest b/media-libs/gst-plugins-base/Manifest
index 7b33efc62e18..2e3a5c78054e 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -3,20 +3,26 @@ Hash: SHA1
 
 AUX gst-plugins-base-0.10.31-fix-tag-test-linking.patch 995 RMD160 5297f347af2ea316364029d87fdf0f57ef6ac8a7 SHA1 6f2dd634432dbaabef96f984ac3acbc6f8aaf8b2 SHA256 1cc80eabcf54420b12b3bc8d0eb74079b0cf4185043979f0f8f59bb18882c29f
 AUX gst-plugins-base-0.10.32-fix-tests-encodebin.patch 2386 RMD160 0fea24906edd4ba318b75e3fed894028e6641eed SHA1 4efa152a29d2fd7cad45fe5f0d79126f7e698bf1 SHA256 20b236c02c9ad2fe265506e47aebd2a732df742c55c84439ddeb103ce101f861
-DIST gst-plugins-base-0.10.31.tar.bz2 2644897 RMD160 06fe1e41904404f7502ee849efb58e80e022f3b8 SHA1 a22d944adc6f27f8dc629d868fe15d4ce3aa4096 SHA256 abb006c78222cfb69d31e983268d1d5219e9d4e0da24c6c4cd687968af7a33bd
 DIST gst-plugins-base-0.10.32.tar.bz2 2720103 RMD160 b267e3138e40e3646efed0baa662d40775eca1ea SHA1 c1c149272b7ab6cbe5f648532f74525c6541eea5 SHA256 e9aabfac83f6480896da0686e9c911989f896fbad634821b7771ed84a446172b
 DIST gst-plugins-base-0.10.35.tar.bz2 2782902 RMD160 877e6b1c5439ef71262037b7a1aced07d37f4d49 SHA1 6d7dc463fed5dd43f79a53ad523fcbd6d0916303 SHA256 cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103
-EBUILD gst-plugins-base-0.10.31.ebuild 1516 RMD160 b944a4e992327c692eea8ab9ddfae3607d15bb1d SHA1 452086d1fbc440fb9447ec26b2c8d94dbd3a65bb SHA256 dcbe2bef501ed1941ae6925ad35ee3a24f25e0cb27342dc8c2eefc610652242c
 EBUILD gst-plugins-base-0.10.32.ebuild 1722 RMD160 18b5ea54b4998ccea8eaed2e65c073f103ce5fa0 SHA1 a23934ffe33b2963339c9b8aad1c436feaf11de6 SHA256 582abab0e31fc4327cc2ec641eba9cc07819d18716bf2904a1000a852ed96b8f
-EBUILD gst-plugins-base-0.10.35.ebuild 1613 RMD160 b547c825401e1f0577435a7faa6fec85a6fb02d4 SHA1 5786c837a338a2962996b33746a3adc7d71753a1 SHA256 3fb6efaa3325fe6dd9dd138c7879d04880f0a751940722e82b7734be6e3d9070
-MISC ChangeLog 25277 RMD160 8d1f62bda9399a6fa46704f8a0c7db7f7aea6412 SHA1 8633481f190a667941c1aaa4e6c1e2165d9128dd SHA256 78f377401a3020ae01fb107588a0823d188180f6e19f020c7dc0d524b50b70a0
+EBUILD gst-plugins-base-0.10.35.ebuild 1613 RMD160 41aa9b4680cb55604c170c00745a46e6f8cc2533 SHA1 55d727e4568678feed7c7209dbf9e9852b155a86 SHA256 1dabc1cf02b415d282eb50720aa33047f7a69a5cacb46d0741e941b3163bcd57
+MISC ChangeLog 25468 RMD160 d92e255255e59cfc1aa5c5b524a949c07f2132db SHA1 f094c46a031e4a8ac99c5db16f090b977df74ffd SHA256 947488a1fb366e1b26a6bf2707a3c500105c39e19d1a374d5013d46de3b60b00
 MISC metadata.xml 367 RMD160 414d9e853e2498b2f32a9b666bfaaba9ceb796c3 SHA1 8a5923839a5f261da244c64146bb7be10af7e787 SHA256 9d6d2f0475cebfa4ec7520e3e5f8dd8e825ddcfda317282174ec9528a9c169f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4trOwACgkQIiMqcbOVdxSXAAP+KbLK0DcxXNL0TcEeD0Yr8+kr
-nhH7WF6VNnqGR50eOVcEETOAKAgnOoRH3pWJUlGoDhMFniP2kwyT98LOiKzsArlV
-B6gu8ULDUJxiRuATT6ma9XzDvIPpc0au8fB48PZsvIAhwunCv7QIgnx0dgvn7hoT
-lssu3xVUOSg4fvYwRso=
-=jVA0
+iQIcBAEBAgAGBQJOVpSRAAoJEO/kOhxWD91kszwP/1GEsir75iLpmQZQg2sRBUHf
+lI+4Hgtcz8BR35H+iyvojPN8PEF1XTrJzM2McVaKUQ5pu717uKOS1sSFb1n8m7PF
+FQ6GDWOOX+n/EJ7ilTE5ZnwcO1sXr9PtCfZFni9DxN1MwfFKtlAgOvRvfrnFsLQA
+kEp0DP52MjyX5VbBIO+zRANU2LhHtc8roYlCHnInEPNP69LpZ1MEdLwMdX/1rNeY
+LbyqP7BqiF0XCP2mjTEpIICy7sw84+7+NMoHygwMYNuiQ4V18A1V3plP6c1LYZ6l
+vRzknbKU0UsmmotZuxDHOb485dgtSB6VF7tAEpfHgU2wwUZJOrVw4l1Qe15RgNmc
+haoQDys8avyki1hfWBx43BdViOnwaOEHS8PTDEeKuvL6525n2ERH7ORgueoQA8+q
+hiVaeP1URl7C70wmNcVLhLN0HdwrxH35fiFgZ0O91gZSr/4lJ9SJNOlyugJ+5+t4
+y1lIoZwU8GgJ2TgsBhoU4SPEmUrsz0WkmgJVw5Wnnb+b7R+3kwFjx9s82N7sN2zT
+//Ah3c2V+C7HeZZf4Nukb49BAQK+SAN9Hle2y6zjqXj55pbPa1azm8124+3Trn3B
+zMOH7BetHsTAu2t8nlNgy6I+SbNGrJbQPxWhp2Hdxb8EozFxx7zSyaegnpdJpYPz
+qVV57IB6qSWHJ8vvBl56
+=YrCx
 -----END PGP SIGNATURE-----
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."
 }