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

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

5 files changed, 27 insertions, 219 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/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}"