cleanup

7 files changed, 11 insertions, 288 deletions

diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r2 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r2
deleted file mode 100644
index e262f9879cee..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cb34077cc3460494bc3759e3655e5263 mjpegtools-1.6.0.tar.gz 928991
-MD5 963b168854e8f74590c71aaaaedf5177 quicktime4linux-1.4-patched.tar.gz 560533
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r3 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r3
deleted file mode 100644
index e262f9879cee..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cb34077cc3460494bc3759e3655e5263 mjpegtools-1.6.0.tar.gz 928991
-MD5 963b168854e8f74590c71aaaaedf5177 quicktime4linux-1.4-patched.tar.gz 560533
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r4 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r4
deleted file mode 100644
index e262f9879cee..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.6.0-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cb34077cc3460494bc3759e3655e5263 mjpegtools-1.6.0.tar.gz 928991
-MD5 963b168854e8f74590c71aaaaedf5177 quicktime4linux-1.4-patched.tar.gz 560533
diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r2.ebuild
deleted file mode 100644
index c142aaf31072..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Heavily modified by Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r2.ebuild,v 1.6 2003/02/13 13:29:08 vapier Exp $
-
-IUSE="gtk mmx sdl X quicktime avi"
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools for MJPEG video"
-SRC_URI="http://download.sourceforge.net/mjpeg/${P}.tar.gz
-	 quicktime? ( http://download.sourceforge.net/mjpeg/quicktime4linux-1.4-patched.tar.gz )"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="x86"
-
-RDEPEND="media-libs/jpeg
-	media-libs/libpng
-	=x11-libs/gtk+-1.2*
-	X? ( x11-base/xfree )
-	sdl? ( media-libs/libsdl )"
-
-DEPEND="${RDEPEND}
-	media-libs/libmovtar
-	quicktime? ( media-libs/quicktime4linux )
-	mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 )"
-
-src_unpack() {
-	
-	unpack ${A}
-	cd quicktime4linux-1.4-patch
-	cp libmjpeg.h libmjpeg.h.orig
-	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h.orig > libmjpeg.h
-	cp jpeg_old.h jpeg_old.h.orig
-	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h.orig > jpeg_old.h
-	elibtoolize
-}
-
-src_compile() {
-
-	local myconf
-
-	use gtk	\
-		&& myconf="${myconf} --with-gtk-prefix=/usr"
-	
-	use X	\
-		&& myconf="${myconf} --with-x"	\
-		|| myconf="${myconf} --without-x"
-	
-	use mmx	\
-		&& myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx --enable-mmx-accel"
-	
-	use avi	\
-		&& myconf="${myconf} --without-aviplay"
-	
-	use quicktime && ( \
-		myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch"
-		cd ${WORKDIR}/quicktime4linux-1.4-patch
-		./configure || die
-		make || die
-	)
-
-	cd ${S}
-	econf ${myconf} || die
-
-	emake || die
-
-}
-
-src_install () {
-
-	make 	\
-		prefix=${D}/usr	\
-		mandir=${D}/usr/share/man	\
-		install || die
-
-	dodoc mjpeg_howto.txt
-
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r3.ebuild
deleted file mode 100644
index eb9c68676e81..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.0-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r3.ebuild,v 1.5 2003/02/13 13:29:14 vapier Exp $
-
-IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi"
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools for MJPEG video"
-SRC_URI="http://download.sourceforge.net/mjpeg/${P}.tar.gz
-	 quicktime? ( http://download.sourceforge.net/mjpeg/quicktime4linux-1.4-patched.tar.gz )"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="x86"
-
-RDEPEND="media-libs/jpeg
-	media-libs/libpng
-	=x11-libs/gtk+-1.2*
-	X? ( x11-base/xfree )
-	sdl? ( media-libs/libsdl )
-	media-libs/libdv
-	arts? ( kde-base/arts )"
-
-DEPEND="${RDEPEND}
-	mmx? media-libs/libmovtar
-	quicktime? ( >=media-libs/quicktime4linux-1.5.5-r1 )
-	mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 )
-	mmx? ( dev-lang/nasm )
-	3dnow? ( dev-lang/nasm )
-	sse? ( dev-lang/nasm )
-	media-libs/libdv
-	arts? ( kde-base/arts )"
-
-if [ `use mmx` ] ; then
-	RDEPEND="$RDEPEND media-libs/jpeg-mmx"
-	DEPEND="$DEPEND media-libs/jpeg-mmx"
-fi
-
-if [ `use mmx` ] || [ `use 3dnow` ] || [ `use sse` ] ; then
-	DEPEND="$DEPEND dev-lang/nasm"
-fi
-
-src_unpack() {
-	
-	unpack ${A}
-	cd quicktime4linux-1.4-patch
-	cp libmjpeg.h libmjpeg.h.orig
-	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h.orig > libmjpeg.h
-	cp jpeg_old.h jpeg_old.h.orig
-	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h.orig > jpeg_old.h
-	elibtoolize
-}
-
-src_compile() {
-
-	local myconf
-
-	use gtk	\
-		&& myconf="${myconf} --with-gtk-prefix=/usr"
-	
-	use X	\
-		&& myconf="${myconf} --with-x"	\
-		|| myconf="${myconf} --without-x"
-	
-	use mmx	\
-		&& myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx --enable-mmx-accel"
-	
-	use avi	\
-		&& myconf="${myconf} --without-aviplay"
-	
-	use quicktime && ( \
-		myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch"
-		cd ${WORKDIR}/quicktime4linux-1.4-patch
-		./configure || die
-		make || die
-	)
-
-	cd ${S}
-	econf ${myconf} || die
-
-	emake || die
-
-}
-
-src_install () {
-
-	make 	\
-		prefix=${D}/usr	\
-		mandir=${D}/usr/share/man	\
-		install || die
-
-	dodoc mjpeg_howto.txt
-
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r4.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r4.ebuild
deleted file mode 100644
index fc2ee030139d..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.6.0-r4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r4.ebuild,v 1.2 2003/02/13 13:29:20 vapier Exp $
-
-IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi"
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Tools for MJPEG video"
-SRC_URI="http://download.sourceforge.net/mjpeg/${P}.tar.gz
-	 quicktime? ( http://download.sourceforge.net/mjpeg/quicktime4linux-1.4-patched.tar.gz )"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-
-LICENSE="as-is"
-SLOT="1"
-KEYWORDS="x86"
-
-RDEPEND="media-libs/jpeg
-	media-libs/libpng
-	=x11-libs/gtk+-1.2*
-	X? ( x11-base/xfree )
-	sdl? ( media-libs/libsdl )
-	media-libs/libdv
-	arts? ( kde-base/arts )"
-
-DEPEND="${RDEPEND}
-	media-libs/libmovtar
-	avi? ( media-video/avifile )
-	quicktime? ( >=media-libs/quicktime4linux-1.5.5-r1 )
-	mmx? ( >=media-libs/jpeg-mmx-1.1.2-r1 )
-	mmx? ( dev-lang/nasm )
-	3dnow? ( dev-lang/nasm )
-	sse? ( dev-lang/nasm )
-	media-libs/libdv
-	arts? ( kde-base/arts )"
-
-if [ `use mmx` ] ; then
-	RDEPEND="$RDEPEND media-libs/jpeg-mmx"
-	DEPEND="$DEPEND media-libs/jpeg-mmx"
-fi
-
-if [ `use mmx` ] || [ `use 3dnow` ] || [ `use sse` ] ; then
-	DEPEND="$DEPEND dev-lang/nasm"
-fi
-
-src_unpack() {
-	
-	unpack ${A}
-	cd quicktime4linux-1.4-patch
-	cp libmjpeg.h libmjpeg.h.orig
-	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h.orig > libmjpeg.h
-	cp jpeg_old.h jpeg_old.h.orig
-	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h.orig > jpeg_old.h
-	elibtoolize
-}
-
-src_compile() {
-
-	local myconf
-
-	use gtk	\
-		&& myconf="${myconf} --with-gtk-prefix=/usr"
-	
-	use X	\
-		&& myconf="${myconf} --with-x"	\
-		|| myconf="${myconf} --without-x"
-	
-	use mmx	\
-		&& myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx --enable-mmx-accel"
-	
-	use avi	\
-		|| myconf="${myconf} --without-aviplay"
-	
-	use quicktime && ( \
-		myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch"
-		cd ${WORKDIR}/quicktime4linux-1.4-patch
-		./configure || die
-		make || die
-	)
-
-	cd ${S}
-	econf ${myconf} || die
-
-	emake || die
-
-}
-
-src_install () {
-
-	einstall || die
-
-	dodoc mjpeg_howto.txt
-
-}
diff --git a/media-video/mjpegtools/mjpegtools-1.6.0-r5.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0-r5.ebuild
index 608415e4e89c..0403f6513eec 100644
--- a/media-video/mjpegtools/mjpegtools-1.6.0-r5.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.0-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r5.ebuild,v 1.2 2003/02/13 13:29:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0-r5.ebuild,v 1.3 2003/02/18 20:47:24 mholzer Exp $
 
 IUSE="sse arts gtk mmx sdl X quicktime 3dnow avi"
 
@@ -33,6 +33,7 @@ DEPEND="${RDEPEND}
 	3dnow? ( dev-lang/nasm )
 	sse? ( dev-lang/nasm )
 	media-libs/libdv
+	media-libs/svgalib
 	arts? ( kde-base/arts )"
 
 if [ `use mmx` ] ; then
@@ -47,12 +48,14 @@ fi
 src_unpack() {
 	
 	unpack ${A}
-	cd quicktime4linux-1.4-patch
-	cp libmjpeg.h libmjpeg.h.orig
-	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h.orig > libmjpeg.h
-	cp jpeg_old.h jpeg_old.h.orig
-	sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h.orig > jpeg_old.h
-	elibtoolize
+	if [ `use quicktime` ] ; then 
+		cd quicktime4linux-1.4-patch
+		cp libmjpeg.h libmjpeg.h.orig
+		sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" libmjpeg.h.orig > libmjpeg.h
+		cp jpeg_old.h jpeg_old.h.orig
+		sed -e "s:\"jpeg/jpeglib.h\":<jpeglib.h>:" jpeg_old.h.orig > jpeg_old.h
+		elibtoolize
+	fi
 }
 
 src_compile() {
@@ -80,7 +83,7 @@ src_compile() {
 		cd ${WORKDIR}/quicktime4linux-1.4-patch
 		./configure || die
 		make || die
-	)
+	) 
 
 	cd ${S}
 	econf ${myconf} || die