more cleanups

2 files changed, 37 insertions, 37 deletions

diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 1fb6b6a26cf1..3ad272f239f8 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 MD5 9dcab1f0d57db45c8f624fb66ff026dc transcode-0.6.12-r2.ebuild 4358
 MD5 c80f5ba2b8c5e29550c8e7e464840fe9 ChangeLog 14209
-MD5 7a090c4dcdb2fa5b11c303eedcc40d05 transcode-0.6.13.ebuild 2561
+MD5 7a7e996c34b77ef59ca5c09d760a5bba transcode-0.6.13.ebuild 2734
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 d1c7003902b194931e4fcf7994105fb5 transcode-0.6.10.ebuild 3758
 MD5 f9eec7a52a7ed77258780fe2864a6a68 transcode-0.6.11.ebuild 3824
@@ -23,7 +23,7 @@ MD5 b2561dbf66455c878a08afd19868dc5d files/transcode-0.6.12-gcc-3.4.patch 2503
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBgOKVRPjscZbntocRAnLdAJ4in1hP3YbYwCCVUYC78axMuI8itQCfW+57
-85aM6JP3fgT+f/AABvVREd0=
-=MBKE
+iD8DBQFBgiOoRPjscZbntocRAkztAJ4uUlR5kqjh6MV7m9jmgDUOb6zV3wCfY/wv
+gj5CSTS2c2OL8qTDyPJoBdM=
+=nmwv
 -----END PGP SIGNATURE-----
diff --git a/media-video/transcode/transcode-0.6.13.ebuild b/media-video/transcode/transcode-0.6.13.ebuild
index 3134ee845957..4424451416fa 100644
--- a/media-video/transcode/transcode-0.6.13.ebuild
+++ b/media-video/transcode/transcode-0.6.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.13.ebuild,v 1.3 2004/10/28 12:14:31 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.13.ebuild,v 1.4 2004/10/29 11:04:40 zypher Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -21,20 +21,25 @@ DEPEND=">=media-libs/a52dec-0.7.4
 	>=media-libs/libdv-0.99
 	x86? ( >=dev-lang/nasm-0.98.36 )
 	>=media-libs/libdvdread-0.9.0
-	>=media-video/ffmpeg-0.4.6
+	>=media-video/ffmpeg-0.4.9_pre1
 	>=media-libs/xvid-1.0.2
-	>=media-video/mjpegtools-1.6.0
+	>=media-video/mjpegtools-1.6.2-r3
 	>=dev-libs/lzo-1.08
-	>=media-libs/libfame-0.9.0
+	>=media-libs/libfame-0.9.1
 	>=media-gfx/imagemagick-5.5.6.0
 	media-libs/netpbm
+	media-libs/libexif
 	X? ( virtual/x11 )
 	avi? (	>=media-video/avifile-0.7.41.20041001 )
 	divx4linux? ( x86? ( >=media-libs/divx4linux-20030428 ) )
 	mpeg? ( media-libs/libmpeg3 )
 	encode? ( >=media-sound/lame-3.93 )
 	sdl? ( media-libs/libsdl )
-	quicktime? ( >=media-libs/libquicktime-0.9.3 )"
+	quicktime? ( >=media-libs/libquicktime-0.9.3 )
+	oggvorbis? ( media-libs/libvorbis
+		    media-libs/libogg )
+	theora? ( media-libs/libtheora )"
+#	pvm? ( >=sys-cluster/pvm-3.4 )
 
 src_unpack() {
 	unpack ${A}
@@ -44,50 +49,45 @@ src_unpack() {
 src_compile() {
 	filter-flags -maltivec -mabi=altivec
 
-	local myconf="--with-dvdread --enable-mjpegtools  --with-mjpegtools \
-		--enable-imagemagick --enable-lzo --enable-a52 --enable-fame"
-
 	# fix invalid paths in .la files of plugins
 	elibtoolize
 
-	use quicktime && myconf="${myconf} --enable-libquicktime"
-
-#	if use quicktime; then
-#		has_version 'media-libs/libquicktime' \
-#		&& myconf="${myconf} --enable-libquicktime" \
-#		|| einfo "Libquicktime needed for quicktime support"
-#	fi
-
-	if use avi; then
-		myconf="${myconf} --enable-avifile --with-avifile"
-	fi
-
-	if use oggvorbis; then
-		myconf="${myconf} --enable-ogg --enable-vorbis"
-	fi
+	local myconf="--with-dvdread --enable-mjpegtools  --with-mjpegtools \
+		--enable-imagemagick --enable-lzo --enable-a52 --enable-libfame"
 
+	use quicktime && myconf="${myconf} --enable-libquicktime"
 
+#	use pvm \
+#		&& myconf="${myconf} --enable-pvm3 \
+#			--with-pvm3-lib=${PVM_ROOT}/lib/LINUX \
+#			--with-pvm3-include=${PVM_ROOT}/include"
 
 	# Use the MPlayer libpostproc if present
 	[ -f ${ROOT}/usr/lib/libpostproc.a ] && \
 	[ -f ${ROOT}/usr/include/postproc/postprocess.h ] && \
 		myconf="${myconf} --with-libpostproc-builddir=${ROOT}/usr/lib"
 
+	append-flags -DDCT_YUV_PRECISION=1
 	econf \
-		CFLAGS="${CFLAGS} -DDCT_YUV_PRECISION=1" \
-		`use_enable mmx` \
-		`use_enable sse` \
-		`use_enable 3dnow` \
-		`use_enable altivec` \
-		`use_enable theora` \
-		`use_enable sdl` \
-		`use_enable encode lame` \
-		`use_enable mpeg libmpeg3` \
-		`use_enable X x` \
+		$(use_enable sse) \
+		$(use_enable mmx) \
+		$(use_enable 3dnow) \
+		$(use_enable altivec) \
+		$(use_enable avi avifile) \
+		$(use_enable encode lame) \
+		$(use_enable mpeg libmpeg3) \
+		$(use_enable oggvorbis ogg) \
+		$(use_enable oggvorbis vorbis) \
+		$(use_enable theora) \
+		$(use_enable X x) \
 		${myconf} \
 		|| die
 
 	emake -j1 all || die
+
+#	if use pvm; then
+#		sed -i -e "s:\${exec_prefix}/bin/pvmgs:\$(DESTDIR)/\${exec_prefix}/bin/pvmgs:" ${S}/pvm3/Makefile || die
+#	fi
 }
 
 src_install () {