Cleanup

(Portage version: 2.1_pre1)

6 files changed, 9 insertions, 212 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index fc5fc8117cea..c178afe19833 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.111 2005/12/21 19:52:11 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.112 2005/12/26 11:54:20 lu_zero Exp $
+
+  26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> -ffmpeg-0.4.8.ebuild,
+  -ffmpeg-0.4.9_pre1-r1.ebuild, ffmpeg-0.4.9_p20050226-r3.ebuild:
+  Cleanup
 
   21 Dec 2005; Luis Medinas <metalgod@gentoo.org>
   ffmpeg-0.4.9_p20051216.ebuild:
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
deleted file mode 100644
index 57876b87a1c2..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.ebuild,v 1.15 2005/02/24 16:19:57 luckyduck Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc ~sparc alpha amd64 ia64 arm ~mips hppa"
-IUSE="altivec debug doc dvd encode aac imlib mmx oggvorbis sdl static truetype"
-
-DEPEND="encode? ( >=media-sound/lame-3.92 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
-	doc? ( >=app-text/texi2html-1.64 )
-	aac? ( >=media-libs/faad2-1.1 )
-	dvd? ( >=media-libs/a52dec-0.7.4 )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	imlib? ( >=media-libs/imlib2-1.0.6 )
-	truetype? ( >=media-libs/freetype-2.1.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
-	cd ${S}
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-}
-
-src_compile() {
-	filter-flags -fforce-addr -fPIC
-	# fixes bug #16281
-	use alpha && append-flags -fPIC
-	use amd64 && append-flags -fPIC
-	use hppa && append-flags -fPIC
-
-	local myconf
-	myconf="${myconf} --disable-opts --enable-pp"
-	use mmx || myconf="${myconf} --disable-mmx"
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
-	use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
-	use static || myconf="${myconf} --enable-shared"
-	use sdl || myconf="${myconf} --disable-ffplay"
-	use debug || myconf="${myconf} --disable-debug"
-	use altivec || myconf="${myconf} --disable-altivec"
-
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	make || die "make failed."
-	use doc && make -C doc all
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-#	emake 	DESTDIR=${D} \
-#		MANDIR=${D}/man install || die "Installation failed."
-	dosym /usr/bin/ffmpeg /usr/bin/ffplay
-	dosym /usr/lib/libavcodec-${PV}.so /usr/lib/libavcodec.so
-
-	dodoc COPYING CREDITS Changelog INSTALL README
-	docinto doc
-	dodoc doc/TODO doc/*.html doc/*.texi
-	insinto /etc
-	doins doc/ffserver.conf
-}
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild
index ed0c74594d6b..6a43373109ff 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild,v 1.13 2005/06/09 01:02:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20050226-r3.ebuild,v 1.14 2005/12/26 11:54:20 lu_zero Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -17,14 +17,14 @@ SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tbz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="aac altivec debug doc dv dvd encode imlib mmx oggvorbis oss threads truetype v4l xvid"
+IUSE="aac altivec debug doc dv dvd encode imlib mmx vorbis oss threads truetype v4l xvid"
 
 DEPEND="imlib? ( media-libs/imlib2 )
 		truetype? ( >=media-libs/freetype-2 )
 		sdl? ( >=media-libs/libsdl-1.2.1 )
 		doc? ( app-text/texi2html )
 		encode? ( media-sound/lame )
-		oggvorbis? ( media-libs/libvorbis
+		vorbis? ( media-libs/libvorbis 
 					media-libs/libogg )
 		!alpha? ( aac? ( media-libs/faad2 media-libs/faac ) )
 		dvd? ( >=media-libs/a52dec-0.7.4-r4 )
@@ -80,7 +80,7 @@ src_compile() {
 
 	use encode && use aac && myconf="${myconf} --enable-faac"
 
-	if use oggvorbis ; then
+	if use vorbis ; then
 		myconf="${myconf} --enable-ogg --enable-vorbis"
 	else
 		myconf="${myconf} --disable-ogg --disable-theora"
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild
deleted file mode 100644
index 5ab444531492..000000000000
--- a/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_pre1-r1.ebuild,v 1.2 2005/05/15 02:06:46 flameeyes Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# TODO: --enablea52bin breaks compile
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
-HOMEPAGE="http://ffmpeg.sourceforge.net/"
-MY_P=${P/_/-}
-S=${WORKDIR}/${MY_P}
-SRC_URI="mirror://sourceforge/ffmpeg/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64 ~arm ~mips ~hppa ~ppc-macos"
-IUSE="altivec debug doc dvd encode aac imlib mmx oggvorbis sdl static truetype"
-
-DEPEND="encode? ( >=media-sound/lame-3.92 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0-r1 )
-	doc? ( >=app-text/texi2html-1.64 )
-	aac? ( >=media-libs/faad2-1.1
-	       !alpha? ( >=media-libs/faac-1.23 ) )
-	dvd? ( >=media-libs/a52dec-0.7.4 )
-	sdl? ( >=media-libs/libsdl-1.2.5 )
-	imlib? ( >=media-libs/imlib2-1.0.6 )
-	truetype? ( >=media-libs/freetype-2.1.2 )
-	!<media-video/mplayer-1.0_pre3-r1"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S}
-
-	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
-	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
-
-	if use ppc-macos; then
-		sed -i s:SLIBSUF=".so":SLIBSUF=".dylib": configure
-		epatch ${FILESDIR}/${PN}-osx.patch
-		sed -i -e 's:\$<:\$< -L../libavcodec -lavcodec -L../libavformat -lavformat:g' vhook/Makefile
-		use oggvorbis && sed -i -e 's:ifeq ($(CPU),Darwin):ifeq ($(CPU),Darwin)\
-	LDFLAGS+=-logg:' libavformat/Makefile
-	fi
-
-	#this will allow ffmpeg to be compiled with gcc-3.4.x fixing bug #49383
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		einfo "Compiler used: gcc-3.4.x Applying patch conditionally."
-		epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -fforce-addr -fPIC
-	# fixes bug #16281
-	use alpha && append-flags -fPIC
-	use amd64 && append-flags -fPIC
-	use hppa && append-flags -fPIC
-	use ppc && append-flags -fPIC
-	use ppc-macos && append-flags -fno-common
-
-	local myconf
-	#myconf="${myconf} --disable-opts --enable-pp --enable-shared-pp"
-	myconf="${myconf} --disable-opts --enable-pp --enable-gpl"
-	use mmx || myconf="${myconf} --disable-mmx"
-	use encode && myconf="${myconf} --enable-mp3lame"
-	use oggvorbis && myconf="${myconf} --enable-vorbis"
-	use aac && myconf="${myconf} --enable-faad --enable-faadbin"
-	if ! use alpha; then
-	    use aac && myconf="${myconf} --enable-faac"
-	fi
-	use dvd && myconf="${myconf} --enable-a52"
-	use static || myconf="${myconf} --enable-shared"
-	use sdl || myconf="${myconf} --disable-ffplay"
-	use debug || myconf="${myconf} --disable-debug"
-	use altivec || myconf="${myconf} --disable-altivec"
-
-# Using --enable-a52bin breaks the compile
-	#use dvd && myconf="${myconf} --enable-a52 --enable-a52bin"
-
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	make || die "make failed."
-	use doc && make -C doc all
-
-	filter-flags -momit-leaf-frame-pointer
-	# fixes bug #45576
-	./configure ${myconf} \
-		--prefix=/usr || die "./configure failed."
-	# Build libpostproc
-	cd ${S}/libavcodec/libpostproc
-	make || die "Failed to build libpostproc.a!"
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-	make \
-		DESTDIR=${D} \
-		prefix=${D}/usr \
-		bindir=${D}/usr/bin \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc COPYING CREDITS Changelog INSTALL README
-	docinto doc
-	dodoc doc/TODO doc/*.html doc/*.texi
-	insinto /etc
-	doins doc/ffserver.conf
-
-	# Install libpostproc ...
-	cd ${S}/libavcodec/libpostproc
-	make prefix=${D}/usr \
-		install || die "Failed to install libpostproc.a!"
-	make prefix=${D}/usr \
-		SHARED_PP="yes" \
-		install || die "Failed to install libpostproc.so!"
-	cd ${S}
-	# Some stuff like transcode can use this one.
-	dolib ${S}/libavcodec/libpostproc/libpostproc.a
-
-	preplib /usr
-}
-
-# FEATURES=maketest breakes the compile
-src_test() { :; }
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.8 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.8
deleted file mode 100644
index fec778f232f1..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e00d47614ba1afd99ad2ea387e782dd9 ffmpeg-0.4.8.tar.gz 1352874
diff --git a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_pre1-r1 b/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_pre1-r1
deleted file mode 100644
index 21e5cc684690..000000000000
--- a/media-video/ffmpeg/files/digest-ffmpeg-0.4.9_pre1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea5587e3c66d50b1503b82ac4179c303 ffmpeg-0.4.9-pre1.tar.gz 1611332