Enable support for multiple python slots installations. Use slot dependency for pygtk. Clean up old revisions.

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

6 files changed, 39 insertions, 227 deletions

diff --git a/media-video/pitivi/ChangeLog b/media-video/pitivi/ChangeLog
index 16cc942be775..580249d41494 100644
--- a/media-video/pitivi/ChangeLog
+++ b/media-video/pitivi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/pitivi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/ChangeLog,v 1.22 2011/01/31 06:12:00 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/ChangeLog,v 1.23 2011/02/03 22:24:28 eva Exp $
+
+  03 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> -pitivi-0.11.3.ebuild,
+  -pitivi-0.13.1.ebuild, -pitivi-0.13.3.ebuild, pitivi-0.13.5.ebuild:
+  Enable support for multiple python slots installations. Use slot dependency
+  for pygtk. Clean up old revisions.
 
 *pitivi-0.13.5 (31 Jan 2011)
 
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 860c8e573f61..6abefd8de402 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,14 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pitivi-0.11.3-reserved-word.patch 1619 RMD160 0522af286af741ee4f83a3be2cc6180cf5ac6a51 SHA1 bbe1ed1715ca74392dc85d58ead92e723ba84e7b SHA256 cb06fc46e86cf1649ada4873a824c113e91a24090b88fdb046b3469bff4ce62b
 AUX pitivi-0.13.5-work-with-old-good.patch 868 RMD160 73fd89ead04bf7d09d19615b5761e8332a4923a2 SHA1 c24b614e97c08140b69c0f1856cc5401f4fe539c SHA256 3728c9686242020ebe7af4f24e629378b58b14e57d9f12905d438c29bc8fbe1a
-DIST pitivi-0.11.3.tar.bz2 431581 RMD160 ed07c2989e90163513f000211849cf8afae4dc0d SHA1 5206a73409e072ad1ddc9e22dc1228d377f9e9fc SHA256 bc9af6a1b8a20d90171c5c147e5e18cff8e4469bbbf37f054c80c1d23bfe52a7
-DIST pitivi-0.13.1.tar.bz2 551183 RMD160 d08297bed705f6ded7d963218cd549a537a92b57 SHA1 9ec640a2501c7624990985fcf9abd74420b897eb SHA256 d3b96fe6b89c50f04da19dbd09453f41f823d85906a15fa08f44821635c31245
-DIST pitivi-0.13.3.tar.bz2 595120 RMD160 3daf70faa3e3ccecadf9f3496b9f9bddbc0fb92d SHA1 6117ddb74f139d260a86f485e63d66355d192dd2 SHA256 f0a8678394c54eef994c3af9810be9d0bb9a59d18b17b475b5b45366a8d19ac3
 DIST pitivi-0.13.4.tar.bz2 671937 RMD160 8237538385d9a40f762d2ee5c7837169bb831186 SHA1 1dd72cd8589bbaf8551ed82edac2dc279ed13159 SHA256 d0f6e0dd40da4c3a369b8f73711e705fa05e59620c2d0ba0c2423ccdeb3c8737
 DIST pitivi-0.13.5.tar.bz2 726821 RMD160 000dc20ee2f02bd1a989899d7a0222830bf18ce4 SHA1 294042289ed016a4d8a746402ba2fc94db149fa1 SHA256 f3ea98f40941a6c8c85ab636baacc62514d1ffc2dda487c51cb019026677bf8d
-EBUILD pitivi-0.11.3.ebuild 1651 RMD160 7d4a1d44553399a7fc22efba0b8d32ba81b2818f SHA1 00f168da64aaeca0e982f3d1479da68ac14debc8 SHA256 99c78fcd783e590aa20f354293509e7f9a8435ada6b7d3b46cd1c43956dbd959
-EBUILD pitivi-0.13.1.ebuild 1715 RMD160 37fac17372b75e6bbb4a51ceb8776e35aa55c51b SHA1 44e10ae642cd279c5072834f6a504845385ad926 SHA256 1802440267096e057e2679717ff8af72f91baf36f7a4d02cb8f510c41dc35285
-EBUILD pitivi-0.13.3.ebuild 1755 RMD160 4d34d54a053125d106d792c4849273767ebf66a1 SHA1 5468889324d18c746f3ee789110c1d04faf8b50c SHA256 1df0c3be909a144131f2a4e4bd86cf26fa91f67f7a59e87be2ab22b321cfac7f
 EBUILD pitivi-0.13.4.ebuild 1839 RMD160 c5f72cd21f4ebc416da87bdcaa7b851ee3b4169a SHA1 2a3abb7ef72ec90b8bce66600268bb6325791bff SHA256 6dfcbef67560d5559b8c658980f486668eafa1b8732bb1cdb2b0af654ae961b2
-EBUILD pitivi-0.13.5.ebuild 1896 RMD160 fd23a49187650a054620701fec17404e5b19b796 SHA1 e5983377cc6ec27eebc6f540ae09cce10ff92503 SHA256 48b467753d59868cc8352046f320a16a15fbdc063720efbf16aec29f2294ac71
-MISC ChangeLog 3295 RMD160 a7e0ab83d51d54d932bd43c6788e089d60bb6d80 SHA1 8a8128f5b4152eaaef1d07fd165b29250438b62a SHA256 ed94a8087d2ab26021a698395a8876b35cba9455806984e6f5b14408d5c37983
+EBUILD pitivi-0.13.5.ebuild 2059 RMD160 df73cf50a786db93486dfa8e594ca0e162bf36ff SHA1 b622e16b0a4e5dfc36543e1677fdaf37144dc8db SHA256 953d4a755ea46202aaa5723cea2b07865f40b4e52c269a9e22fa824be9290f5a
+MISC ChangeLog 3549 RMD160 bdf503812e5694c6a156c276f51b177f5071ce44 SHA1 d795117914e724288876d731e487847f4dd27042 SHA256 01d990de1f1e285bf0c22c34ca7df567c2066f36663d90ae9085cb6c4e5fc191
 MISC metadata.xml 219 RMD160 c3357aa8edfab7033261267720250a36fc96e7f8 SHA1 fef872e700565309235dbfe0f45d81a1692829c0 SHA256 c76952c442b16a3d2efe40e95e84f1110ec9b13775882012b30a25ca3b063ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1LKygACgkQ1fmVwcYIWAabngCg5wD/d7VKWPRCLn88a80DjiWc
+zTgAoIiVSNRDi5dOhnUBWthYemhmo4yu
+=OL0H
+-----END PGP SIGNATURE-----
diff --git a/media-video/pitivi/pitivi-0.11.3.ebuild b/media-video/pitivi/pitivi-0.11.3.ebuild
deleted file mode 100644
index 1c00752e21bf..000000000000
--- a/media-video/pitivi/pitivi-0.11.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.11.3.ebuild,v 1.6 2009/10/04 20:04:39 arfrever Exp $
-
-inherit gnome2 python eutils
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="http://www.pitivi.org"
-SRC_URI="mirror://gnome/sources/${PN}/0.11/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.5
-	>=dev-python/pygtk-2.8.0
-	dev-python/dbus-python
-	>=dev-python/gconf-python-2.12
-	dev-python/pycairo
-	dev-python/pygoocanvas
-	net-zope/zope-interface
-
-	>=media-libs/gstreamer-0.10.13.1
-	>=dev-python/gst-python-0.10.6
-	>=media-libs/gnonlin-0.10.10
-	>=media-libs/gst-plugins-base-0.10.0
-	>=media-libs/gst-plugins-good-0.10.0
-	>=media-plugins/gst-plugins-ffmpeg-0.10.0
-	>=media-plugins/gst-plugins-xvideo-0.10.0
-	>=media-plugins/gst-plugins-libpng-0.10.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	>=dev-util/intltool-0.35.5"
-
-DOCS="AUTHORS ChangeLog NEWS RELEASE"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}/${P}-reserved-word.patch" || die "epatch failed"
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_compile() {
-	addpredict $(unset HOME; echo ~)/.gconf
-	addpredict $(unset HOME; echo ~)/.gconfd
-	addpredict $(unset HOME; echo ~)/.gstreamer-0.10
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize "/usr/$(get_libdir)/${PN}/python/${PN}"
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup "/usr/$(get_libdir)/${PN}/python/${PN}"
-}
diff --git a/media-video/pitivi/pitivi-0.13.1.ebuild b/media-video/pitivi/pitivi-0.13.1.ebuild
deleted file mode 100644
index efd33c0ce921..000000000000
--- a/media-video/pitivi/pitivi-0.13.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.13.1.ebuild,v 1.3 2009/10/04 20:04:39 arfrever Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 python eutils
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="http://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.5
-	>=dev-python/pygtk-2.12
-	dev-python/dbus-python
-	>=dev-python/gconf-python-2.12
-	dev-python/pycairo
-	dev-python/pygoocanvas
-	net-zope/zope-interface
-	gnome-base/librsvg
-
-	>=media-libs/gstreamer-0.10.23
-	>=dev-python/gst-python-0.10.15
-	>=media-libs/gnonlin-0.10.10.3
-	>=media-libs/gst-plugins-base-0.10.0
-	>=media-libs/gst-plugins-good-0.10.0
-	>=media-plugins/gst-plugins-ffmpeg-0.10.0
-	>=media-plugins/gst-plugins-xvideo-0.10.0
-	>=media-plugins/gst-plugins-libpng-0.10.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	>=dev-util/intltool-0.35.5"
-
-DOCS="AUTHORS ChangeLog NEWS RELEASE"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_configure() {
-	addpredict $(unset HOME; echo ~)/.gconf
-	addpredict $(unset HOME; echo ~)/.gconfd
-	addpredict $(unset HOME; echo ~)/.gstreamer-0.10
-
-	gnome2_src_configure
-}
-
-src_test() {
-	export XDG_CONFIG_HOME="${WORKDIR}/.config"
-	export XDG_DATA_HOME="${WORKDIR}/.local"
-	emake check || die "tests failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize "/usr/$(get_libdir)/${PN}/python/${PN}"
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup "/usr/$(get_libdir)/${PN}/python/${PN}"
-}
diff --git a/media-video/pitivi/pitivi-0.13.3.ebuild b/media-video/pitivi/pitivi-0.13.3.ebuild
deleted file mode 100644
index d3a1b1c1c8e3..000000000000
--- a/media-video/pitivi/pitivi-0.13.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.13.3.ebuild,v 1.2 2009/10/04 20:04:39 arfrever Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 python eutils
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="http://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/python-2.5
-	>=dev-python/pygtk-2.14.0
-	dev-python/dbus-python
-	>=dev-python/gconf-python-2.12
-	dev-python/pycairo
-	dev-python/pygoocanvas
-	net-zope/zope-interface
-	gnome-base/librsvg
-
-	>=media-libs/gstreamer-0.10.24
-	>=dev-python/gst-python-0.10.16
-	>=media-libs/gnonlin-0.10.13
-	>=media-libs/gst-plugins-base-0.10.0
-	>=media-libs/gst-plugins-good-0.10.0
-	>=media-plugins/gst-plugins-ffmpeg-0.10.0
-	>=media-plugins/gst-plugins-xvideo-0.10.0
-	>=media-plugins/gst-plugins-libpng-0.10.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	>=dev-util/intltool-0.35.5"
-
-DOCS="AUTHORS ChangeLog NEWS RELEASE"
-
-# Tests need running X
-RESTRICT="test"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-src_configure() {
-	addpredict $(unset HOME; echo ~)/.gconf
-	addpredict $(unset HOME; echo ~)/.gconfd
-	addpredict $(unset HOME; echo ~)/.gstreamer-0.10
-
-	gnome2_src_configure
-}
-
-src_test() {
-	export XDG_CONFIG_HOME="${WORKDIR}/.config"
-	export XDG_DATA_HOME="${WORKDIR}/.local"
-	emake check || die "tests failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize "/usr/$(get_libdir)/${PN}/python/${PN}"
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup "/usr/$(get_libdir)/${PN}/python/${PN}"
-}
diff --git a/media-video/pitivi/pitivi-0.13.5.ebuild b/media-video/pitivi/pitivi-0.13.5.ebuild
index 60263ccf7304..0ced2c414fa0 100644
--- a/media-video/pitivi/pitivi-0.13.5.ebuild
+++ b/media-video/pitivi/pitivi-0.13.5.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.13.5.ebuild,v 1.1 2011/01/31 06:12:00 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.13.5.ebuild,v 1.2 2011/02/03 22:24:28 eva Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit gnome2 python eutils virtualx
 
@@ -15,8 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/python-2.5
-	>=dev-python/pygtk-2.14.0
+RDEPEND="
+	>=dev-python/pygtk-2.14:2
 	dev-python/dbus-python
 	>=dev-python/gconf-python-2.12
 	dev-python/pycairo
@@ -27,16 +29,19 @@ RDEPEND=">=dev-lang/python-2.5
 	>=media-libs/gstreamer-0.10.28
 	>=dev-python/gst-python-0.10.19
 	>=media-libs/gnonlin-0.10.16
-	>=media-libs/gst-plugins-base-0.10.0
-	>=media-libs/gst-plugins-good-0.10.0
-	>=media-plugins/gst-plugins-ffmpeg-0.10.0
-	>=media-plugins/gst-plugins-xvideo-0.10.0
-	>=media-plugins/gst-plugins-libpng-0.10.0"
+	>=media-libs/gst-plugins-base-0.10
+	>=media-libs/gst-plugins-good-0.10
+	>=media-plugins/gst-plugins-ffmpeg-0.10
+	>=media-plugins/gst-plugins-xvideo-0.10
+	>=media-plugins/gst-plugins-libpng-0.10"
 DEPEND="${RDEPEND}
 	dev-python/setuptools
 	>=dev-util/intltool-0.35.5"
 
-DOCS="AUTHORS ChangeLog NEWS RELEASE"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS RELEASE"
+	python_set_active_version 2
+}
 
 src_prepare() {
 	gnome2_src_prepare
@@ -61,11 +66,17 @@ src_test() {
 	export XDG_DATA_HOME="${WORKDIR}/.local"
 	# Force Xvfb to be used
 	unset DISPLAY
+	unset DBUS_SESSION_BUS_ADDRESS
 	# pitivi/configure.py checks this in get_pixmap_dir()
 	mkdir "${S}/.git"
 	Xemake check || die "tests failed"
 }
 
+src_install() {
+	gnome2_src_install
+	python_convert_shebangs -r 2 "${D}"
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_mod_optimize "/usr/$(get_libdir)/${PN}/python/${PN}"