Pin dependencies to appropriate slots and use EAPI 3.

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

2 files changed, 32 insertions, 27 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/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