Pin dependencies to appropriate slots and use EAPI 3.

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

3 files changed, 44 insertions, 29 deletions

diff --git a/media-video/flumotion/ChangeLog b/media-video/flumotion/ChangeLog
index 524257f6b3f8..789633f2d347 100644
--- a/media-video/flumotion/ChangeLog
+++ b/media-video/flumotion/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/flumotion
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.20 2010/08/08 16:00:55 jmbsvicetto Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/ChangeLog,v 1.21 2011/03/28 22:32:59 eva Exp $
+
+  28 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> flumotion-0.6.2.ebuild:
+  Pin dependencies to appropriate slots and use EAPI 3.
 
   08 Aug 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/media-video/flumotion/Manifest b/media-video/flumotion/Manifest
index e9885cc845b1..d828d9a17e2e 100644
--- a/media-video/flumotion/Manifest
+++ b/media-video/flumotion/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX flumotion-0.5.3-missing-files.diff 5919 RMD160 6b31378a3e1de97b9abfb17bef10ae3a8692f4b0 SHA1 04b973205134770fac294a692cf4c05677d74f7e SHA256 db8714e59ff820bda7bef9bc6a3c5af5c6e085b2d74574da12c111a25dce3bc3
 AUX flumotion-init-0.2.0 308 RMD160 29c6adb1376b3220e2f16ef9afc6ac61a3d30dc1 SHA1 a9ff20ef595db41111b8a5e2f70378e59f83b5a8 SHA256 841a5d9c6cd898c5c66143c64903930d62b7482c3b8ee5d38099b775178cba87
 DIST flumotion-0.4.1.tar.bz2 957882 RMD160 94148eaeed10a77c64a0ae09727d3475519d9412 SHA1 3f7524f69295606feba05a4e2b600ebd24f8450b SHA256 a24640d8ca9c485d7611880193f18e5ae62af07e3b9464904f3602277f1d4097
@@ -9,6 +12,13 @@ EBUILD flumotion-0.4.1.ebuild 2871 RMD160 5c2430fa290db69955871f50bb6b5ae7fdb3e0
 EBUILD flumotion-0.5.2.ebuild 2933 RMD160 538f746663f31171ee6aca626463d93be58d0bf6 SHA1 a3837bc73d8b0c3839cdbf08db7140210c20f4b8 SHA256 21c2dce18ea020d5831e95d8ad003cb9255c3c64051327205099d3bf3b8fc7c2
 EBUILD flumotion-0.5.3.ebuild 3024 RMD160 6759e34d6bcd31b0556ea7ca2c49d60207c15367 SHA1 63d3d658afdb76d3493d66c83905e9f766a72648 SHA256 d9eefc12788bdbaa7ad0ff25f092c5723f9290b521b33c96488339e665542c50
 EBUILD flumotion-0.6.1.ebuild 2958 RMD160 066185375cbd76a8740fb4dd8c2974f486e78ede SHA1 210e439b1b35e14b5fed98fc7f0dcbde97596e2f SHA256 d9e98998633c0b09fd9437468524f1c39eac4bc46afea20c24536465c6653ff7
-EBUILD flumotion-0.6.2.ebuild 2954 RMD160 ebe4722fc84d58ddee5b2683a200b7bf89612805 SHA1 d8f43aedc10b252ebc1c390bd8acebdd69dddafa SHA256 a317e551a62f8cfe029d1d8d821ab698ddc035c93dfb967e7bb85d519b7ce51c
-MISC ChangeLog 3001 RMD160 2d01176533fa01d9b00cd06ad89dfd3b11d536fd SHA1 98765186f65be11cd216cc1c476ae0872052e02c SHA256 93039a19ba4c50db5659dee6a07fd2cefd7d8df1b1adba144b246d4b880aec25
+EBUILD flumotion-0.6.2.ebuild 2925 RMD160 089ea087f622fabbcbf47b7152d0c69dc00b13ae SHA1 7458f0d3d534f02bf7b654908dc9cedf4b968c94 SHA256 08c3dae330da1c7c2d33150f9de72cde2486502ce67a58b53fd1ac0c6c3f74f7
+MISC ChangeLog 3128 RMD160 2c852a503476b334663e900b3fecbcdfc856f6b0 SHA1 adf2f0c04a084c3a422fbb07523cd36547e3635c SHA256 c28fd7f3a9245a8a40f4486f03b7a35f34cd1b44b0fd41ba7eb812dc625b179b
 MISC metadata.xml 164 RMD160 5d4062e422bbf6c0cb9f94a3282f6f31dd2ca54e SHA1 d9f131bae0f8e5ed9fe85e0f23c8883cf8886073 SHA256 63f0c98dbf90a122aa2c9bd6088d3b8a7de6b79f90558e53d175603207f1b01d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2RDKEACgkQ1fmVwcYIWAY2LwCfQbBftLqqON/qNdYwPCNLq3Va
+W4kAnjlk10A1uNx+jC+ggboCgdjpORAd
+=YFew
+-----END PGP SIGNATURE-----
diff --git a/media-video/flumotion/flumotion-0.6.2.ebuild b/media-video/flumotion/flumotion-0.6.2.ebuild
index d8ef60e917cc..ec06297b4c1a 100644
--- a/media-video/flumotion/flumotion-0.6.2.ebuild
+++ b/media-video/flumotion/flumotion-0.6.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.6.2.ebuild,v 1.1 2010/07/04 06:05:00 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/flumotion/flumotion-0.6.2.ebuild,v 1.2 2011/03/28 22:32:59 eva Exp $
+
+EAPI="3"
 
 inherit eutils gnome2
 
@@ -13,23 +15,23 @@ KEYWORDS="~x86 ~amd64"
 IUSE="v4l speex jpeg dv"
 SLOT="0"
 
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2.4
-	>=gnome-base/libglade-2
-	>=media-libs/gstreamer-0.10.11
-	>=media-libs/gst-plugins-base-0.10.11
-	=media-libs/gst-plugins-good-0.10*
-	=media-plugins/gst-plugins-gnomevfs-0.10*
-	=media-plugins/gst-plugins-ogg-0.10*
-	=media-plugins/gst-plugins-theora-0.10*
-	=media-plugins/gst-plugins-vorbis-0.10*
-	=media-plugins/gst-plugins-libpng-0.10*
-	=dev-python/gst-python-0.10*
-	v4l? ( =media-plugins/gst-plugins-v4l-0.10* )
-	speex? ( =media-plugins/gst-plugins-speex-0.10* )
-	dv? ( =media-plugins/gst-plugins-dv-0.10*
-	      =media-plugins/gst-plugins-raw1394-0.10* )
-	>=dev-python/pygtk-2.8.6
+RDEPEND=">=x11-libs/gtk+-2.4:2
+	>=dev-libs/glib-2.4:2
+	gnome-base/libglade:2.0
+	>=media-libs/gstreamer-0.10.11:0.10
+	>=media-libs/gst-plugins-base-0.10.11:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-gnomevfs:0.10
+	media-plugins/gst-plugins-ogg:0.10
+	media-plugins/gst-plugins-theora:0.10
+	media-plugins/gst-plugins-vorbis:0.10
+	media-plugins/gst-plugins-libpng:0.10
+	dev-python/gst-python:0.10
+	v4l? ( media-plugins/gst-plugins-v4l:0.10 )
+	speex? ( media-plugins/gst-plugins-speex:0.10 )
+	dv? ( media-plugins/gst-plugins-dv:0.10
+	      media-plugins/gst-plugins-raw1394:0.10 )
+	>=dev-python/pygtk-2.8.6:2
 	>=dev-python/twisted-2.0
 	>=dev-python/twisted-web-0.5.0-r1
 	>=dev-python/twisted-names-0.2.0
@@ -45,18 +47,18 @@ DOCS="AUTHORS COPYING ChangeLog INSTALL \
 	  LICENCE.Flumotion LICENCE.GPL \
 	  NEWS README TODO"
 
-src_unpack() {
-	unpack ${A} && cd "${S}"
-}
-
-src_compile() {
+src_configure() {
 	addpredict "$(unset HOME; echo ~)/.gconf"
 	addpredict "$(unset HOME; echo ~)/.gconfd"
 	mkdir -p "${T}/home"
 	export HOME="${T}/home"
 	export GST_REGISTRY=${T}/home/registry.cache.xml
 	unset LINGUAS
-	econf --localstatedir=/var || die
+
+	econf --localstatedir=/var
+}
+
+src_compile() {
 	emake -j1 || die
 	# fix ${exec_prefix} not being expanded
 	cd "${S}"/bin