Third times a charm. Readding .32 to unbreak mjpegtools.

4 files changed, 166 insertions, 11 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 4969784c3a89..e8a0b1250209 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.86 2004/11/30 20:00:50 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.87 2004/11/30 23:05:41 chriswhite Exp $
+
+*avifile-0.7.32.20030219 (01 Dec 2004)
+
+  01 Dec 2004; Chris White <chriswhite@gentoo.org>
+  +avifile-0.7.32.20030219.ebuild:
+  Re-adding .32 to unbreak mjpegtools.. again.
 
 *avifile-0.7.37.20030522-r2 (01 Dec 2004)
 
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index 36a3eb9e80ac..98901d25109c 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0d2598b6c8574754bc997fff2f9189a0 ChangeLog 15252
 MD5 1d3631b1ad62370f492ec32aa6762425 avifile-0.7.37.20030522-r2.ebuild 4434
+MD5 ab24ec7446ec73e983a093e98b7f99df avifile-0.7.32.20030219.ebuild 4062
 MD5 b80546f1e5f52f38abec15e91478e999 avifile-0.7.38.20030710-r1.ebuild 4008
 MD5 8a616e9640f57a62152d26753245b610 avifile-0.7.41.20041001-r1.ebuild 4591
 MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
@@ -15,14 +13,8 @@ MD5 d0f665d4394d9d9a59c9a5dadeb09882 files/avifile-0.7.41.20041001-sparc.patch 1
 MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
 MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
 MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73
+MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
 MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
 MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
 MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
 MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBrNGXFdQwWVoAgN4RAjMDAKDN3UI/c3L4MfIa8ItmM+/EmYyNKwCfSMc3
-L8a8tNIkfywBI2WE3v8wXNM=
-=/DdT
------END PGP SIGNATURE-----
diff --git a/media-video/avifile/avifile-0.7.32.20030219.ebuild b/media-video/avifile/avifile-0.7.32.20030219.ebuild
new file mode 100644
index 000000000000..6ac562360ea0
--- /dev/null
+++ b/media-video/avifile/avifile-0.7.32.20030219.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2004 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.11 2004/11/30 23:05:41 chriswhite 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/files/digest-avifile-0.7.32.20030219 b/media-video/avifile/files/digest-avifile-0.7.32.20030219
new file mode 100644
index 000000000000..4ffd520c0b71
--- /dev/null
+++ b/media-video/avifile/files/digest-avifile-0.7.32.20030219
@@ -0,0 +1 @@
+MD5 352cd26ecb703bc0f0702bb6df5fa094 avifile-0.7.32-20030219.tgz 2740934