Pin gstreamer dependencies to slot 0.10. Replace py-compile hack by call to python eclass. Drop old revisions.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 10 insertions, 187 deletions

diff --git a/media-video/pitivi/ChangeLog b/media-video/pitivi/ChangeLog
index 26abb27f9977..a02fe9a281b5 100644
--- a/media-video/pitivi/ChangeLog
+++ b/media-video/pitivi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/pitivi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/ChangeLog,v 1.28 2012/09/25 02:45:47 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/ChangeLog,v 1.29 2012/10/25 20:53:48 eva Exp $
+
+  25 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> -pitivi-0.13.5.ebuild,
+  -pitivi-0.14.0.ebuild, pitivi-0.14.1.ebuild:
+  Pin gstreamer dependencies to slot 0.10. Replace py-compile hack by call to
+  python eclass. Drop old revisions.
 
   25 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> metadata.xml:
   Update metadata.xml; add myself to maintainer, add gnome team, remove hanno
diff --git a/media-video/pitivi/pitivi-0.13.5.ebuild b/media-video/pitivi/pitivi-0.13.5.ebuild
deleted file mode 100644
index ced23566d790..000000000000
--- a/media-video/pitivi/pitivi-0.13.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 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.4 2012/02/05 01:50:23 floppym Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python eutils virtualx multilib
-
-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-python/pygtk-2.14:2
-	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.28
-	>=dev-python/gst-python-0.10.19
-	>=media-libs/gnonlin-0.10.16
-	>=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"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS RELEASE"
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}/${P}-work-with-old-good.patch"
-
-	# 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"
-	# 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}"
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup "/usr/$(get_libdir)/${PN}/python/${PN}"
-}
diff --git a/media-video/pitivi/pitivi-0.14.0.ebuild b/media-video/pitivi/pitivi-0.14.0.ebuild
deleted file mode 100644
index 3aee97c94369..000000000000
--- a/media-video/pitivi/pitivi-0.14.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.14.0.ebuild,v 1.3 2012/02/05 01:50:23 floppym Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2 python eutils virtualx multilib
-
-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="v4l"
-
-# gst-plugins-good-0.10.24 needed for prefer-passthrough property
-# gst-plugins-base-0.10.31 needed for add-borders property, and decodebin2
-COMMON_DEPEND="
-	>=dev-python/pygtk-2.18:2
-	dev-python/pycairo
-
-	>=media-libs/gstreamer-0.10.28:0.10
-	>=dev-python/gst-python-0.10.19
-	>=media-libs/gnonlin-0.10.16"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python
-	>=dev-python/gconf-python-2.12
-	dev-python/pygoocanvas
-	dev-python/pyxdg
-	net-zope/zope-interface
-	gnome-base/librsvg
-
-	>=media-libs/gst-plugins-base-0.10.31:0.10
-	>=media-libs/gst-plugins-good-0.10.24:0.10
-	>=media-plugins/gst-plugins-ffmpeg-0.10:0.10
-	>=media-plugins/gst-plugins-xvideo-0.10.31:0.10
-	>=media-plugins/gst-plugins-libpng-0.10.24:0.10
-
-	v4l? ( media-plugins/gst-plugins-v4l2:0.10 )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	sys-devel/gettext
-	>=dev-util/intltool-0.35.5"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS RELEASE"
-	python_set_active_version 2
-}
-
-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"
-	# Force Xvfb to be used
-	unset DISPLAY
-	unset DBUS_SESSION_BUS_ADDRESS
-	export PITIVI_TOP_LEVEL_DIR="${S}"
-	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}"
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup "/usr/$(get_libdir)/${PN}/python/${PN}"
-}
diff --git a/media-video/pitivi/pitivi-0.14.1.ebuild b/media-video/pitivi/pitivi-0.14.1.ebuild
index 398b1cd7fdfa..9a8d1fd675a2 100644
--- a/media-video/pitivi/pitivi-0.14.1.ebuild
+++ b/media-video/pitivi/pitivi-0.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.14.1.ebuild,v 1.2 2012/02/05 01:50:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/pitivi/pitivi-0.14.1.ebuild,v 1.3 2012/10/25 20:53:48 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -26,8 +26,8 @@ COMMON_DEPEND="
 	dev-python/pycairo
 
 	>=media-libs/gstreamer-0.10.28:0.10
-	>=dev-python/gst-python-0.10.19
-	>=media-libs/gnonlin-0.10.16"
+	>=dev-python/gst-python-0.10.19:0.10
+	>=media-libs/gnonlin-0.10.16:0.10"
 RDEPEND="${COMMON_DEPEND}
 	dev-python/dbus-python
 	>=dev-python/gconf-python-2.12
@@ -55,10 +55,7 @@ pkg_setup() {
 
 src_prepare() {
 	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
+	python_clean_py-compile_files
 }
 
 src_configure() {