[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild

[Alexis Ballier (aballier)]

aballier    10/11/02 22:16:09

  Modified:             ffmpeg-9999.ebuild
  Log:
  typo
  
  (Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

Revision  Changes    Path
1.25                 media-video/ffmpeg/ffmpeg-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.24&r2=1.25

Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ffmpeg-9999.ebuild	2 Nov 2010 21:38:15 -0000	1.24
+++ ffmpeg-9999.ebuild	2 Nov 2010 22:16:09 -0000	1.25
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.24 2010/11/02 21:38:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.25 2010/11/02 22:16:09 aballier Exp $
 
 EAPI="2"
 
@@ -43,7 +43,7 @@
 	dirac? ( media-video/dirac )
 	encode? (
 		faac? ( media-libs/faac )
-		mp3? ( >=media-sound/lame--3.98.3 )
+		mp3? ( >=media-sound/lame-3.98.3 )
 		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20101029 )

[gentoo-commits] gentoo-x86 commit in media-video/ffmpeg: ffmpeg-9999.ebuild

[Alexis Ballier (aballier)]

aballier    11/01/22 13:34:47

  Modified:             ffmpeg-9999.ebuild
  Log:
  no need to set subversion version manually with git...
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.29                 media-video/ffmpeg/ffmpeg-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild?r1=1.28&r2=1.29

Index: ffmpeg-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ffmpeg-9999.ebuild	21 Jan 2011 15:04:55 -0000	1.28
+++ ffmpeg-9999.ebuild	22 Jan 2011 13:34:47 -0000	1.29
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.28 2011/01/21 15:04:55 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.29 2011/01/22 13:34:47 aballier Exp $
 
 EAPI="2"
 
@@ -79,11 +79,7 @@
 "
 
 src_prepare() {
-	if [ "${PV#9999}" != "${PV}" ] ; then
-		# Set SVN version manually
-		subversion_wc_info
-		sed -i -e "s/UNKNOWN/SVN-r${ESVN_WC_REVISION}/" "${S}/version.sh" || die
-	elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 		sed -i -e "s/UNKNOWN/SVN-r${FFMPEG_REVISION}/" "${S}/version.sh" || die
 	fi
 }