upstream bugfix releasE

5 files changed, 132 insertions, 33 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 643135d2ce4a..22caba4ec90a 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2002/04/29 03:57:12 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.12 2002/04/30 09:49:50 seemant Exp $
+
+*avifile-0.7.4-20020426 (20 Apr 2002)
+
+  30 Apr 2002; Seemant Kulleen <seemant@gentoo.org> avifile-0.7.4-20020426.ebuild
+  files/digest-avifile-0.7.4-20020426 :
+
+  Version bump to newest snapshot.  Upstream claims this is a bugfix release.
 
 *avifile-0.7.3.20020419-r1 (28 Apr 2002)
 
diff --git a/media-video/avifile/avifile-0.6.0.20011220-r1.ebuild b/media-video/avifile/avifile-0.6.0.20011220-r1.ebuild
index 1eaec8b726f3..cb31945e2d6c 100644
--- a/media-video/avifile/avifile-0.6.0.20011220-r1.ebuild
+++ b/media-video/avifile/avifile-0.6.0.20011220-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author:  Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20011220-r1.ebuild,v 1.2 2002/04/13 17:22:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20011220-r1.ebuild,v 1.3 2002/04/30 09:49:50 seemant Exp $
 
 MY_P=${P/.200/-200}
 MY_S=${MY_P/avifile-/avifile}
@@ -11,7 +11,7 @@ DESCRIPTION="Library for AVI-Files"
 SRC_URI="http://avifile.sourceforge.net/${MY_P}admin.tgz"
 HOMEPAGE="http://divx.euro.ru/"
 
-DEPEND=">=media-libs/divx4linux-20011025
+DEPEND="=media-libs/divx4linux-20011025*
 	media-libs/jpeg
 	media-libs/win32codecs
 	sdl? ( >=media-libs/libsdl-1.2.2 )
@@ -19,6 +19,7 @@ DEPEND=">=media-libs/divx4linux-20011025
 	nas? ( >=media-libs/nas-1.4.2 )
 	oggvorbis? ( media-libs/libvorbis )"
 
+SLOT="0.6"
 
 src_compile() {
 
@@ -28,22 +29,22 @@ src_compile() {
 	use sse && myconf="--enable-x86opt"
 	use 3dnow && myconf="--enable-x86opt"
 
-	use qt	\
-		&& myconf="${myconf} --with-qt-dir=/usr/qt/2"	\
+	use qt \
+		&& myconf="${myconf} --with-qt-dir=/usr/qt/2" \
 		|| myconf="${myconf} --disable-qt"
 	
-	use kde	\
-		&& myconf="${myconf} --enable-kde"	\
+	use kde \
+		&& myconf="${myconf} --enable-kde" \
 		|| myconf="${myconf} --disable-kde"
 	
-	use sdl	\
-		&& myconf="${myconf} --enable-sdl"	\
+	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"	\
+	use oggvorbis \
+		&& myconf="${myconf} --enable-vorbis" \
 		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
 
 	export CFLAGS=${CFLAGS/-O?/-O2}
diff --git a/media-video/avifile/avifile-0.6.0.20011220-r2.ebuild b/media-video/avifile/avifile-0.6.0.20011220-r2.ebuild
index 119ab2c9b3e9..535c33c3f150 100644
--- a/media-video/avifile/avifile-0.6.0.20011220-r2.ebuild
+++ b/media-video/avifile/avifile-0.6.0.20011220-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author:  Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20011220-r2.ebuild,v 1.6 2002/04/29 22:05:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.6.0.20011220-r2.ebuild,v 1.7 2002/04/30 09:49:50 seemant Exp $
 
 MY_P=${P/.200/-200}
 MY_S=${MY_P/avifile-/avifile}
@@ -19,32 +19,33 @@ DEPEND="=media-libs/divx4linux-20011025*
 	sdl? ( >=media-libs/libsdl-1.2.2 )
 	oggvorbis? ( media-libs/libvorbis )"
 
+SLOT="0.6"
 
 src_compile() {
 
 	local myconf
 	local kdepre 
 
-	use mmx && myconf="--enable-x86opt"
-	use sse && myconf="--enable-x86opt"
-	use 3dnow && myconf="--enable-x86opt"
+	( use mmx || use sse || use 3dnow ) && myconf="--enable-x86opt"
+	#use sse && myconf="--enable-x86opt"
+	#use 3dnow && myconf="--enable-x86opt"
 
-	use qt	\
-		&& myconf="${myconf} --with-qt-dir=${QTDIR}"	\
+	use qt \
+		&& myconf="${myconf} --with-qt-dir=${QTDIR}" \
 		|| myconf="${myconf} --disable-qt"
 	
-	use kde	\
-		&& myconf="${myconf} --enable-kde"	\
+	use kde \
+		&& myconf="${myconf} --enable-kde" \
 		|| myconf="${myconf} --disable-kde"
 	
-	use sdl	\
-		&& myconf="${myconf} --enable-sdl"	\
+	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"	\
+	use oggvorbis \
+		&& myconf="${myconf} --enable-vorbis" \
 		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
 	
 	use kde \
diff --git a/media-video/avifile/avifile-0.7.3.20020419.ebuild b/media-video/avifile/avifile-0.7.3.20020419.ebuild
index 5d9784c60e1b..496acc7d0c62 100644
--- a/media-video/avifile/avifile-0.7.3.20020419.ebuild
+++ b/media-video/avifile/avifile-0.7.3.20020419.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author:  Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.3.20020419.ebuild,v 1.1 2002/04/24 21:09:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.3.20020419.ebuild,v 1.2 2002/04/30 09:49:50 seemant Exp $
 
 MY_P=${P/.200/-200}
 MY_S=${P/avifile-/avifile}
@@ -11,7 +11,7 @@ DESCRIPTION="Library for AVI-Files"
 SRC_URI="http://avifile.sourceforge.net/${MY_P}.tgz"
 HOMEPAGE="http://avifile.sourceforge.net/"
 
-DEPEND=">=media-libs/divx4linux-20011025
+DEPEND=">media-libs/divx4linux-20011025
 	media-libs/jpeg
 	media-libs/win32codecs
 	qt? ( x11-libs/qt )
@@ -19,6 +19,7 @@ DEPEND=">=media-libs/divx4linux-20011025
 	sdl? ( >=media-libs/libsdl-1.2.2 )
 	oggvorbis? ( media-libs/libvorbis )"
 
+SLOT="0.7"
 
 src_compile() {
 
@@ -31,22 +32,22 @@ src_compile() {
 	use sse && myconf="--enable-x86opt"
 	use 3dnow && myconf="--enable-x86opt"
 
-	use qt	\
-		&& myconf="${myconf} --with-qt-dir=${QTDIR}"	\
+	use qt \
+		&& myconf="${myconf} --with-qt-dir=${QTDIR}" \
 		|| myconf="${myconf} --disable-qt"
 	
-	use kde	\
-		&& myconf="${myconf} --enable-kde"	\
+	use kde \
+		&& myconf="${myconf} --enable-kde" \
 		|| myconf="${myconf} --disable-kde"
 	
-	use sdl	\
-		&& myconf="${myconf} --enable-sdl"	\
+	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"	\
+	use oggvorbis \
+		&& myconf="${myconf} --enable-vorbis" \
 		|| myconf="${myconf} --disable-vorbis --disable-oggtest --disable-vorbistest"
 	
 	use kde \
diff --git a/media-video/avifile/avifile-0.7.4.20020426.ebuild b/media-video/avifile/avifile-0.7.4.20020426.ebuild
new file mode 100644
index 000000000000..fc4ad2092df8
--- /dev/null
+++ b/media-video/avifile/avifile-0.7.4.20020426.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author:  Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.4.20020426.ebuild,v 1.1 2002/04/30 09:49:50 seemant Exp $
+
+MY_P=${P/.200/-200}
+MY_S=${PN}0.7-0.7.4
+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-20011025
+	media-libs/jpeg
+	media-libs/win32codecs
+	qt? ( x11-libs/qt )
+	nas? ( >=media-libs/nas-1.4.2 )
+	sdl? ( >=media-libs/libsdl-1.2.2 )
+	oggvorbis? ( media-libs/libvorbis )"
+
+SLOT="0.7"
+
+src_compile() {
+
+	einfo "${S}"
+
+	local myconf
+	local kdepre 
+	
+	myconf="--program-suffix=0.7"
+	
+	( 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}"
+		)
+
+	
+	# this version has b0rked a52 support -- author recommends disabling it
+	myconf="${myconf} --disable-a52"
+	
+	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
+}