Now uses system ffmpeg and installs both static and shared libs. Removing old versions. Added to ~sparc.

(Portage version: 2.0.51.19)

12 files changed, 406 insertions, 560 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 51e0fdc8f81e..95140d71e808 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.96 2005/03/22 07:01:25 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.97 2005/03/26 04:27:13 eradicator Exp $
+
+*avifile-0.7.43.20050224-r1 (26 Mar 2005)
+
+  26 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/avifile-0.7.41.20041001-sparc.patch,
+  +files/avifile-0.7.43.20050224-sysffmpeg.patch,
+  -avifile-0.7.32.20030219.ebuild, -avifile-0.7.37.20030522-r2.ebuild,
+  -avifile-0.7.41.20041001.ebuild, -avifile-0.7.43.20050224.ebuild,
+  +avifile-0.7.43.20050224-r1.ebuild:
+  Now uses system ffmpeg and installs both static and shared libs. Removing
+  old versions. Added to ~sparc.
 
 *avifile-0.7.43.20050224 (22 Mar 2005)
 
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index 2697d0311ead..922df9dbfd42 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,15 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4ecd3b8481c3434605c8f58270ca6b2e ChangeLog 17701
 MD5 8c3a2328a001e71870d1188127c9b393 avifile-0.7.32.20030219.ebuild 4060
 MD5 639830d768edbd341409ffca5ec3801a avifile-0.7.37.20030522-r2.ebuild 4429
 MD5 ead70f1fd6fc60afbc07ad1ea49576a7 avifile-0.7.38.20030710-r1.ebuild 4005
 MD5 d8e29f9cdd54513314f75bf2e8e0316b avifile-0.7.41.20041001-r1.ebuild 4623
-MD5 85bae951b6afcb791e94c005ea0ca85e avifile-0.7.41.20041001-r2.ebuild 4601
 MD5 557e8e3e48f82dd70ddb17fc3b87706a avifile-0.7.41.20041001.ebuild 3947
 MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
-MD5 6e0cd60dc58a97755aeab587eede03c6 avifile-0.7.43.20050224.ebuild 4660
+MD5 85bae951b6afcb791e94c005ea0ca85e avifile-0.7.41.20041001-r2.ebuild 4601
+MD5 c42e220a4a32717f3d10f747fafa2fd3 avifile-0.7.43.20050224.ebuild 4491
+MD5 2c6067c7283c6c57ab7dd53e18c98271 avifile-0.7.43.20050224-r1.ebuild 4942
 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
 MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038
 MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
@@ -23,15 +21,10 @@ MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73
 MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
 MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001 71
 MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
-MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r2 71
 MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
 MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
-MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224 72
+MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r2 71
 MD5 7eacd7dae7ab4a551b208173ec54215e files/avifile-mad.patch 1582
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCP7sRFdQwWVoAgN4RAv8SAKCfU7KmlapgpCsS5kxQbb07n73djgCgm9Js
-aCMshivjZkupcC7FefylQiY=
-=ssiu
------END PGP SIGNATURE-----
+MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224 72
+MD5 9a9cb9138b6e5b53d65d54a8f4286264 files/avifile-0.7.43.20050224-sysffmpeg.patch 12483
+MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r1 72
diff --git a/media-video/avifile/avifile-0.7.32.20030219.ebuild b/media-video/avifile/avifile-0.7.32.20030219.ebuild
deleted file mode 100644
index e0fb7e369d59..000000000000
--- a/media-video/avifile/avifile-0.7.32.20030219.ebuild
+++ /dev/null
@@ -1,156 +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/avifile/avifile-0.7.32.20030219.ebuild,v 1.12 2005/01/20 10:07:51 cryos Exp $
-
-MY_P="${P/.200/-200}"
-MY_S="${PN}0.7-0.7.32"
-S="${WORKDIR}/${MY_S}"
-
-DESCRIPTION="Library for AVI-Files"
-HOMEPAGE="http://avifile.sourceforge.net/"
-SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-KEYWORDS="x86 ~sparc"
-IUSE="3dnow X alsa avi debug dvd esd mmx oggvorbis qt sdl sse static truetype xv zlib"
-
-DEPEND=">=media-libs/jpeg-6b
-	x86? ( >=media-libs/divx4linux-20020418
-		>=media-libs/win32codecs-0.90 )
-	>=media-video/ffmpeg-0.4
-	>=media-sound/madplay-0.14
-	>=media-libs/xvid-0.9.0
-	>=media-sound/lame-3.90
-	>=media-libs/audiofile-0.2.3
-	truetype? ( >=media-libs/freetype-2.1 )
-	xv? ( virtual/x11 )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	dvd? ( >=media-libs/a52dec-0.7 )
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	X? ( virtual/x11 virtual/xft )
-	qt? ( >=x11-libs/qt-3.0.3 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-	esd? ( >=media-sound/esound-0.2.28 )"
-
-src_compile() {
-	local myconf="--enable-oss"
-	local kdepre=""
-
-	use static \
-		&& myconf="${myconf} --enable-static" \
-		|| myconf="${myconf} --disable-static"
-
-	use truetype \
-		&& myconf="${myconf} --enable-freetype2" \
-		|| myconf="${myconf} --disable-freetype2"
-
-	use xv \
-		&& myconf="${myconf} --enable-xv" \
-		|| myconf="${myconf} --disable-xv"
-
-	if [ "$XINERAMA" = "NO" ]; then
-		myconf="${myconf} --disable-xinerama"
-	fi
-
-	if [ "$DPMS" = "NO" ]; then
-		myconf="${myconf} --disable-dpms"
-	fi
-
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-
-	if [ "$V4L" = "NO" ]; then
-		myconf="${myconf} --disable-v4l"
-	fi
-
-	if [ "$SUN" = "NO" ]; then
-		myconf="${myconf} --disable-sunaudio"
-	fi
-
-	use dvd \
-		&& myconf="${myconf} --enable-a52 --enable-ffmpeg-a52" \
-		|| myconf="${myconf} --disable-a52 --disable-ffmpeg-a52"
-
-	if [ "$SBLIVE" = "NO" ]; then
-		myconf="${myconf} --disable-ac3passthrough"
-	fi
-
-	if [ "$RUNTIME_LAME" = "YES" ]; then
-		myconf="${myconf} --enable-lame-bin"
-	fi
-
-	use debug \
-		&& myconf="${myconf} --enable-loader-out" \
-		|| myconf="${myconf} --enable-quiet"
-
-	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
-	use zlib \
-		&& myconf="${myconf} --enable-libz" \
-		|| myconf="${myconf} --disable-libz"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
-
-	if [ "$MGA" = "NO" ]; then
-		myconf="${myconf} --disable-mga"
-	fi
-
-	if [ "$DMALLOC" = "YES" ]; then
-		myconf="${myconf} --with-dmallocth"
-	fi
-
-	use X \
-		&& myconf="${myconf} --with-x --enable-xft" \
-		|| myconf="${myconf} --without-x --disable-xft"
-
-	use qt \
-		&& myconf="${myconf} --with-qt-dir=${QTDIR}" \
-		|| myconf="${myconf} --without-qt"
-
-	# Rather not use custom ones here .. build should set as high as
-	# safe by itself.
-	unset CFLAGS CXXFLAGS LDFLAGS CC CXX
-
-	# Make sure we include freetype2 headers before freetype1 headers, else Xft2
-	# borks, bug #11941.
-	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
-	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
-	# Fix qt detection
-	cp configure configure.orig
-	sed -e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
-		< configure.orig > configure
-
-	econf \
-		--enable-samples \
-		--disable-vidix \
-		--with-fpic \
-		--with-gnu-ld \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/lib /usr/bin
-	use avi && dodir /usr/lib/win32
-
-	einstall || die
-
-	cd ${S}
-	dodoc COPYING README
-	cd doc
-	dodoc CREDITS EXCEPTIONS FreeBSD LICENSING TODO
-	dodoc VIDEO-PERFORMANCE WARNINGS
-}
-
-pkg_postinst() {
-	einfo "In order to use certain video modes, you must be root"
-	einfo "chmod +s /usr/bin/aviplay to suid root"
-	einfo "As this is considered a security risk on multiuser"
-	einfo "systems, this is not done by default"
-}
diff --git a/media-video/avifile/avifile-0.7.37.20030522-r2.ebuild b/media-video/avifile/avifile-0.7.37.20030522-r2.ebuild
deleted file mode 100644
index 87057a1165c5..000000000000
--- a/media-video/avifile/avifile-0.7.37.20030522-r2.ebuild
+++ /dev/null
@@ -1,173 +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/avifile/avifile-0.7.37.20030522-r2.ebuild,v 1.16 2005/01/20 10:07:51 cryos Exp $
-
-inherit eutils
-
-MAJ_PV=${PV:0:3}
-MIN_PV=${PV:3:3}
-MY_P="${P/.200/-200}"
-MY_S="${PN}${MAJ_PV}-${MAJ_PV}${MIN_PV}"
-S="${WORKDIR}/${MY_S}"
-
-DESCRIPTION="Library for AVI-Files"
-HOMEPAGE="http://avifile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-KEYWORDS="~x86 ~sparc alpha ia64"
-IUSE="3dnow X alsa avi debug dvd esd mmx oggvorbis qt sdl sse static truetype xv zlib"
-
-DEPEND=">=media-libs/jpeg-6b
-	x86? ( >=media-libs/divx4linux-20020418
-		>=media-libs/win32codecs-0.90 )
-	>=media-video/ffmpeg-0.4
-	>=media-libs/xvid-0.9.0
-	>=media-sound/lame-3.90
-	>=media-libs/audiofile-0.2.3
-	>=sys-apps/sed-4
-	>=media-sound/madplay-0.14.2b
-	truetype? ( >=media-libs/freetype-2.1 )
-	xv? ( virtual/x11 )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	dvd? ( >=media-libs/a52dec-0.7 )
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	X? ( virtual/x11 virtual/xft )
-	qt? ( >=x11-libs/qt-3.0.3 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-	esd? ( >=media-sound/esound-0.2.28 )"
-
-src_unpack() {
-	unpack ${A}
-	use qt || sed -i 's/qt[a-z]*//g' ${S}/samples/Makefile.am
-	#Fixing divx 2003 API
-	if has_version  '>=media-libs/divx4linux-20030428'
-	then
-		einfo "DivX 20030428 found"
-		cd ${S}
-		epatch ${FILESDIR}/${P}-divx.patch
-	else
-		einfo "Old DivX Api found"
-	fi
-}
-
-src_compile() {
-	local myconf="--enable-oss"
-	local kdepre=""
-
-	use static \
-		&& myconf="${myconf} --enable-static" \
-		|| myconf="${myconf} --disable-static"
-
-	use truetype \
-		&& myconf="${myconf} --enable-freetype2" \
-		|| myconf="${myconf} --disable-freetype2"
-
-	use xv \
-		&& myconf="${myconf} --enable-xv" \
-		|| myconf="${myconf} --disable-xv"
-
-	if [ "$XINERAMA" = "NO" ]; then
-		myconf="${myconf} --disable-xinerama"
-	fi
-
-	if [ "$DPMS" = "NO" ]; then
-		myconf="${myconf} --disable-dpms"
-	fi
-
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-
-	if [ "$V4L" = "NO" ]; then
-		myconf="${myconf} --disable-v4l"
-	fi
-
-	if [ "$SUN" = "NO" ]; then
-		myconf="${myconf} --disable-sunaudio"
-	fi
-
-	use dvd \
-		&& myconf="${myconf} --enable-a52 --enable-ffmpeg-a52" \
-		|| myconf="${myconf} --disable-a52 --disable-ffmpeg-a52"
-
-	if [ "$SBLIVE" = "NO" ]; then
-		myconf="${myconf} --disable-ac3passthrough"
-	fi
-
-	use debug \
-		&& myconf="${myconf} --enable-loader-out" \
-		|| myconf="${myconf} --enable-quiet"
-
-	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
-	use zlib \
-		&& myconf="${myconf} --enable-libz" \
-		|| myconf="${myconf} --disable-libz"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
-
-	if [ "$MGA" = "NO" ]; then
-		myconf="${myconf} --disable-mga"
-	fi
-
-	if [ "$DMALLOC" = "YES" ]; then
-		myconf="${myconf} --with-dmallocth"
-	fi
-
-	use X \
-		&& myconf="${myconf} --with-x --enable-xft" \
-		|| myconf="${myconf} --without-x --disable-xft"
-
-	use qt \
-		&& myconf="${myconf} --with-qt-prefix=${QTDIR}" \
-		|| myconf="${myconf} --without-qt"
-
-	# Rather not use custom ones here .. build should set as high as
-	# safe by itself.
-	unset CFLAGS CXXFLAGS LDFLAGS CC CXX
-
-	# Make sure we include freetype2 headers before freetype1 headers, else Xft2
-	# borks, bug #11941.
-	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
-	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
-	# Fix qt detection
-	cp configure configure.orig
-	sed -e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
-		< configure.orig > configure
-
-	econf \
-		--enable-samples \
-		--disable-vidix \
-		--with-fpic \
-		--with-gnu-ld \
-		--enable-lame-bin \
-		${myconf} || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/lib /usr/bin
-	use avi && dodir /usr/lib/win32
-
-	einstall || die
-
-	cd ${S}
-	dodoc COPYING README INSTALL
-	cd doc
-	dodoc CREDITS EXCEPTIONS FreeBSD LICENSING TODO
-	dodoc VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
-}
-
-pkg_postinst() {
-	einfo "In order to use certain video modes, you must be root"
-	einfo "chmod +s /usr/bin/aviplay to suid root"
-	einfo "As this is considered a security risk on multiuser"
-	einfo "systems, this is not done by default"
-}
diff --git a/media-video/avifile/avifile-0.7.41.20041001.ebuild b/media-video/avifile/avifile-0.7.41.20041001.ebuild
deleted file mode 100644
index aa21e4a9990c..000000000000
--- a/media-video/avifile/avifile-0.7.41.20041001.ebuild
+++ /dev/null
@@ -1,149 +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/avifile/avifile-0.7.41.20041001.ebuild,v 1.13 2005/01/20 10:07:51 cryos Exp $
-
-inherit eutils flag-o-matic
-
-MAJ_PV=${PV:0:3}
-MIN_PV=${PV:0:6}
-MY_P="${PN}-${MAJ_PV}-${MIN_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Library for AVI-Files"
-HOMEPAGE="http://avifile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0.7"
-
-#-sparc: 0.7.41 - dsputil_init_vis undefined - eradicator
-KEYWORDS="~alpha ~amd64 ~ia64 -sparc x86"
-IUSE="3dnow X alsa avi debug dvd esd mmx oggvorbis qt sdl sse static truetype xv zlib"
-
-DEPEND=">=media-libs/jpeg-6b
-	x86? ( >=media-libs/divx4linux-20030428
-		>=media-libs/win32codecs-0.90 )
-	>=media-video/ffmpeg-0.4
-	=media-libs/xvid-1*
-	>=media-sound/lame-3.90
-	>=media-libs/audiofile-0.2.3
-	>=sys-apps/sed-4
-	>=media-sound/madplay-0.14.2b
-	>=sys-devel/patch-2.5.9
-	truetype? ( >=media-libs/freetype-2.1 )
-	xv? ( virtual/x11 )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	dvd? ( >=media-libs/a52dec-0.7 )
-	zlib? ( >=sys-libs/zlib-1.1.3 )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	X? ( virtual/x11 virtual/xft )
-	qt? ( >=x11-libs/qt-3.0.3 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-	esd? ( >=media-sound/esound-0.2.28 )"
-
-src_unpack() {
-	unpack ${A}
-	use qt || sed -i 's/qt[a-z]*//g' ${S}/samples/Makefile.am
-
-	# make sure pkgconfig file is correct #53183
-	cd ${S}
-	epatch ${FILESDIR}/throw.patch
-	use sparc && epatch ${FILESDIR}/${P}-sparc.patch
-	rm -f avifile.pc
-	sed -i "/^includedir=/s:avifile$:avifile-${PV:0:3}:" avifile.pc.in
-}
-
-src_compile() {
-	local myconf="--enable-oss --disable-xvid --enable-xvid4"
-	local kdepre=""
-
-	if [ "$XINERAMA" = "NO" ]; then
-		myconf="${myconf} --disable-xinerama"
-	fi
-
-	if [ "$DPMS" = "NO" ]; then
-		myconf="${myconf} --disable-dpms"
-	fi
-
-	if [ "$V4L" = "NO" ]; then
-		myconf="${myconf} --disable-v4l"
-	fi
-
-	if [ "$SUN" = "NO" ]; then
-		myconf="${myconf} --disable-sunaudio"
-	fi
-
-	if [ "$SBLIVE" = "NO" ]; then
-		myconf="${myconf} --disable-ac3passthrough"
-	fi
-
-	use debug \
-		&& myconf="${myconf} --enable-loader-out" \
-		|| myconf="${myconf} --enable-quiet"
-
-	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
-	if [ "$MGA" = "NO" ]; then
-		myconf="${myconf} --disable-mga"
-	fi
-
-	if [ "$DMALLOC" = "YES" ]; then
-		myconf="${myconf} --with-dmallocth"
-	fi
-
-	use qt \
-		&& myconf="${myconf} --with-qt-prefix=${QTDIR}" \
-		|| myconf="${myconf} --without-qt"
-
-	# Make sure we include freetype2 headers before freetype1 headers, else Xft2
-	# borks, bug #11941.
-	export C_INCLUDE_PATH="${C_INCLUDE_PATH}:/usr/include/freetype2"
-	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
-
-	# Fix qt detection
-	sed -i \
-		-e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
-		configure
-
-	filter-flags "-momit-leaf-frame-pointer"
-
-	econf \
-		`use_enable static` \
-		`use_enable truetype freetype2` \
-		`use_enable xv` \
-		`use_enable sdl` `use_enable sdl sdltest` \
-		`use_enable dvd a52` `use_enable dvd ffmpeg-a52` \
-		`use_enable zlib libz` \
-		`use_enable oggvorbis vorbis` `use_enable oggvorbis oggtest` `use_enable oggvorbis vorbistest` \
-		`use_with X x` `use_enable X xft` \
-		--enable-samples \
-		--disable-vidix \
-		--with-fpic \
-		--enable-lame-bin \
-		${myconf} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	use avi && dodir /usr/$(get_libdir)/win32
-
-	make DESTDIR="${D}" install || die
-
-	dodoc README INSTALL
-	cd doc
-	dodoc CREDITS EXCEPTIONS TODO VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
-}
-
-src_test() {
-	ewarn "Testing disabled for this ebuild."
-}
-
-pkg_postinst() {
-	if use qt; then # else no aviplay built
-		einfo "In order to use certain video modes, you must be root"
-		einfo "chmod +s /usr/bin/aviplay to suid root"
-		einfo "As this is considered a security risk on multiuser"
-		einfo "systems, this is not done by default"
-	fi
-}
diff --git a/media-video/avifile/avifile-0.7.43.20050224.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
index e1fa53c1e975..1bfbdceec091 100644
--- a/media-video/avifile/avifile-0.7.43.20050224.ebuild
+++ b/media-video/avifile/avifile-0.7.43.20050224-r1.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/avifile/avifile-0.7.43.20050224.ebuild,v 1.1 2005/03/22 07:01:25 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.1 2005/03/26 04:27:13 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -16,13 +16,12 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0.7"
 
-#-sparc: 0.7.41 - dsputil_init_vis undefined - eradicator
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips -sparc ~x86"
-IUSE="3dnow X alsa avi debug divx4linux dmalloc dpms dvd encode esd mad matrox
-mmx oggvorbis oss qt sblive sdl sse static truetype v4l vidix xinerama xv xvid zlib"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86"
+IUSE="3dnow X alsa debug divx4linux dmalloc dpms dvd encode esd mad matrox
+mmx oggvorbis oss qt sblive sdl sse truetype v4l vidix xinerama xv xvid zlib"
 
-DEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-	avi? ( x86? ( >=media-libs/win32codecs-0.90 ) )
+RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
+	x86? ( >=media-libs/win32codecs-0.90 )
 	alsa? ( virtual/alsa )
 	divx4linux? ( x86? ( >=media-libs/divx4linux-20030428 ) )
 	dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
@@ -38,9 +37,14 @@ DEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
 	xvid? ( =media-libs/xvid-1* )
 	X? ( virtual/x11 virtual/xft )
 	zlib? ( >=sys-libs/zlib-1.1.3 )
-	>=media-libs/jpeg-6b
+	>=media-video/ffmpeg-0.4.9_p20050226-r2
+	>=media-libs/jpeg-6b"
+
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
-	>=sys-devel/patch-2.5.9"
+	>=sys-devel/autoconf-2.59
+	>=sys-devel/automake-1.4_p6
+	sys-devel/libtool"
 
 src_unpack() {
 	unpack ${A}
@@ -48,51 +52,41 @@ src_unpack() {
 	# fixes mad FPM detection
 	epatch ${FILESDIR}/${PN}-mad.patch
 
+	epatch ${FILESDIR}/avifile-0.7.43.20050224-sysffmpeg.patch
+
 	if use !qt ; then
 		sed -i -e 's/qtvidcap\ qtrecompress//g' \
 		${S}/samples/Makefile.am || die "qt based sample test removal failed"
 	fi
 
-	# make sure pkgconfig file is correct #53183
-	cd ${S}
-	if use sparc; then
-		sed -i -e "s:AM_CFLAGS.*:AM_CFLAGS = -O2:" \
-		${S}/ffmpeg/libavcodec/postproc/Makefile.* \
-		|| die "Could not tune down CFLAGS for postproc"
+	# Fix hardcoded Xrender linking, bug #68899
+	if ! use X; then
+		sed -i -e 's/-lXrender//g' ${S}/lib/video/Makefile.* || die "sed failed (Xrender)"
 	fi
 
-	rm -f avifile.pc
-
-	sed -e "s:| sed s/-g//::" -i configure || die "sed failed (-g)"
+	# Stop them from stripping out -g
+	sed -i -e "s:| sed s/-g//::" ${S}/configure{,.ac} || die "sed failed (-g)"
 
-	# Fix qt detection
-	sed -i \
-		-e "s:extern \"C\" void exit(int);:/* extern \"C\" void exit(int); */:" \
-		configure || die "sed failed (qt detection)"
+	# Run autotools...
+	cd ${S}
+	[[ -f configure.ac && -f configure.in ]] && rm configure.in
 
-	# Fix hardcoded Xrender linking, bug #68899
-	if ! use X; then
-		sed -e 's/-lXrender//g' -i lib/video/Makefile.* \
-		|| die "sed failed (Xrender)"
-	fi
+	export WANT_AUTOMAKE=1.6
+	export WANT_AUTOCONF=2.5
+	libtoolize --force --copy || die "libtoolize failed"
+	aclocal -I ${S}/m4 || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake --gnu --add-missing --include-deps --force-missing --copy || die "automake failed"
+	autoconf || die "autoconf failed"
 
-	# adding CFLAGS by default which exists only for x86 is no good idea
-	# but I can't get it through gcc 3.4.3 without omit-frame-pointer
-	if use x86; then
-		find . -name "Makefile.in" | while read file; do
-			sed -e "s/^AM_CFLAGS = .*/AM_CFLAGS = -fomit-frame-pointer/" -i $file
-		done
-	fi
+	# make sure pkgconfig file is correct #53183
+	rm -f avifile.pc
 }
 
 src_compile() {
 	local myconf=""
 	local kdepre=""
 
-	use sparc \
-		&& myconf="${myconf} --enable-sunaudio" \
-		|| myconf="${myconf} --disable-sunaudio"
-
 	use debug \
 		&& myconf="${myconf} --enable-loader-out" \
 		|| myconf="${myconf} --enable-quiet"
@@ -113,7 +107,7 @@ src_compile() {
 	export FFMPEG_CFLAGS="${CFLAGS}"
 
 	econf \
-		$(use_enable avi win32) \
+		$(use_enable x86 win32) \
 		$(use_with dmalloc dmallocth) \
 		$(use_enable dvd a52) $(use_enable dvd ffmpeg-a52) \
 		$(use_enable dpms) \
@@ -124,7 +118,6 @@ src_compile() {
 		$(use_with qt) \
 		$(use_enable sblive ac3passthrough) \
 		$(use_enable sdl) $(use_enable sdl sdltest) \
-		$(use_enable static) \
 		$(use_enable truetype freetype2) \
 		$(use_enable v4l) \
 		$(use_enable vidix) \
diff --git a/media-video/avifile/files/avifile-0.7.41.20041001-sparc.patch b/media-video/avifile/files/avifile-0.7.41.20041001-sparc.patch
deleted file mode 100644
index 1fae0b0016b2..000000000000
--- a/media-video/avifile/files/avifile-0.7.41.20041001-sparc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur avifile-0.7-0.7.41.orig/ffmpeg/libavcodec/libpostproc/Makefile.am avifile-0.7-0.7.41/ffmpeg/libavcodec/libpostproc/Makefile.am
---- avifile-0.7-0.7.41.orig/ffmpeg/libavcodec/libpostproc/Makefile.am	2004-05-27 01:30:28.000000000 -0700
-+++ avifile-0.7-0.7.41/ffmpeg/libavcodec/libpostproc/Makefile.am	2004-10-06 14:42:28.060324512 -0700
-@@ -11,7 +11,7 @@
- libpostproc_la_SOURCES = postprocess.c
- 
- AM_CPPFLAGS = $(LTNOPIC) -DHAVE_AV_CONFIG_H $(FFMPEG_CFLAGS) -I$(srcdir)/..
--AM_CFLAGS = -O2 -fomit-frame-pointer -mno-omit-leaf-frame-pointer
-+AM_CFLAGS = -O2
- 
- CLEANFILES = .depend *.a
- MAINTAINERCLEANFILES = Makefile.in
-diff -Naur avifile-0.7-0.7.41.orig/ffmpeg/libavcodec/libpostproc/Makefile.in avifile-0.7-0.7.41/ffmpeg/libavcodec/libpostproc/Makefile.in
---- avifile-0.7-0.7.41.orig/ffmpeg/libavcodec/libpostproc/Makefile.in	2004-10-01 06:45:42.000000000 -0700
-+++ avifile-0.7-0.7.41/ffmpeg/libavcodec/libpostproc/Makefile.in	2004-10-06 14:42:42.201985818 -0700
-@@ -152,7 +152,7 @@
- libpostproc_la_SOURCES = postprocess.c
- 
- AM_CPPFLAGS = $(LTNOPIC) -DHAVE_AV_CONFIG_H $(FFMPEG_CFLAGS) -I$(srcdir)/..
--AM_CFLAGS = -O2 -fomit-frame-pointer -mno-omit-leaf-frame-pointer
-+AM_CFLAGS = -O2
- 
- CLEANFILES = .depend *.a
- MAINTAINERCLEANFILES = Makefile.in
diff --git a/media-video/avifile/files/avifile-0.7.43.20050224-sysffmpeg.patch b/media-video/avifile/files/avifile-0.7.43.20050224-sysffmpeg.patch
new file mode 100644
index 000000000000..10f9b5efe319
--- /dev/null
+++ b/media-video/avifile/files/avifile-0.7.43.20050224-sysffmpeg.patch
@@ -0,0 +1,354 @@
+diff -Naurp avifile-0.7-0.7.43.orig/Makefile.am avifile-0.7-0.7.43/Makefile.am
+--- avifile-0.7-0.7.43.orig/Makefile.am	2004-11-24 15:12:53.000000000 -0800
++++ avifile-0.7-0.7.43/Makefile.am	2005-03-25 17:40:31.000000000 -0800
+@@ -1,4 +1,4 @@
+-SUBDIRS = . admin m4 ffmpeg drivers lib plugins bin \
++SUBDIRS = . admin m4 drivers lib plugins bin \
+  doc include debian libavqt player samples
+ 
+ EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in \
+diff -Naurp avifile-0.7-0.7.43.orig/Makefile.in avifile-0.7-0.7.43/Makefile.in
+--- avifile-0.7-0.7.43.orig/Makefile.in	2005-02-24 06:26:41.000000000 -0800
++++ avifile-0.7-0.7.43/Makefile.in	2005-03-25 17:40:40.000000000 -0800
+@@ -142,7 +142,7 @@ XVID_LIBS = @XVID_LIBS@
+ Z_LIBS = @Z_LIBS@
+ qt_version = @qt_version@
+ 
+-SUBDIRS = . admin m4 ffmpeg drivers lib plugins bin  doc include debian libavqt player samples
++SUBDIRS = . admin m4 drivers lib plugins bin  doc include debian libavqt player samples
+ 
+ 
+ EXTRA_DIST = INSTALL autogen.sh avifile.spec.in avifile.pc.in  $(pkgdoc_DATA) $(pkgconfig_DATA)
+diff -Naurp avifile-0.7-0.7.43.orig/configure.ac avifile-0.7-0.7.43/configure.ac
+--- avifile-0.7-0.7.43.orig/configure.ac	2005-02-24 03:31:38.000000000 -0800
++++ avifile-0.7-0.7.43/configure.ac	2005-03-25 17:59:48.000000000 -0800
+@@ -55,7 +55,7 @@ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ AC_PROG_AWK
+ 
+ AC_CC_VERSION
+@@ -167,8 +167,8 @@ dnl
+ dnl Libtool
+ dnl
+ dnl AC_LIBTOOL_DLOPEN
+-AM_DISABLE_STATIC
+-AM_PROG_LIBTOOL
++dnl AM_DISABLE_STATIC
++dnl AM_PROG_LIBTOOL
+ dnl automatic updating of libtool configuration files
+ dnl not needed with automake AC_SUBST(LIBTOOL_DEPS)
+ dnl using rather hack for .lo creation AM_PROG_AS
+@@ -790,11 +790,6 @@ if test x$enable_xvid4 = xyes; then
+ fi
+ 
+ 
+-dnl =======================
+-dnl Configure ffmpeg plugin
+-dnl =======================
+-AM_PATH_FFMPEG
+-
+ dnl use_nasm=
+ dnl  not needed right now
+ dnl AC_CHECK_PROG(use_nasm, nasm, yes, no)
+diff -Naurp avifile-0.7-0.7.43.orig/configure.in avifile-0.7-0.7.43/configure.in
+--- avifile-0.7-0.7.43.orig/configure.in	2005-02-24 03:31:38.000000000 -0800
++++ avifile-0.7-0.7.43/configure.in	2005-03-25 17:59:48.000000000 -0800
+@@ -55,7 +55,7 @@ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ AC_PROG_AWK
+ 
+ AC_CC_VERSION
+@@ -167,8 +167,8 @@ dnl
+ dnl Libtool
+ dnl
+ dnl AC_LIBTOOL_DLOPEN
+-AM_DISABLE_STATIC
+-AM_PROG_LIBTOOL
++dnl AM_DISABLE_STATIC
++dnl AM_PROG_LIBTOOL
+ dnl automatic updating of libtool configuration files
+ dnl not needed with automake AC_SUBST(LIBTOOL_DEPS)
+ dnl using rather hack for .lo creation AM_PROG_AS
+@@ -790,11 +790,6 @@ if test x$enable_xvid4 = xyes; then
+ fi
+ 
+ 
+-dnl =======================
+-dnl Configure ffmpeg plugin
+-dnl =======================
+-AM_PATH_FFMPEG
+-
+ dnl use_nasm=
+ dnl  not needed right now
+ dnl AC_CHECK_PROG(use_nasm, nasm, yes, no)
+diff -Naurp avifile-0.7-0.7.43.orig/lib/Makefile.am avifile-0.7-0.7.43/lib/Makefile.am
+--- avifile-0.7-0.7.43.orig/lib/Makefile.am	2003-03-11 04:53:40.000000000 -0800
++++ avifile-0.7-0.7.43/lib/Makefile.am	2005-03-25 16:49:58.000000000 -0800
+@@ -1,8 +1,7 @@
+ DIST_SUBDIRS = aviplay aviread aviwrite common subtitle video
+ noinst_HEADERS = Uncompressed.h
+ 
+-COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\" \
+- -I$(srcdir)/../ffmpeg/libavcodec -I$(srcdir)/../ffmpeg/libavformat
++COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\"
+ if AMM_USE_FAST_BUILD
+ AVISOURCES = libaviplay.cpp
+ AVILIBADD =
+diff -Naurp avifile-0.7-0.7.43.orig/lib/Makefile.in avifile-0.7-0.7.43/lib/Makefile.in
+--- avifile-0.7-0.7.43.orig/lib/Makefile.in	2005-02-24 06:26:48.000000000 -0800
++++ avifile-0.7-0.7.43/lib/Makefile.in	2005-03-25 16:50:19.000000000 -0800
+@@ -145,7 +145,7 @@ qt_version = @qt_version@
+ DIST_SUBDIRS = aviplay aviread aviwrite common subtitle video
+ noinst_HEADERS = Uncompressed.h
+ 
+-COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\"  -I$(srcdir)/../ffmpeg/libavcodec -I$(srcdir)/../ffmpeg/libavformat
++COMMONCFLAGS = $(DIVX4_CFLAGS) $(XVID_CFLAGS) -DPLUGIN_PATH=\"$(pkglibdir)\"
+ 
+ @AMM_USE_FAST_BUILD_TRUE@AVISOURCES = libaviplay.cpp
+ @AMM_USE_FAST_BUILD_FALSE@AVISOURCES = codeckeeper.cpp Uncompressed.cpp
+diff -Naurp avifile-0.7-0.7.43.orig/lib/aviread/FFReadHandler.cpp avifile-0.7-0.7.43/lib/aviread/FFReadHandler.cpp
+--- avifile-0.7-0.7.43.orig/lib/aviread/FFReadHandler.cpp	2004-10-25 02:52:51.000000000 -0700
++++ avifile-0.7-0.7.43/lib/aviread/FFReadHandler.cpp	2005-03-25 17:17:41.000000000 -0800
+@@ -2,11 +2,11 @@
+ #include "FFReadStream.h"
+ #include "avm_output.h"
+ 
+-#ifndef int64_t_C
+-#define int64_t_C(c)     (c ## LL)
+-#define uint64_t_C(c)    (c ## ULL)
++#ifdef HAVE_AV_CONFIG_H
++#undef HAVE_AV_CONFIG_H
+ #endif
+-#include "avformat.h"
++
++#include <ffmpeg/avformat.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -Naurp avifile-0.7-0.7.43.orig/lib/aviread/FFReadStream.cpp avifile-0.7-0.7.43/lib/aviread/FFReadStream.cpp
+--- avifile-0.7-0.7.43.orig/lib/aviread/FFReadStream.cpp	2004-05-24 01:24:26.000000000 -0700
++++ avifile-0.7-0.7.43/lib/aviread/FFReadStream.cpp	2005-03-25 17:17:21.000000000 -0800
+@@ -3,11 +3,11 @@
+ #include "avm_fourcc.h"
+ #include "avm_output.h"
+ 
+-#ifndef int64_t_C
+-#define int64_t_C(c)     (c ## LL)
+-#define uint64_t_C(c)    (c ## ULL)
++#ifdef HAVE_AV_CONFIG_H
++#undef HAVE_AV_CONFIG_H
+ #endif
+-#include "avformat.h"
++
++#include <ffmpeg/avformat.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -Naurp avifile-0.7-0.7.43.orig/lib/aviread/Makefile.am avifile-0.7-0.7.43/lib/aviread/Makefile.am
+--- avifile-0.7-0.7.43.orig/lib/aviread/Makefile.am	2003-03-11 03:17:37.000000000 -0800
++++ avifile-0.7-0.7.43/lib/aviread/Makefile.am	2005-03-25 17:09:48.000000000 -0800
+@@ -43,21 +43,11 @@ libaviread_la_SOURCES = \
+  StreamInfo.cpp
+ 
+ 
+-if AMM_LINK_SHARED
+-FF_LIB = \
+- ../../ffmpeg/libavformat/libaviplayavformat.la \
+- ../../ffmpeg/libavcodec/libaviplayavcodec.la
+-else 
+-FF_LIB = \
+- ../../ffmpeg/libavformat/libavformat.la \
+- ../../ffmpeg/libavcodec/libavcodec.la
+-endif
++FF_LIB = -lavformat -lavcodec
+ 
+ libaviread_la_LIBADD = $(FF_LIB)
+ 
+ AM_CPPFLAGS = $(LTNOPIC) \
+- -I$(srcdir)/../common \
+- -I$(srcdir)/../../ffmpeg/libavformat \
+- -I$(srcdir)/../../ffmpeg/libavcodec
++ -I$(srcdir)/../common
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+diff -Naurp avifile-0.7-0.7.43.orig/lib/aviread/Makefile.in avifile-0.7-0.7.43/lib/aviread/Makefile.in
+--- avifile-0.7-0.7.43.orig/lib/aviread/Makefile.in	2005-02-24 06:26:49.000000000 -0800
++++ avifile-0.7-0.7.43/lib/aviread/Makefile.in	2005-03-25 17:10:58.000000000 -0800
+@@ -148,12 +148,11 @@ noinst_HEADERS =   AsfFileInputStream.h 
+ 
+ libaviread_la_SOURCES =   AsfFileInputStream.cpp  asffmt.cpp  AsfNetworkInputStream.cpp  AsfReadHandler.cpp  AsfReadStream.cpp  AsfRedirectInputStream.cpp  AsfStreamSeekInfo.cpp  asf_guids.cpp  AsxReader.cpp  AviReadHandler.cpp  AviReadStream.cpp  Cache.cpp  FFReadHandler.cpp  FFReadStream.cpp  ReadFile.cpp  ReadStream.cpp  ReadStreamA.cpp  ReadStreamV.cpp  StreamInfo.cpp
+ 
+-@AMM_LINK_SHARED_TRUE@FF_LIB =  ../../ffmpeg/libavformat/libaviplayavformat.la  ../../ffmpeg/libavcodec/libaviplayavcodec.la
+-@AMM_LINK_SHARED_FALSE@FF_LIB =  ../../ffmpeg/libavformat/libavformat.la  ../../ffmpeg/libavcodec/libavcodec.la
++FF_LIB =  -lavformat -lavcodec
+ 
+ libaviread_la_LIBADD = $(FF_LIB)
+ 
+-AM_CPPFLAGS = $(LTNOPIC)  -I$(srcdir)/../common  -I$(srcdir)/../../ffmpeg/libavformat  -I$(srcdir)/../../ffmpeg/libavcodec
++AM_CPPFLAGS = $(LTNOPIC)  -I$(srcdir)/../common
+ 
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+@@ -172,12 +171,7 @@ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ libaviread_la_LDFLAGS = 
+-@AMM_LINK_SHARED_FALSE@libaviread_la_DEPENDENCIES =  \
+-@AMM_LINK_SHARED_FALSE@../../ffmpeg/libavformat/libavformat.la \
+-@AMM_LINK_SHARED_FALSE@../../ffmpeg/libavcodec/libavcodec.la
+-@AMM_LINK_SHARED_TRUE@libaviread_la_DEPENDENCIES =  \
+-@AMM_LINK_SHARED_TRUE@../../ffmpeg/libavformat/libaviplayavformat.la \
+-@AMM_LINK_SHARED_TRUE@../../ffmpeg/libavcodec/libaviplayavcodec.la
++libaviread_la_DEPENDENCIES =  -lavformat -lavcodec
+ libaviread_la_OBJECTS =  AsfFileInputStream.lo asffmt.lo \
+ AsfNetworkInputStream.lo AsfReadHandler.lo AsfReadStream.lo \
+ AsfRedirectInputStream.lo AsfStreamSeekInfo.lo asf_guids.lo \
+diff -Naurp avifile-0.7-0.7.43.orig/plugins/Makefile.am avifile-0.7-0.7.43/plugins/Makefile.am
+--- avifile-0.7-0.7.43.orig/plugins/Makefile.am	2004-02-09 07:06:56.000000000 -0800
++++ avifile-0.7-0.7.43/plugins/Makefile.am	2005-03-25 17:07:57.000000000 -0800
+@@ -20,7 +20,7 @@ SUBDIRS = \
+ 
+ AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec \
+  -Ilibwin32/videocodec -Ilibwin32/loader \
+- -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec \
++ -Ilibwin32/loader/dshow \
+  -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE \
+  -Ddbg_printf=__vprintf -DTRACE=__vprintf \
+  -Wmissing-prototypes -Wimplicit-function-declaration \
+diff -Naurp avifile-0.7-0.7.43.orig/plugins/Makefile.in avifile-0.7-0.7.43/plugins/Makefile.in
+--- avifile-0.7-0.7.43.orig/plugins/Makefile.in	2005-02-24 06:26:52.000000000 -0800
++++ avifile-0.7-0.7.43/plugins/Makefile.in	2005-03-25 17:12:02.000000000 -0800
+@@ -152,7 +152,7 @@ SUBDIRS =   libac3pass  libaudiodec  lib
+ #noinst_LTLIBRARIES = libplugins.la
+ #libplugins_la_SOURCES = libplugins.cpp plugins.c
+ 
+-AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec  -Ilibwin32/videocodec -Ilibwin32/loader  -Ilibwin32/loader/dshow -I../ffmpeg/libavcodec  -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE  -Ddbg_printf=__vprintf -DTRACE=__vprintf  -Wmissing-prototypes -Wimplicit-function-declaration  -DAVIFILE
++AM_CPPFLAGS = -Ilibac3pass -Ilibwin32 -Ilibwin32/audiodec  -Ilibwin32/videocodec -Ilibwin32/loader  -Ilibwin32/loader/dshow -DWIN32_PATH=\"$(WIN32_PATH)\" -D__WINE__ -DUNICODE  -Ddbg_printf=__vprintf -DTRACE=__vprintf  -Wmissing-prototypes -Wimplicit-function-declaration  -DAVIFILE
+ 
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFAudioDecoder.h avifile-0.7-0.7.43/plugins/libffmpeg/FFAudioDecoder.h
+--- avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFAudioDecoder.h	2003-05-12 03:34:11.000000000 -0700
++++ avifile-0.7-0.7.43/plugins/libffmpeg/FFAudioDecoder.h	2005-03-25 17:19:13.000000000 -0800
+@@ -2,7 +2,12 @@
+ #define AVIFILE_FFAUDIODECODER_H
+ 
+ #include "audiodecoder.h"
+-#include "avcodec.h"
++
++#ifdef HAVE_AV_CONFIG_H
++#undef HAVE_AV_CONFIG_H
++#endif
++
++#include <ffmpeg/avcodec.h>
+ 
+ AVM_BEGIN_NAMESPACE;
+ 
+diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFVideoDecoder.h avifile-0.7-0.7.43/plugins/libffmpeg/FFVideoDecoder.h
+--- avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFVideoDecoder.h	2003-11-21 06:09:42.000000000 -0800
++++ avifile-0.7-0.7.43/plugins/libffmpeg/FFVideoDecoder.h	2005-03-25 17:17:15.000000000 -0800
+@@ -3,11 +3,11 @@
+ 
+ #include "videodecoder.h"
+ 
+-#ifndef int64_t_C
+-#define int64_t_C(c)     (c ## LL)
+-#define uint64_t_C(c)    (c ## ULL)
++#ifdef HAVE_AV_CONFIG_H
++#undef HAVE_AV_CONFIG_H
+ #endif
+-#include "avformat.h"
++
++#include <ffmpeg/avformat.h>
+ 
+ AVM_BEGIN_NAMESPACE;
+ 
+diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFVideoEncoder.h avifile-0.7-0.7.43/plugins/libffmpeg/FFVideoEncoder.h
+--- avifile-0.7-0.7.43.orig/plugins/libffmpeg/FFVideoEncoder.h	2003-06-06 02:06:26.000000000 -0700
++++ avifile-0.7-0.7.43/plugins/libffmpeg/FFVideoEncoder.h	2005-03-25 17:13:31.000000000 -0800
+@@ -2,7 +2,12 @@
+ #define AVIFILE_FFVIDEOENCODER_H
+ 
+ #include "videoencoder.h"
+-#include "avcodec.h"
++
++#ifdef HAVE_AV_CONFIG_H
++#undef HAVE_AV_CONFIG_H
++#endif
++
++#include <ffmpeg/avcodec.h>
+ 
+ #include <stdlib.h>
+ 
+diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/Makefile.am avifile-0.7-0.7.43/plugins/libffmpeg/Makefile.am
+--- avifile-0.7-0.7.43.orig/plugins/libffmpeg/Makefile.am	2003-05-26 01:49:35.000000000 -0700
++++ avifile-0.7-0.7.43/plugins/libffmpeg/Makefile.am	2005-03-25 17:11:45.000000000 -0800
+@@ -11,16 +11,13 @@ ffmpeg_la_SOURCES = \
+  FFVideoDecoder.cpp \
+  FFVideoEncoder.cpp
+ 
+-ffmpeg_la_LIBADD = $(LINK_AVIPLAY)
+-#ffmpeg_la_LIBADD = ../../ffmpeg/libavcodec/libavcodec.a
++ffmpeg_la_LIBADD = -lavformat -lavcodec
++#ffmpeg_la_LIBADD = $(LINK_AVIPLAY)
+ ffmpeg_la_LDFLAGS = -module -avoid-version
+ 
+ #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
+ #INSTRUMENT = -finstrument-functions
+-AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT) \
+- -I$(srcdir)/../../ffmpeg/libavcodec \
+- -I$(srcdir)/../../ffmpeg/libavformat \
+- -I$(srcdir)/../../ffmpeg
++AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT)
+ AM_CXXFLAGS = $(CXXRTTIEXCEPT)
+ 
+ TEST_LIBS = ../../lib/libaviplay.la $(pkglib_LTLIBRARIES) $(SDL_LIBS) $(MPATROL_LIBS) $(EFENCE_LIBS) $(KPROF_LIBS)
+diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/Makefile.in avifile-0.7-0.7.43/plugins/libffmpeg/Makefile.in
+--- avifile-0.7-0.7.43.orig/plugins/libffmpeg/Makefile.in	2005-02-24 06:26:53.000000000 -0800
++++ avifile-0.7-0.7.43/plugins/libffmpeg/Makefile.in	2005-03-25 17:11:38.000000000 -0800
+@@ -149,14 +149,13 @@ pkglib_LTLIBRARIES = ffmpeg.la
+ noinst_HEADERS = FFAudioDecoder.h FFVideoDecoder.h FFVideoEncoder.h fillplugins.h
+ ffmpeg_la_SOURCES =   libffmpeg.cpp  FFAudioDecoder.cpp  FFVideoDecoder.cpp  FFVideoEncoder.cpp
+ 
+-
+-ffmpeg_la_LIBADD = $(LINK_AVIPLAY)
+-#ffmpeg_la_LIBADD = ../../ffmpeg/libavcodec/libavcodec.a
++ffmpeg_la_LIBADD = -lavformat -lavcodec
++#ffmpeg_la_LIBADD = $(LINK_AVIPLAY)
+ ffmpeg_la_LDFLAGS = -module -avoid-version
+ 
+ #KPROF_LIBS = -L/var/tmp/kprof/lib -lkprof
+ #INSTRUMENT = -finstrument-functions
+-AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT)  -I$(srcdir)/../../ffmpeg/libavcodec  -I$(srcdir)/../../ffmpeg/libavformat  -I$(srcdir)/../../ffmpeg
++AM_CPPFLAGS = $(LTNOPIC) $(INSTRUMENT)
+ 
+ AM_CXXFLAGS = $(CXXRTTIEXCEPT)
+ 
+diff -Naurp avifile-0.7-0.7.43.orig/plugins/libffmpeg/fillplugins.h avifile-0.7-0.7.43/plugins/libffmpeg/fillplugins.h
+--- avifile-0.7-0.7.43.orig/plugins/libffmpeg/fillplugins.h	2004-05-14 03:56:52.000000000 -0700
++++ avifile-0.7-0.7.43/plugins/libffmpeg/fillplugins.h	2005-03-25 17:18:29.000000000 -0800
+@@ -4,12 +4,11 @@
+ #include "infotypes.h"
+ #include "avm_fourcc.h"
+ 
+-//#include "avcodec.h"
+-#ifndef int64_t_C
+-#define int64_t_C(c)     (c ## LL)
+-#define uint64_t_C(c)    (c ## ULL)
++#ifdef HAVE_AV_CONFIG_H
++#undef HAVE_AV_CONFIG_H
+ #endif
+-#include "avformat.h"
++
++#include <ffmpeg/avformat.h>
+ 
+ #include <string.h>
+ #include <stdlib.h>
diff --git a/media-video/avifile/files/digest-avifile-0.7.32.20030219 b/media-video/avifile/files/digest-avifile-0.7.32.20030219
deleted file mode 100644
index 4ffd520c0b71..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.32.20030219
+++ /dev/null
@@ -1 +0,0 @@
-MD5 352cd26ecb703bc0f0702bb6df5fa094 avifile-0.7.32-20030219.tgz 2740934
diff --git a/media-video/avifile/files/digest-avifile-0.7.37.20030522-r2 b/media-video/avifile/files/digest-avifile-0.7.37.20030522-r2
deleted file mode 100644
index decb06dd70e4..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.37.20030522-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 074bd003318128e433dd96a64c80b776 avifile-0.7.37-20030522.tgz 2862210
diff --git a/media-video/avifile/files/digest-avifile-0.7.41.20041001 b/media-video/avifile/files/digest-avifile-0.7.41.20041001
deleted file mode 100644
index 019a69ee1a1c..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.41.20041001
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a08911965d81a02ded95ddb95f63e1cf avifile-0.7-0.7.41.tar.gz 3498203
diff --git a/media-video/avifile/files/digest-avifile-0.7.43.20050224 b/media-video/avifile/files/digest-avifile-0.7.43.20050224-r1
index b11df39b38be..b11df39b38be 100644
--- a/media-video/avifile/files/digest-avifile-0.7.43.20050224
+++ b/media-video/avifile/files/digest-avifile-0.7.43.20050224-r1