version bump to 1.3

(Portage version: 2.1.6.11/cvs/Linux ppc)

3 files changed, 10 insertions, 61 deletions

diff --git a/net-misc/yaydl/ChangeLog b/net-misc/yaydl/ChangeLog
index 58784a2114b0..cf066e453aef 100644
--- a/net-misc/yaydl/ChangeLog
+++ b/net-misc/yaydl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/yaydl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/yaydl/ChangeLog,v 1.1 2009/05/10 08:47:00 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/yaydl/ChangeLog,v 1.2 2009/05/17 15:07:52 volkmar Exp $
+
+*yaydl-1.3 (17 May 2009)
+
+  17 May 2009; Mounir Lamouri <volkmar@gentoo.org>
+  -files/yaydl-1.2-gentoo.patch, -yaydl-1.2.ebuild, +yaydl-1.3.ebuild:
+  Version bump to 1.3
 
 *yaydl-1.2 (10 May 2009)
 
diff --git a/net-misc/yaydl/files/yaydl-1.2-gentoo.patch b/net-misc/yaydl/files/yaydl-1.2-gentoo.patch
deleted file mode 100644
index 8fcf6761463c..000000000000
--- a/net-misc/yaydl/files/yaydl-1.2-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- yaydl.pl.old	2009-05-10 10:18:59.000000000 +0200
-+++ yaydl.pl	2009-05-10 10:30:02.000000000 +0200
-@@ -521,15 +521,15 @@
- 	my $mencoder = which "mencoder";
- 	my @commands;
- 	my $return;
-+	if(! $ffmpeg){
-+		push (@commands, "ffmpeg -i \"$source\" \"$encode\"");
-+		print "ffmpeg: found\n";
-+	}
- 	if (! $mencoder){
- 		push(@commands, "mencoder \"$source\" -oac mp3lame -lameopts abr:br=92" .
- 			" -ovc xvid -xvidencopts bitrate=150 -o \"$encode\"");
- 		print "mencoder: found\n";
- 	}
--	if(! $ffmpeg){
--		push (@commands, "ffmpeg -i \"$source\" \"$encode\"");
--		print "ffmpeg: found\n";
--	}
- 	if($ffmpeg && $mencoder){
- 		$options{'encode'} = 0;
- 		$urls{$base}{'error'} = 
-@@ -561,21 +561,12 @@
- 	my $return = 0;
- 	my $encode = removeextension($source) . ".mp3";
- 	$urls{$base}{'sound'} = $encode;
--	if (which("mplayer") == 1){
-+	if (which("ffmpeg") == 1){
- 		$options{'sound'} = 0;
--		$urls{$base}{'error'} = "mplayer not found - encoding disabled";
-+		$urls{$base}{'error'} = "ffmpeg not found - extracting soundtrack disabled";
- 		return -1;
- 	}
--	if(defined $urls{$base}{'ismp4'}){
--		if (which("ffmpeg") == 1){
--			$urls{$base}{'error'} = "ffmpeg is required to encode mp4-videos!\n";
--			return -1
--		}
--		$return = system("ffmpeg -i \"$source\" -vn -acodec libmp3lame -ab 192k \"$encode\"");
--	}
--	else {
--		$return = system("mplayer -dumpaudio -dumpfile \"$encode\" \"$source\"");
--	}	
-+	$return = system("ffmpeg -i \"$source\" -vn -acodec libmp3lame -ab 192k \"$encode\"");
- 	if ($return != 0){
- 		$options{'sound'} = 0;
- 		$options{'tag'} = 0;
diff --git a/net-misc/yaydl/yaydl-1.2.ebuild b/net-misc/yaydl/yaydl-1.3.ebuild
index e79cbc1230e0..a5108f6a7d0f 100644
--- a/net-misc/yaydl/yaydl-1.2.ebuild
+++ b/net-misc/yaydl/yaydl-1.3.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/yaydl/yaydl-1.2.ebuild,v 1.1 2009/05/10 08:47:00 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/yaydl/yaydl-1.3.ebuild,v 1.1 2009/05/17 15:07:52 volkmar Exp $
 
 EAPI="2"
 
-inherit eutils
-
 DESCRIPTION="Yet Another Youtube DownLoader which is downloading more than youtube"
 HOMEPAGE="http://pdes-net.org/x-haui/yaydl.html"
 SRC_URI="http://pdes-net.org/x-haui/scripts/perl/yaydl_youtubedownloader/${P}.tar.gz"
@@ -23,19 +21,11 @@ RDEPEND="dev-lang/perl
 	dev-perl/URI
 	encode? ( || ( media-video/ffmpeg[encode]
 		media-video/mplayer[encode,mp3,xvid] ) )
-	soundextract? ( || ( media-video/ffmpeg[encode,mp3] ) )"
+	soundextract? ( || ( media-video/ffmpeg[encode,mp3]
+		( media-video/mplayer media-sound/lame ) ) )"
 
 S=${WORKDIR}/${PN}
 
-# TODO:
-# need from upstream to fix mencoder soundextract and choose a default encoder
-
-src_prepare() {
-	# let ffmpeg doing soundextract and remove mencoder soundextract
-	# making ffmpeg first choice for encoding
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
 src_install() {
 	exeinto /usr/bin
 	newexe ${PN}.pl ${PN} || die "newexe failed"