version bump

7 files changed, 22 insertions, 181 deletions

diff --git a/media-video/mjpegtools/ChangeLog b/media-video/mjpegtools/ChangeLog
index 5f8a45eb4491..02b70a60300f 100644
--- a/media-video/mjpegtools/ChangeLog
+++ b/media-video/mjpegtools/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for media-video/mjpegtools
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.3 2002/04/12 20:52:32 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/ChangeLog,v 1.4 2002/05/26 13:01:28 seemant Exp $
 
+*mjpegtools-1.6.0 (26 May 2002)
+
+  26 May 2002; Seemant Kulleen <seemant@gentoo.org> mjpegtools-1.6.0.ebuild
+  files/digest-mjpegtools-1.6.0 :
+
+  Version bump to newest stable
 
 *mjpegtools-1.5.20011611-r2 (12 Apr 2002)
   12 Apr 2002; Spider <spider@gentoo.org>
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.5.20011611 b/media-video/mjpegtools/files/digest-mjpegtools-1.5.20011611
deleted file mode 100644
index 66d9136fc29c..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.5.20011611
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 eb3116c8b09d601a07c4afa5a2f7ee22 mjpegtools-1.5-20011611.tar.gz 1016924
-MD5 963b168854e8f74590c71aaaaedf5177 quicktime4linux-1.4-patched.tar.gz 560533
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.5.20011611-r1 b/media-video/mjpegtools/files/digest-mjpegtools-1.5.20011611-r1
deleted file mode 100644
index 66d9136fc29c..000000000000
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.5.20011611-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 eb3116c8b09d601a07c4afa5a2f7ee22 mjpegtools-1.5-20011611.tar.gz 1016924
-MD5 963b168854e8f74590c71aaaaedf5177 quicktime4linux-1.4-patched.tar.gz 560533
diff --git a/media-video/mjpegtools/files/digest-mjpegtools-1.5.20011214 b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0
index c1c088010b4a..e262f9879cee 100644
--- a/media-video/mjpegtools/files/digest-mjpegtools-1.5.20011214
+++ b/media-video/mjpegtools/files/digest-mjpegtools-1.6.0
@@ -1,2 +1,2 @@
-MD5 5d135cf2c19ccedb2c1d96bfdcf372b9 mjpegtools-1.5-20011214.tar.gz 1019703
+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.5.20011214.ebuild b/media-video/mjpegtools/mjpegtools-1.5.20011214.ebuild
deleted file mode 100644
index 99b2378dd022..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.5.20011214.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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>
-# Heavily modified by Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.5.20011214.ebuild,v 1.4 2002/05/23 06:50:14 seemant Exp $
-
-A=${PN}-1.5-20011214.tar.gz
-S=${WORKDIR}/${PN}-1.5-20011214
-DESCRIPTION="Tools for MJPEG video"
-SRC_URI="http://download.sourceforge.net/mjpeg/${A}
-	 quicktime? ( http://download.sourceforge.net/mjpeg/quicktime4linux-1.4-patched.tar.gz )"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-
-RDEPEND=">=media-libs/jpeg-6b
-	gtk? ( =x11-libs/gtk+-1.2* )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	X? ( >=x11-base/xfree-4.1.0 )
-	avi? ( >=media-video/avifile-0.6.0.20011130 )"
-
-DEPEND="${RDEPEND}
-	quicktime? ( >=media-libs/libpng-1.0.12 )
-	libmovtar? ( >=media-libs/libmovtar-0.1.2 )
-	mmx? ( >=media-libs/jpeg-mmx-1.1.2 )"
-
-src_unpack() {
-
-	unpack ${A}
-	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
-	fi
-	
-	# if we aren't using X we have to change lavplay so it doesn't have hardware accel
-	if [ -z "`use X`" ] ; then
-		cd ${S}/lavtools
-		cp Makefile.in Makefile.in.orig
-		sed -e 's:-lX11::' Makefile.in.orig > Makefile.in
-		cp liblavplay.c liblavplay.c.orig
-		sed -e 's:^#include <X11/.*::' liblavplay.c.orig | sed -e 's:HAVE_V4L:HAVE_V4L_DUMMY:' > liblavplay.c
-	fi
-}
-
-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"
-	
-	if [ "`use quicktime`" ] ; then
-		myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch"
-		cd ${WORKDIR}/quicktime4linux-1.4-patch
-		./configure || die
-		make || die
-	fi
-
-	cd ${S}
-	./configure 	\
-		${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.5.20011611.ebuild b/media-video/mjpegtools/mjpegtools-1.5.20011611.ebuild
deleted file mode 100644
index ac324005883f..000000000000
--- a/media-video/mjpegtools/mjpegtools-1.5.20011611.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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>
-# Heavily modified by Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.5.20011611.ebuild,v 1.4 2002/05/23 06:50:14 seemant Exp $
-
-A=${PN}-1.5-20011611.tar.gz
-S=${WORKDIR}/${PN}-1.5-20011611
-DESCRIPTION="Tools for MJPEG video"
-SRC_URI="http://download.sourceforge.net/mjpeg/${A}
-	 quicktime? ( http://download.sourceforge.net/mjpeg/quicktime4linux-1.4-patched.tar.gz )"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-
-RDEPEND=">=media-libs/jpeg-6b
-	X? ( virtual/x11 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	avi? ( >=media-video/avifile-0.6.0.20011130 )"
-
-DEPEND="${RDEPEND}
-	quicktime? ( >=media-libs/libpng-1.0.12 )
-	libmovtar? ( >=media-libs/libmovtar-0.1.2 )"
-
-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
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use gtk	\
-		&& myconf="${myconf} --with-gtk-prefix=/usr"
-	
-	use X	\
-		&& myconf="${myconf} --with-x"	\
-		|| myconf="${myconf} --without-x"
-	
-	use avi	\
-		|| myconf="${myconf} --without-aviplay"
-	
-	if [ "`use quicktime`" ] ; then
-		myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch"
-		cd ${WORKDIR}/quicktime4linux-1.4-patch
-		./configure || die
-		make || die
-	fi
-
-	cd ${S}
-	./configure	\
-		${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.5.20011611-r1.ebuild b/media-video/mjpegtools/mjpegtools-1.6.0.ebuild
index 001b0cca5121..67e34641ec22 100644
--- a/media-video/mjpegtools/mjpegtools-1.5.20011611-r1.ebuild
+++ b/media-video/mjpegtools/mjpegtools-1.6.0.ebuild
@@ -2,24 +2,24 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # Heavily modified by Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.5.20011611-r1.ebuild,v 1.3 2002/05/23 06:50:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mjpegtools/mjpegtools-1.6.0.ebuild,v 1.1 2002/05/26 13:01:29 seemant Exp $
 
-A=${PN}-1.5-20011611.tar.gz
-S=${WORKDIR}/${PN}-1.5-20011611
+S=${WORKDIR}/${P}
 DESCRIPTION="Tools for MJPEG video"
-SRC_URI="http://download.sourceforge.net/mjpeg/${A}
+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/"
 
-RDEPEND=">=media-libs/jpeg-6b
-	X? ( >=x11-base/xfree-4.1.0 )
-	gtk? ( =x11-libs/gtk+-1.2* )
-	sdl? ( >=media-libs/libsdl-1.2.2 )
-	avi? ( >=media-video/avifile-0.6.0.20011130 )"
+RDEPEND="media-libs/jpeg-6b
+	media-libs/libpng
+	=x11-libs/gtk+-1.2*
+	X? ( x11-base/xfree )
+	sdl? ( media-libs/libsdl )
+	avi? ( media-video/avifile )"
 
 DEPEND="${RDEPEND}
-	quicktime? ( >=media-libs/libpng-1.0.12 )
-	libmovtar? ( >=media-libs/libmovtar-0.1.2 )
+	media-libs/libmovtar-0.1.2
+	quicktime? ( media-libs/quicktime4linux )
 	mmx? ( >=media-libs/jpeg-mmx-1.1.2 )"
 
 src_unpack() {
@@ -50,16 +50,15 @@ src_compile() {
 	use avi	\
 		&& myconf="${myconf} --without-aviplay"
 	
-	if [ "`use quicktime`" ] ; then
+	use quicktime && ( \
 		myconf="${myconf} --with-quicktime=${WORKDIR}/quicktime4linux-1.4-patch"
 		cd ${WORKDIR}/quicktime4linux-1.4-patch
 		./configure || die
 		make || die
-	fi
+	)
 
 	cd ${S}
-	./configure	\
-		${myconf} || die
+	econf ${myconf} || die
 
 	emake || die