Fix bug 345511, remove old

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

4 files changed, 21 insertions, 53 deletions

diff --git a/dev-python/pyclutter/ChangeLog b/dev-python/pyclutter/ChangeLog
index e95bdad26096..495a04a79c70 100644
--- a/dev-python/pyclutter/ChangeLog
+++ b/dev-python/pyclutter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyclutter
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclutter/ChangeLog,v 1.4 2011/02/11 21:08:58 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclutter/ChangeLog,v 1.5 2011/02/18 07:17:14 nirbheek Exp $
+
+*pyclutter-1.3.2-r2 (18 Feb 2011)
+
+  18 Feb 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -pyclutter-1.3.2.ebuild, -pyclutter-1.3.2-r1.ebuild,
+  +pyclutter-1.3.2-r2.ebuild:
+  Fix bug 345511, remove old
 
 *pyclutter-1.3.2-r1 (11 Feb 2011)
 
diff --git a/dev-python/pyclutter/Manifest b/dev-python/pyclutter/Manifest
index 530e21dca7f7..4b4e3197ff78 100644
--- a/dev-python/pyclutter/Manifest
+++ b/dev-python/pyclutter/Manifest
@@ -4,7 +4,6 @@ DIST pyclutter-1.0.2.tar.bz2 498957 RMD160 7e139e37ab8f57436c46bff12c6ec3fb27b51
 DIST pyclutter-1.3.2.tar.bz2 514401 RMD160 54f8dc77722168b47d34aacf26e3bb316a76f327 SHA1 cd78e53a673933d018d0bb9d89acc44789cd9541 SHA256 22e0442ca79733ba5df966640ceb3725413c0dc028d5cf83994d920a7fd4710e
 EBUILD pyclutter-1.0.0.ebuild 1096 RMD160 1dad2a7fe924f8fc2202b2ce417e59276445e77a SHA1 89fdc0d4a998e5b7e21c6c0b84482652de4c6f6d SHA256 fc75cad74293b9b621f4277a46e55ca722ee6b5facf95a9cb1e0bcf73e72f204
 EBUILD pyclutter-1.0.2.ebuild 1007 RMD160 015ed66f7a90b5d907de625dfccd31230a71f383 SHA1 7109c9c21c8b571d85bc8c020fe8eecac45ff944 SHA256 09c342a242ed06514f154e4bc9edeeff5d0f08772abd60d109b4ab0a91ccf0be
-EBUILD pyclutter-1.3.2-r1.ebuild 1085 RMD160 964b6c3055c00de4338b6b77120634da3b39b0f9 SHA1 cebcb19aaefe1ba13145dfd71d76e678e36caa3d SHA256 efdb3b0ac9a72c96e494cd3fb9400245c83f7f3ee421018fa330c4fe597bce7f
-EBUILD pyclutter-1.3.2.ebuild 1060 RMD160 bad592bf7eee14c6fb1a31cb5935657235cf8d74 SHA1 13791dd7413085e84b4c7a2dabebee830c5d8cf6 SHA256 1995e769b81b967be157de64591342afddeda67bf281041501fed2203b3eb583
-MISC ChangeLog 948 RMD160 8ac02095b612c4829b0fd526bd5314299d5a914c SHA1 f9dda91194fd41c0cb84bb89c0c721143f639a05 SHA256 c038effa4ef27e8c646c76689b48e8341512653dd65b2963f177d7e83eb58df4
+EBUILD pyclutter-1.3.2-r2.ebuild 1206 RMD160 10c49e0d7aa074bd55a64e4008a20a0070ed1967 SHA1 8d29247e6d868398688aca0fc56b3fe1e1da24c6 SHA256 7e778ed5fe84df43a3a6454eafa38a0015a12082c886e81f18f05c780d0688de
+MISC ChangeLog 1152 RMD160 d4d7f09d33ee8cf0743e9079a639ba0c7de68caf SHA1 3455b3a7fbcd96a2ecaa4acf9096b45d7ddd2dd3 SHA256 e82bd428fd9e701ed88a632515e461544b5091fe64692b1244a0a1302d428a35
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/dev-python/pyclutter/pyclutter-1.3.2-r1.ebuild b/dev-python/pyclutter/pyclutter-1.3.2-r2.ebuild
index d3b52bd1de09..d7895019f2cc 100644
--- a/dev-python/pyclutter/pyclutter-1.3.2-r1.ebuild
+++ b/dev-python/pyclutter/pyclutter-1.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclutter/pyclutter-1.3.2-r1.ebuild,v 1.1 2011/02/11 21:08:58 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclutter/pyclutter-1.3.2-r2.ebuild,v 1.1 2011/02/18 07:17:14 nirbheek Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2:2.6"
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples"
 
 SLOT="1.0"
-RDEPEND=">=dev-lang/python-2.5
+RDEPEND="
 	>=dev-python/pygtk-2.8.0
 	>=dev-python/pygobject-2.21.3
 	>=dev-python/pycairo-1.0.2
@@ -23,6 +23,15 @@ DEPEND="${RDEPEND}
 	doc? ( dev-libs/libxslt )"
 EXAMPLES="examples/{*.py,*.png}"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	python_convert_shebangs --recursive 2 examples codegen
+	default_src_prepare
+}
+
 src_configure() {
 	ln -sf $(type -P true) py-compile
 	local myconf="
diff --git a/dev-python/pyclutter/pyclutter-1.3.2.ebuild b/dev-python/pyclutter/pyclutter-1.3.2.ebuild
deleted file mode 100644
index f803bbb4df8b..000000000000
--- a/dev-python/pyclutter/pyclutter-1.3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclutter/pyclutter-1.3.2.ebuild,v 1.1 2011/01/12 05:46:23 nirbheek Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils python clutter
-
-DESCRIPTION="Python bindings for Clutter"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-SLOT="1.0"
-RDEPEND=">=dev-lang/python-2.5
-	>=dev-python/pygtk-2.8.0
-	>=dev-python/pygobject-2.21.3
-	>=dev-python/pycairo-1.0.2
-	>=media-libs/clutter-1.4.0:${SLOT}"
-DEPEND="${RDEPEND}
-	doc? ( dev-libs/libxslt )"
-EXAMPLES="examples/{*.py,*.png}"
-
-src_configure() {
-	ln -sf $(type -P true) py-compile
-	local myconf="
-		--with-clutterx11=yes
-		--with-clutterglx=yes
-		$(use_enable doc docs)"
-
-	econf ${myconf}
-}
-
-src_install() {
-	# FIXME: Parallel make failure in emake install
-	MAKEOPTS="-j1" clutter_src_install
-}
-
-pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/clutter
-	python_need_rebuild
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/lib*/python*/site-packages/clutter
-}