sparc and alternate arch fixes

18 files changed, 32 insertions, 815 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 18febbf5e836..3ab21d7824e0 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,9 +1,16 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.37 2003/02/06 04:31:58 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.38 2003/02/07 21:40:49 seemant Exp $
 
 *avifile-0.7.29.20030204 (04 Feb 2003)
 
+  07 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Cleaned out old, crusty ebuilds. More importantly, divx4linux and
+  win32codecs are installed ONLY on the x86 arch, not any others.  Added
+  ~sparc KEYWORD.  Closing bug #15276 by Alvaro Figueroa
+  <fede2@fuerzag.ulatina.ac.cr>
+
   05 Feb 2003; Nick Hadaway <raker@gentoo.org> avifile-0.7.29.20030204.ebuild :
   Added a pkg_postinst with a note about making aviplay suid root
   so certain video functions work properly.
diff --git a/media-video/avifile/avifile-0.7.14.20020802.ebuild b/media-video/avifile/avifile-0.7.14.20020802.ebuild
deleted file mode 100644
index d7c01bf8d2b0..000000000000
--- a/media-video/avifile/avifile-0.7.14.20020802.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.14.20020802.ebuild,v 1.10 2002/12/09 04:26:14 manson Exp $
-
-IUSE="nas avi sdl kde oggvorbis 3dnow qt"
-
-inherit libtool
-
-MY_P=${P/.200/-200}
-MY_S=${PN}0.7-0.7.14
-S=${WORKDIR}/${MY_S}
-
-DESCRIPTION="Library for AVI-Files"
-SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
-HOMEPAGE="http://avifile.sourceforge.net/"
-
-DEPEND=">=media-libs/divx4linux-20020418
-	media-libs/jpeg
-	x86? ( media-libs/win32codecs )
-	qt? ( >=x11-libs/qt-3.0.3 )
-	nas? ( >=media-libs/nas-1.4.2 )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	oggvorbis? ( media-libs/libvorbis )"
-
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-src_compile() {
-
-	elibtoolize
-
-	local myconf=""
-	local kdepre=""
-	
-	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
-	use qt \
-		&& myconf="${myconf} --with-qt-dir=${QTDIR}" \
-		|| myconf="${myconf} --without-qt"
-	
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-	
-	use nas && LDFLAGS="-L/usr/X11R6/lib -lXt"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
-	
-	if [ `use kde` ]
-	then
-		myconf="${myconf} --enable-kde --with-extra-libraries=${KDEDIR}"
-		LDFLAGS="${LDFLAGS} -L${KDEDIR}/lib"
-	else
-		myconf="${myconf} --disable-kde"
-		LDFLAGS="${LDFLAGS}"
-	fi
-
-	# Rather not use custom ones here .. build should set as high as
-	# safe by itself.
-	unset CFLAGS CXXFLAGS LDFLAGS
-	
-	econf \
-		--enable-quiet \
-		--disable-tsc \
-		${myconf} || die
-		
-	make || die
-}
-
-src_install () {
-
-	dodir /usr/lib /usr/bin
-	use avi && dodir /usr/lib/win32
-
-	make prefix=${D}/usr datadir=${S}/usr/share install || die
-
-	cd ${S}
-	dodoc COPYING README
-	cd doc
-	dodoc CREDITS EXCEPTIONS FreeBSD LICENSING TODO
-	dodoc VIDEO-PERFORMANCE WARNINGS
-}
diff --git a/media-video/avifile/avifile-0.7.15.20020816-r1.ebuild b/media-video/avifile/avifile-0.7.15.20020816-r1.ebuild
index 90701694e568..fc19b977e884 100644
--- a/media-video/avifile/avifile-0.7.15.20020816-r1.ebuild
+++ b/media-video/avifile/avifile-0.7.15.20020816-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.15.20020816-r1.ebuild,v 1.2 2003/01/19 14:46:57 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.15.20020816-r1.ebuild,v 1.3 2003/02/07 21:40:49 seemant Exp $
 
 IUSE="nas avi sdl kde oggvorbis 3dnow qt"
 
@@ -14,18 +14,18 @@ DESCRIPTION="Library for AVI-Files"
 SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
 HOMEPAGE="http://avifile.sourceforge.net/"
 
-DEPEND=">=media-libs/divx4linux-20020418
-	media-libs/jpeg
-	media-libs/win32codecs
+SLOT="0.7"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~sparc"
+
+DEPEND="media-libs/jpeg
+	x86? ( >=media-libs/divx4linux-20020418
+		media-libs/win32codecs )
 	qt? ( >=x11-libs/qt-3.0.3 )
 	nas? ( >=media-libs/nas-1.4.2 )
 	sdl? ( >=media-libs/libsdl-1.2.2 )
 	oggvorbis? ( media-libs/libvorbis )"
 
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
 src_compile() {
 
 	elibtoolize
diff --git a/media-video/avifile/avifile-0.7.15.20020816.ebuild b/media-video/avifile/avifile-0.7.15.20020816.ebuild
deleted file mode 100644
index 86e4d7bd540b..000000000000
--- a/media-video/avifile/avifile-0.7.15.20020816.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.15.20020816.ebuild,v 1.5 2003/01/19 14:46:57 azarah Exp $
-
-IUSE="nas avi sdl kde oggvorbis 3dnow qt"
-
-inherit libtool
-
-MY_P=${P/.200/-200}
-MY_S=${PN}0.7-0.7.15
-S=${WORKDIR}/${MY_S}
-
-DESCRIPTION="Library for AVI-Files"
-SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
-HOMEPAGE="http://avifile.sourceforge.net/"
-
-DEPEND=">=media-libs/divx4linux-20020418
-	media-libs/jpeg
-	media-libs/win32codecs
-	qt? ( >=x11-libs/qt-3.0.3 )
-	nas? ( >=media-libs/nas-1.4.2 )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	oggvorbis? ( media-libs/libvorbis )"
-
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_compile() {
-
-	elibtoolize
-
-	local myconf=""
-	local kdepre=""
-	
-	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
-	use qt \
-		&& myconf="${myconf} --with-qt-dir=${QTDIR}" \
-		|| myconf="${myconf} --without-qt"
-	
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-	
-	use nas && LDFLAGS="-L/usr/X11R6/lib -lXt"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
-	
-#	if [ `use kde` ]
-#	then
-#		myconf="${myconf} --enable-kde --with-extra-libraries=${KDEDIR}"
-#		LDFLAGS="${LDFLAGS} -L${KDEDIR}/lib"
-#	else
-		myconf="${myconf} --disable-kde"
-#		LDFLAGS="${LDFLAGS}"
-#	fi
-
-	# Rather not use custom ones here .. build should set as high as
-	# safe by itself.
-	unset CFLAGS CXXFLAGS LDFLAGS
-	
-	econf \
-		--enable-quiet \
-		--disable-tsc \
-		${myconf} || die
-		
-	make || die
-}
-
-src_install () {
-
-	dodir /usr/lib /usr/bin
-	use avi && dodir /usr/lib/win32
-
-	make prefix=${D}/usr datadir=${D}/usr/share install || die
-
-	cd ${S}
-	dodoc COPYING README
-	cd doc
-	dodoc CREDITS EXCEPTIONS FreeBSD LICENSING TODO
-	dodoc VIDEO-PERFORMANCE WARNINGS
-}
diff --git a/media-video/avifile/avifile-0.7.22.20021129.ebuild b/media-video/avifile/avifile-0.7.22.20021129.ebuild
deleted file mode 100644
index 42943679e0f6..000000000000
--- a/media-video/avifile/avifile-0.7.22.20021129.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.22.20021129.ebuild,v 1.5 2003/01/19 14:46:57 azarah Exp $
-
-IUSE="nas avi sdl kde oggvorbis 3dnow qt"
-
-inherit libtool
-
-MY_P="${P/.200/-200}"
-MY_S="${PN}0.7-0.7.22"
-S="${WORKDIR}/${MY_S}"
-
-DESCRIPTION="Library for AVI-Files"
-SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
-HOMEPAGE="http://avifile.sourceforge.net/"
-
-# media-libs/xvid is still marked unstable.  This will be added to the
-# list of deps soon! (hopefully) - raker 12/12/2002
-DEPEND=">=media-libs/divx4linux-20020418
-	media-libs/jpeg
-	media-libs/win32codecs
-	qt? ( >=x11-libs/qt-3.0.3 )
-	nas? ( >=media-libs/nas-1.4.2 )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	oggvorbis? ( media-libs/libvorbis )"
-
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-src_compile() {
-
-	elibtoolize
-
-	local myconf=""
-	local kdepre=""
-	
-	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
-	use qt \
-		&& myconf="${myconf} --with-qt-dir=${QTDIR}" \
-		|| myconf="${myconf} --without-qt"
-	
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-	
-	use nas && LDFLAGS="-L/usr/X11R6/lib -lXt"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
-	
-#	if [ `use kde` ]
-#	then
-#		myconf="${myconf} --enable-kde --with-extra-libraries=${KDEDIR}"
-#		LDFLAGS="${LDFLAGS} -L${KDEDIR}/lib"
-#	else
-		myconf="${myconf} --disable-kde"
-#		LDFLAGS="${LDFLAGS}"
-#	fi
-
-	# Rather not use custom ones here .. build should set as high as
-	# safe by itself.
-	unset CFLAGS CXXFLAGS LDFLAGS
-
-	# 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-quiet \
-		--disable-tsc \
-		--with-fpic \
-		${myconf} || die
-		
-	make || 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
-}
-
diff --git a/media-video/avifile/avifile-0.7.25.20030114.ebuild b/media-video/avifile/avifile-0.7.25.20030114.ebuild
deleted file mode 100644
index 19a3612bc9b4..000000000000
--- a/media-video/avifile/avifile-0.7.25.20030114.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.25.20030114.ebuild,v 1.3 2003/01/20 00:49:10 azarah Exp $
-
-IUSE="nas avi sdl kde oggvorbis 3dnow qt"
-
-inherit libtool
-
-MY_P="${P/.200/-200}"
-MY_S="${PN}0.7-0.7.25"
-S="${WORKDIR}/${MY_S}"
-
-DESCRIPTION="Library for AVI-Files"
-SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
-HOMEPAGE="http://avifile.sourceforge.net/"
-
-# media-libs/xvid is still marked unstable.  This will be added to the
-# list of deps soon! (hopefully) - raker 12/12/2002
-DEPEND=">=media-libs/divx4linux-20020418
-	media-libs/jpeg
-	media-libs/win32codecs
-	qt? ( >=x11-libs/qt-3.0.3 )
-	nas? ( >=media-libs/nas-1.4.2 )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	oggvorbis? ( media-libs/libvorbis )"
-
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-src_compile() {
-
-	elibtoolize
-
-	local myconf=""
-	local kdepre=""
-	
-	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
-	use qt \
-		&& myconf="${myconf} --with-qt-dir=${QTDIR}" \
-		|| myconf="${myconf} --without-qt"
-	
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-	
-	use nas && LDFLAGS="-L/usr/X11R6/lib -lXt"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
-	
-#	if [ `use kde` ]
-#	then
-#		myconf="${myconf} --enable-kde --with-extra-libraries=${KDEDIR}"
-#		LDFLAGS="${LDFLAGS} -L${KDEDIR}/lib"
-#	else
-		myconf="${myconf} --disable-kde"
-#		LDFLAGS="${LDFLAGS}"
-#	fi
-
-	# Rather not use custom ones here .. build should set as high as
-	# safe by itself.
-	unset CFLAGS CXXFLAGS LDFLAGS
-
-	# 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-quiet \
-		--disable-tsc \
-		--with-fpic \
-		${myconf} || die
-		
-	make || 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
-}
-
diff --git a/media-video/avifile/avifile-0.7.26.20030117.ebuild b/media-video/avifile/avifile-0.7.26.20030117.ebuild
deleted file mode 100644
index e178b8ebbea8..000000000000
--- a/media-video/avifile/avifile-0.7.26.20030117.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.26.20030117.ebuild,v 1.1 2003/01/23 11:25:17 raker Exp $
-
-IUSE="static freetype xv sdl oss dvd mmx sse 3dnow zlib oggvorbis X qt"
-
-inherit libtool
-
-MY_P="${P/.200/-200}"
-MY_S="${PN}0.7-0.7.26"
-S="${WORKDIR}/${MY_S}"
-
-DESCRIPTION="Library for AVI-Files"
-SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
-HOMEPAGE="http://avifile.sourceforge.net/"
-
-DEPEND=">=media-libs/divx4linux-20020418
-	>=media-libs/jpeg-6b
-	>=media-libs/win32codecs-0.90
-	>=media-video/ffmpeg-0.4
-	>=media-sound/mad-0.14
-	>=media-libs/xvid-0.9.0
-	>=media-sound/lame-3.90
-	>=sys-devel/automake-1.7
-	freetype? ( >=media-libs/freetype-2.1 )
-	xv? ( >=x11-base/xfree-4.2.1 )
-	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? ( >=x11-base/xfree-4.2.0 >=x11-libs/xft-2.0.1 )
-	qt? ( >=x11-libs/qt-3.0.3 )"
-
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-src_compile() {
-
-	elibtoolize
-
-	local myconf=""
-	local kdepre=""
-
-	use static \
-		&& myconf="${myconf} --enable-static" \
-		|| myconf="${myconf} --disable-static"
-
-	use freetype \
-		&& 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
-
-	use oss \
-		&& myconf="${myconf} --enable-oss" \
-		|| myconf="${myconf} --disable-oss"
-
-	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
-
-	if [ ! -z $DEBUGBUILD ]; then
-		myconf="${myconf} --enable-loader-out --enable-timing"
-	else
-		myconf="${myconf} --enable-quiet"
-	fi
-
-	( 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
-		
-	export CC="gcc"
-	export CXX="g++"
-
-	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
-}
-
diff --git a/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild b/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild
index 7bf0f220c167..0f3937e8a41f 100644
--- a/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild
+++ b/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild,v 1.4 2003/02/01 20:07:17 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.27.20030122-r1.ebuild,v 1.5 2003/02/07 21:40:49 seemant Exp $
 
 IUSE="static freetype xv sdl oss dvd mmx sse 3dnow zlib oggvorbis X qt"
 
@@ -15,9 +15,13 @@ SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz
 	mirror://gentoo/20030130.diff.bz2"
 HOMEPAGE="http://avifile.sourceforge.net/"
 
-DEPEND=">=media-libs/divx4linux-20020418
-	>=media-libs/jpeg-6b
-	>=media-libs/win32codecs-0.90
+SLOT="0.7"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+
+DEPEND=">=media-libs/jpeg-6b
+	x86? ( >=media-libs/divx4linux-20020418
+		>=media-libs/win32codecs-0.90 )
 	>=media-video/ffmpeg-0.4
 	>=media-sound/mad-0.14
 	>=media-libs/xvid-0.9.0
@@ -34,10 +38,6 @@ DEPEND=">=media-libs/divx4linux-20020418
 	X? ( >=x11-base/xfree-4.2.0 >=x11-libs/xft-2.0.1 )
 	qt? ( >=x11-libs/qt-3.0.3 )"
 
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
 src_unpack() {
         unpack ${MY_P}.tgz
         cd ${S}
diff --git a/media-video/avifile/avifile-0.7.27.20030122.ebuild b/media-video/avifile/avifile-0.7.27.20030122.ebuild
deleted file mode 100644
index 835d1451171d..000000000000
--- a/media-video/avifile/avifile-0.7.27.20030122.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.27.20030122.ebuild,v 1.1 2003/01/23 18:55:52 raker Exp $
-
-IUSE="static freetype xv sdl oss dvd mmx sse 3dnow zlib oggvorbis X qt"
-
-inherit libtool
-
-MY_P="${P/.200/-200}"
-MY_S="${PN}0.7-0.7.27"
-S="${WORKDIR}/${MY_S}"
-
-DESCRIPTION="Library for AVI-Files"
-SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
-HOMEPAGE="http://avifile.sourceforge.net/"
-
-DEPEND=">=media-libs/divx4linux-20020418
-	>=media-libs/jpeg-6b
-	>=media-libs/win32codecs-0.90
-	>=media-video/ffmpeg-0.4
-	>=media-sound/mad-0.14
-	>=media-libs/xvid-0.9.0
-	>=media-sound/lame-3.90
-	freetype? ( >=media-libs/freetype-2.1 )
-	xv? ( >=x11-base/xfree-4.2.1 )
-	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? ( >=x11-base/xfree-4.2.0 >=x11-libs/xft-2.0.1 )
-	qt? ( >=x11-libs/qt-3.0.3 )"
-
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-src_compile() {
-
-	elibtoolize
-
-	local myconf=""
-	local kdepre=""
-
-	use static \
-		&& myconf="${myconf} --enable-static" \
-		|| myconf="${myconf} --disable-static"
-
-	use freetype \
-		&& 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
-
-	use oss \
-		&& myconf="${myconf} --enable-oss" \
-		|| myconf="${myconf} --disable-oss"
-
-	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
-
-	if [ ! -z $DEBUGBUILD ]; then
-		myconf="${myconf} --enable-loader-out --enable-timing"
-	else
-		myconf="${myconf} --enable-quiet"
-	fi
-
-	( 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
-		
-	export CC="gcc"
-	export CXX="g++"
-
-	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
-}
-
diff --git a/media-video/avifile/avifile-0.7.29.20030204.ebuild b/media-video/avifile/avifile-0.7.29.20030204.ebuild
index 20a3dfc72c8b..82d6260f60b5 100644
--- a/media-video/avifile/avifile-0.7.29.20030204.ebuild
+++ b/media-video/avifile/avifile-0.7.29.20030204.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.29.20030204.ebuild,v 1.4 2003/02/06 19:30:03 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.29.20030204.ebuild,v 1.5 2003/02/07 21:40:49 seemant Exp $
 
 IUSE="static freetype xv sdl oss dvd mmx sse 3dnow zlib oggvorbis X qt alsa esd"
 
@@ -13,9 +13,13 @@ SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz
 	mirror://gentoo/20030130.diff.bz2"
 HOMEPAGE="http://avifile.sourceforge.net/"
 
-DEPEND=">=media-libs/divx4linux-20020418
-	>=media-libs/jpeg-6b
-	>=media-libs/win32codecs-0.90
+SLOT="0.7"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+
+DEPEND=">=media-libs/jpeg-6b
+	x86? ( >=media-libs/divx4linux-20020418
+		>=media-libs/win32codecs-0.90 )
 	>=media-video/ffmpeg-0.4
 	>=media-sound/mad-0.14
 	>=media-libs/xvid-0.9.0
@@ -31,9 +35,6 @@ DEPEND=">=media-libs/divx4linux-20020418
 	qt? ( >=x11-libs/qt-3.0.3 )
 	alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
 	esd? ( >=media-sound/esound-0.2.28 )"
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
 
 src_compile() {
 	local myconf=""
diff --git a/media-video/avifile/avifile-0.7.7.20020523.ebuild b/media-video/avifile/avifile-0.7.7.20020523.ebuild
deleted file mode 100644
index 55120356d82a..000000000000
--- a/media-video/avifile/avifile-0.7.7.20020523.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.7.20020523.ebuild,v 1.5 2002/10/05 05:39:16 drobbins Exp $
-
-IUSE="nas avi sdl kde oggvorbis 3dnow qt"
-
-MY_P=${P/.200/-200}
-MY_S=${PN}0.7-0.7.7
-S=${WORKDIR}/${MY_S}
-DESCRIPTION="Library for AVI-Files"
-SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
-HOMEPAGE="http://avifile.sourceforge.net/"
-
-DEPEND=">=media-libs/divx4linux-20020418
-	media-libs/jpeg
-	media-libs/win32codecs
-	qt? ( >=x11-libs/qt-3.0.3 )
-	nas? ( >=media-libs/nas-1.4.2 )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	oggvorbis? ( media-libs/libvorbis )"
-
-SLOT="0.7"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_compile() {
-
-	einfo "${S}"
-
-	local myconf=""
-	local kdepre=""
-	
-	( use mmx || use sse || use 3dnow ) && myconf="${myconf} --enable-x86opt"
-
-	use qt \
-		&& myconf="${myconf} --with-qt-dir=${QTDIR}" \
-		|| myconf="${myconf} --without-qt"
-	
-	use kde \
-		&& myconf="${myconf} --enable-kde" \
-		|| myconf="${myconf} --disable-kde"
-	
-	use sdl \
-		&& myconf="${myconf} --enable-sdl" \
-		|| myconf="${myconf} --disable-sdl --disable-sdltest"
-	
-	use nas && LDFLAGS="-L/usr/X11R6/lib -lXt"
-
-	use oggvorbis \
-		&& myconf="${myconf} --enable-vorbis" \
-		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
-	
-	use kde \
-		&& ( \ 
-			myconf="${myconf} --enable-kde" \
-			&& LDFLAGS="${LDFLAGS} -L${KDEDIR}/lib" \
-			&& myconf="${myconf} --with-extra-libraries=${KDEDIR}" \
-		) || (
-			myconf="${myconf} --disable-kde" \
-			&& LDFLAGS="${LDFLAGS}"
-		)
-
-	
-	export CFLAGS=${CFLAGS/-O?/-O2}
-	export LDFLAGS
-	./configure --prefix=/usr \
-		--host=${CHOST} \
-		--enable-quiet \
-		--disable-tsc \
-		${myconf} || die
-		
-	make || die
-}
-
-src_install () {
-
-	dodir /usr/lib /usr/bin
-	use avi && dodir /usr/lib/win32
-
-	make prefix=${D}/usr install || die
-
-	cd ${S}
-	dodoc COPYING README
-	cd doc
-	dodoc CREDITS EXCEPTIONS FreeBSD LICENSING TODO
-	dodoc VIDEO-PERFORMANCE WARNINGS
-}
diff --git a/media-video/avifile/files/digest-avifile-0.7.14.20020802 b/media-video/avifile/files/digest-avifile-0.7.14.20020802
deleted file mode 100644
index 7c8ad2ddbd6f..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.14.20020802
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78f54032f22f2b780f306bfafc14e143 avifile-0.7.14-20020802.tgz 2394408
diff --git a/media-video/avifile/files/digest-avifile-0.7.15.20020816 b/media-video/avifile/files/digest-avifile-0.7.15.20020816
deleted file mode 100644
index ce4fde2496ad..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.15.20020816
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f94cef39718bd0ef3ce0a93e57f76bb1 avifile-0.7.15-20020816.tgz 2420925
diff --git a/media-video/avifile/files/digest-avifile-0.7.22.20021129 b/media-video/avifile/files/digest-avifile-0.7.22.20021129
deleted file mode 100644
index ccbba8e9b941..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.22.20021129
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e73a68de65fe65d589d0f18486e503f avifile-0.7.22-20021129.tgz 2748947
diff --git a/media-video/avifile/files/digest-avifile-0.7.25.20030114 b/media-video/avifile/files/digest-avifile-0.7.25.20030114
deleted file mode 100644
index 8488ddea5935..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.25.20030114
+++ /dev/null
@@ -1 +0,0 @@
-MD5 28d3dc2cf9e5106d960615e0f9ce218f avifile-0.7.25-20030114.tgz 2799272
diff --git a/media-video/avifile/files/digest-avifile-0.7.26.20030117 b/media-video/avifile/files/digest-avifile-0.7.26.20030117
deleted file mode 100644
index b580e1d64538..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.26.20030117
+++ /dev/null
@@ -1 +0,0 @@
-MD5 36f19b6eaa893f46aa59bae8df820a21 avifile-0.7.26-20030117.tgz 2828062
diff --git a/media-video/avifile/files/digest-avifile-0.7.27.20030122 b/media-video/avifile/files/digest-avifile-0.7.27.20030122
deleted file mode 100644
index f351dfb7f404..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.27.20030122
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e8431bc88e0f49059077ac7138e7e47d avifile-0.7.27-20030122.tgz 2632461
diff --git a/media-video/avifile/files/digest-avifile-0.7.7.20020523 b/media-video/avifile/files/digest-avifile-0.7.7.20020523
deleted file mode 100644
index 295d056adad0..000000000000
--- a/media-video/avifile/files/digest-avifile-0.7.7.20020523
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf77a5a4d1a06454f578cd95a1743d65 avifile-0.7.7-20020523.tgz 2200128