Fix bug 313525, remove old

Package-Manager: portage-2.1.9.40/cvs/Linux x86_64

4 files changed, 16 insertions, 41 deletions

diff --git a/media-libs/clutter-gst/ChangeLog b/media-libs/clutter-gst/ChangeLog
index 480c38be2bda..1c8eb9364bb2 100644
--- a/media-libs/clutter-gst/ChangeLog
+++ b/media-libs/clutter-gst/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/clutter-gst
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.4 2011/02/11 21:09:00 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.5 2011/02/18 06:44:43 nirbheek Exp $
+
+  18 Feb 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -clutter-gst-1.3.4.ebuild, clutter-gst-1.3.4-r1.ebuild:
+  Fix bug 313525, remove old
 
 *clutter-gst-1.3.4-r1 (11 Feb 2011)
 
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 74665dfdae04..c4996e8a63d4 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,7 +1,6 @@
 DIST clutter-gst-1.0.0.tar.bz2 414768 RMD160 f5c825e6c5da62a39a98e5515c0ede2e3e801907 SHA1 22f262b8d4d70d5d0ef499614fc0332a7a641241 SHA256 ae6ec048b570157130e9f9069f2495caf0da9eefa8d7f3b1789f3346fb16f696
 DIST clutter-gst-1.3.4.tar.bz2 446018 RMD160 4d80a22ec9cb5fecc3ba942c61be80ad7c8d76fe SHA1 0a370ccd2de19f91721f1df3202b29bebb566a15 SHA256 de4ce6d3313be3074c6afc6f20276ef06f1a460b3a6755fc5c6e048685de137a
 EBUILD clutter-gst-1.0.0.ebuild 944 RMD160 10b681dc25b09d33cd0eeba211a2616267fd442b SHA1 78b1dfb19e3cd149fbafd431787655494dae5669 SHA256 8ed5f0238782ccc5a7ade228f533316909ff634fdc6b5ea8432a50ef11825f5a
-EBUILD clutter-gst-1.3.4-r1.ebuild 967 RMD160 ab09aa19cbbd7f489d4d17f2a4ae84579ae911d7 SHA1 6ca942caddfb2abd51a9e7254b31e0b4d87eb083 SHA256 2ba6fb7c352de2e49a57d689766561cb784e3629df6fe051b8427d6cee0dbca4
-EBUILD clutter-gst-1.3.4.ebuild 942 RMD160 02bd0c7fbdadf5f17892e4af1de53710478dea0e SHA1 fa5cd74c43ce45a605bffc94d66f271e46d47aff SHA256 66af0d5f659c7820b07b0e41c15de384b44c7ca7a86edfede1aa61972ab51aa8
-MISC ChangeLog 1003 RMD160 62661f0c89f11b338d50558b7fc7d73e0166f8f5 SHA1 982ed7b2c2464e7a691034839a5d8bde826f8857 SHA256 b72d67dfe4d8506b53aacf0f9cffddc64b5e41a2e6c475d009eee798d210ec5c
+EBUILD clutter-gst-1.3.4-r1.ebuild 1114 RMD160 acb180b8a47a43a7f49284cf1a59ece753ef73b8 SHA1 41d609808c5a71c02da2534c42b11e1ab57d9308 SHA256 b8208ed458cb3e3ac7d1041c846e2bd75a893a4e34236b7fcfd3efe331974e93
+MISC ChangeLog 1145 RMD160 1e523d303e026a417d2f2b4c458efe28e374cc8c SHA1 dd88447bbdc8039a7e038b407b3bd9c29e3e4bea SHA256 885f0658d342c0b80c88fbb9c37ce08455bc8b2d21a2d971f30ed7c4af1a1dab
 MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
diff --git a/media-libs/clutter-gst/clutter-gst-1.3.4-r1.ebuild b/media-libs/clutter-gst/clutter-gst-1.3.4-r1.ebuild
index 5cd28efc6669..6ca61da0adbd 100644
--- a/media-libs/clutter-gst/clutter-gst-1.3.4-r1.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.3.4-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.3.4-r1.ebuild,v 1.1 2011/02/11 21:09:00 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.3.4-r1.ebuild,v 1.2 2011/02/18 06:44:43 nirbheek Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2" # Just a build-time dependency
 CLUTTER_LA_PUNT="yes"
 
 # inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter
+inherit python gnome2 clutter
 
 DESCRIPTION="GStreamer Integration library for Clutter"
 
@@ -21,13 +22,16 @@ RDEPEND="
 	media-libs/gst-plugins-base:0.10[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
 DEPEND="${RDEPEND}
-	virtual/python"
+	doc? ( >=dev-util/gtk-doc-1.8 )"
 
 DOCS="AUTHORS NEWS README"
 EXAMPLES="examples/{*.c,*.png,README}"
 
-pkg_setup() {
+src_prepare() {
 	# XXX: debug default is "minimum" in even releases; "yes" in odd releases
 	G2CONF="${G2CONF}
 		$(use_enable introspection)"
+
+	gnome2_src_prepare
+	python_convert_shebangs 2 "${S}"/scripts/pso2h.py
 }
diff --git a/media-libs/clutter-gst/clutter-gst-1.3.4.ebuild b/media-libs/clutter-gst/clutter-gst-1.3.4.ebuild
deleted file mode 100644
index 21d50b722a4f..000000000000
--- a/media-libs/clutter-gst/clutter-gst-1.3.4.ebuild
+++ /dev/null
@@ -1,32 +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/clutter-gst/clutter-gst-1.3.4.ebuild,v 1.1 2011/01/31 06:33:26 nirbheek Exp $
-
-EAPI="2"
-
-# inherit clutter after gnome2 so that defaults aren't overriden
-inherit gnome2 clutter
-
-DESCRIPTION="GStreamer Integration library for Clutter"
-
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.20
-	>=media-libs/clutter-1.4.0:1.0[introspection?]
-	media-libs/gstreamer:0.10[introspection?]
-	media-libs/gst-plugins-base:0.10[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
-DEPEND="${RDEPEND}
-	virtual/python"
-
-DOCS="AUTHORS NEWS README"
-EXAMPLES="examples/{*.c,*.png,README}"
-
-pkg_setup() {
-	# XXX: debug default is "minimum" in even releases; "yes" in odd releases
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-}