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

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 15 insertions, 206 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/Manifest b/media-video/pitivi/Manifest
index 00a486d99b13..e9635df09204 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -2,28 +2,14 @@
 Hash: SHA256
 
 AUX pitivi-0.13.5-work-with-old-good.patch 868 SHA256 3728c9686242020ebe7af4f24e629378b58b14e57d9f12905d438c29bc8fbe1a SHA512 371967b34772c5e0011568fb03d5e5fde71d60aa73166137173e4bf4665fe18e475b29bbb74cda1fbe2a94c6982c85f13eca57cbc78ea31f7fc69ad33f217719 WHIRLPOOL d360c9c89c0c1f6a3d06ca41909c478b74783186f931fd5009ddb070c84a27f6cab0b8f1abc03fdb8d2d7e5c5c59d7bcb48e372fa3530c43a2636b1a5f3ccb6e
-DIST pitivi-0.13.5.tar.bz2 726821 SHA256 f3ea98f40941a6c8c85ab636baacc62514d1ffc2dda487c51cb019026677bf8d
-DIST pitivi-0.14.0.tar.bz2 1606223 SHA256 d5ab54c1c4c7c1431fc3da67e977a9d94eb0828246ec2bb4e420de49cf5df629
 DIST pitivi-0.14.1.tar.bz2 1597657 SHA256 0abf7206c84cd1b6e24170a5100c7b69234291ac2fa3b79a6bf73ea586156f0b SHA512 ed58ac434fb3e60847054435395de8687b50ed99cc175ed3eccccb6a83e727cf41b753656e45fd455af1393d43be812c7c95358d7156b34e4a4125f201940202 WHIRLPOOL c49d7b50245f05e14d6c1cf1847b72db407d8d0cff78ce0f084d0a4e5e83af4fd0105a9d8eda3e5d15b27e535705fa924be197d51ac740e6dc7595679e32f17f
-EBUILD pitivi-0.13.5.ebuild 2045 SHA256 8440ce3153339dae67bd9c4f6d974b0934f1d221d60703ac640a1b443abc718e SHA512 e70560e2da27d444a00c25cf5bd37e4237e87d7dfa09d96bcadb7acf62882d4619a07c3b589bbbf61e0cb64db88f6ba817bbf54f9afe385182e08d460a21dac2 WHIRLPOOL 4785cf64102ea1c4ff54b527389bd3133463d418a2f643612e8072d2051fd54004d86e285a5038fe1bbaa6ba7eb49df7b5041f64f3c0c8afaa6968ba14e79d7f
-EBUILD pitivi-0.14.0.ebuild 2258 SHA256 9aebb97b38c4de68ee13890c36dcce7101af11c4080149aa784a56f639e36beb SHA512 a2b854b34d6d2f807b119589ce84272cf33caba80d5743f38c067c30cd89b33ef9a40074bfdeaf22150e4fc2ca33afc875887e8c2198c63d987beeefd9c43eaa WHIRLPOOL f29cfe57f797d8fadb381360bafbe67f3654aea7ebc404c773e5601c751a7ed00d232bb5787ac815db552b6e36bb53d68c87ff9f86be8bf8c751f137cecfe2c3
-EBUILD pitivi-0.14.1.ebuild 2315 SHA256 cd82531b2d7182c9f1f2a7908d096170967f8833d38214e86f135e9d6ff9ba94 SHA512 94943c2733a3292e7cec62fea22c4f5bb1f8aeee049352070459965e84b8f4acf499f6de3e41abe5de0f45aff469c24dfadc7a0d7612c1c57b9929c892c3a5cc WHIRLPOOL d0a09b5aa366478e1303215161aa1e38dfc689d2a7119720f12d2dbb7bd136acf5db9d7f4c524b5ccadd50d14895406c4ad3b6e7eca9559836b5dc3d5925b953
-MISC ChangeLog 4256 SHA256 11c55bd0a75e59600b733a8d72b5fbb02fe7dccec95c12ffeb0b3ec11e151e44 SHA512 f1013925fb605b5ef9b64cb3d3ba262b49eb990ecd2b11a049e0cc166de936b517486095f94726ec82e9e140f9e02d216ff2e501776e730a19a7874d8dc46cf5 WHIRLPOOL e90467e2036e1b9bd32d4717fabbd24cb7b369488b374f4513a30582437a8daa1fdc4812c2867410103705a54a67b0417ffcbfe1a8f9ee83bb1344037ddf0f07
+EBUILD pitivi-0.14.1.ebuild 2261 SHA256 f2e49f030f98b71c1fe5598b0a043b28ae1b35a2a902f5ad8a77461fdf470e4b SHA512 fe9916a8289050644dded1611d5dad3e08c0032961d8ec6200e263768ce39bdc10755b9f9b2602a3c7d97f4623a5aa180d00a59ace799a7a95229cb8572ea07c WHIRLPOOL 15051f167687687984afaf7cb3f2ba811b70f916c5ee384b7ce61639745a8296a745f1e459d55b9f88aee0e5f65f5c23face601fcd688e73c3cdb8853b00e15d
+MISC ChangeLog 4491 SHA256 ea7aff1c004fb56ee9623944d26463f66f006dbdd1dabc993d7d2cc8f3c45288 SHA512 6b9e3a2e406fbf231e3e6852d5e6f0a9260f82fa1523343e0c394a47b5cebcb71f3bdd6f40064329130253209d21edf4a320cc136e852cd8dca81e3ff3faf47e WHIRLPOOL 7ec4b74e7c860e0a92e02d1e7c4e6c31f4d35f9c9b33ff4ffc391f6715f32a029244c28a7d602b12435a953cda27ef958ebe8c61b1754c11171aa2694f9c00e5
 MISC metadata.xml 281 SHA256 76aa967e8be060cc0cea2771cc604381c3f2b332d8e68265c9c740239955023a SHA512 3277bad8e1c9114a519d629902a46d2c3cf25e36ab1ea0be9993e48b308173c7526884742bea3c335227e66c1e8cc81db8b9eb7a7337aea7352b1c366c773006 WHIRLPOOL 8cc7506fa75130fd10e5d4b1501ae72985af95683dad460c7a5feb579afdef739d5274056b2a8916013a13a08fb7deef96dcd6a786c5bbca8067900c9143e144
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQYRrZAAoJEO/kOhxWD91kGUMP/0C/NR/5jV+10ndTkWWmbVOZ
-U6TI6T9ldvgi1iz5qcxHZRbB0gGatE0+o2Q6Zp6PshllCsqguX9xtdD4tNbZuDQo
-gNF66NgPbAd7SL5trNso51g69LrrFR9GhRH9VPooL/ZIAq0n1tud6rupSiyTs/mQ
-21M8fEP4aiWmW4mGW7ShVb6DT7onjNUIO8nk4BVOph9FuYNTXr6D6K4KWiMJgpnH
-C8VEQC7P1xqH3QM/jIbNtn4kV28oY8yygWv9lmDvgBEWKG0pkYjxl52x3Wv8Ym+o
-TNEPHVrsxWzSBb9Q7JlL+eqrKIXaK+Mw2iS/LEMtdkFjGUop5hLJCFeCd5tkqPO6
-VGLBhF1P3fqMlT8Tk5w6yDlsTFRSFLKBKB7SINl5eDfovdpY4NSoBau+cAu8Kwxx
-JVjWofCm/hbtlIwNy0z4HX6Mf0b87yuO2PxscrBw3jbZ7cSDK0TkWIHO1Hu2OFd9
-unR8YVcAiENAxFwdxNup+IEi9F6Io+1N3P+ozRnHaDpvopBs1GqU10Dugy4lsOyS
-r0tjHqPEkQkrNEFpSrOHpJmYWRXazjO85GJRql0DXsfsctbwuOgyg9+fNUQqaWjB
-AvabK3J4LxEGJKZ19kEKOYuWZR/prfdZFtJa+cjxTqwltqP9kxmrR5yrMj1sW86D
-CNqHcRFR3v+pNcC/TISI
-=D15M
+iEYEAREIAAYFAlCJpt0ACgkQ1fmVwcYIWAbX7wCgz/e8cTfkYgH3h5HK97zHb0i+
+BuIAn3Ffvir9qD3kT7yiM1L3xEywDMws
+=nOBH
 -----END PGP SIGNATURE-----
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() {