Removing redundant mjpegtools directory. This one has oldest version and "mjpeg-tools" doesn't match the package tarball naming "mjepgtools". This fixes bug# 1130.

4 files changed, 0 insertions, 171 deletions

diff --git a/media-video/mjpeg-tools/ChangeLog b/media-video/mjpeg-tools/ChangeLog
deleted file mode 100644
index 8807f8978b88..000000000000
--- a/media-video/mjpeg-tools/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-# ChangeLog for media-video/mjpeg-tools
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/mjpeg-tools/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
-
-*mjpeg-tools-1a (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/media-video/mjpeg-tools/files/Makefile b/media-video/mjpeg-tools/files/Makefile
deleted file mode 100644
index ca6d901414f2..000000000000
--- a/media-video/mjpeg-tools/files/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-# Makefile for lavtools
-
-M_OBJS       = lavrec lavplay movtar_play
-
-LIBS= mjpeg/libmjpeg.a quicktime/quicktime/libquicktime.a 
-LIBS_AND_OPT= $(LIBS) -lpng -lz -ljpeg
-
-# uncomment if you want to use ALSA, 
-# the Advanced Linux Sound Architecture (http://alsa.jcu.cz) 
-#USE_ALSA = -DUSE_ALSA -lasound
-
-#this is for software MJPEG playback, and GLib is used by movtarlib
-L_FLAGS = -lpthread -lSDL -lglib
-
-CFLAGS =  -O2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I . -I buz -I quicktime/quicktime -I mjpeg -I movtar 
-
-all:		lavrec lavplay lavvideo
-
-#the dependence files are those which have been adapted to MMX and therefore
-#are suspect to change 
-./jpeg-6b-mmx/libjpeg.a: ./jpeg-6b-mmx/jdapimin.c ./jpeg-6b-mmx/jdmerge.c \
-	./jpeg-6b-mmx/jidctfst.c ./jpeg-6b-mmx/jidctint.c \
-	./jpeg-6b-mmx/jdcolor.c ./jpeg-6b-mmx/jdsample.c
-	cd jpeg-6b-mmx; make
-
-./quicktime/quicktime/libquicktime.a: 
-	cd quicktime/quicktime; make
-
-./mjpeg/libmjpeg.a: mjpeg/mjpeg.c mjpeg/mjpeg.h mjpeg/jpeg_dec.c
-	cd mjpeg; make
-
-./movtar/libmovtar.a: movtar/movtar.c movtar/movtar.h 
-	cd movtar; make libmovtar.a
-
-lavrec:		lavrec.o avilib.o audiolib.o lav_io.o movtar/movtar.c $(LIBS)
-		gcc $(CFLAGS) -o lavrec lavrec.o avilib.o audiolib.o lav_io.o \
-		$(LIBS_AND_OPT) $(L_FLAGS) 
-
-lavplay:	lavplay.c avilib.o audiolib.o lav_io.o editlist.o $(LIBS)
-		gcc -o lavplay lavplay.c avilib.o audiolib.o lav_io.o \
-		editlist.o $(LIBS_AND_OPT) $(L_FLAGS) $(CFLAGS)
-
-movtar_play: movtar/libmovtar.a movtar_play.c
-	gcc movtar_play.c movtar/libmovtar.a \
-	$(CFLAGS) $(L_FLAGS) -o movtar_play
-
-lavvideo: lavvideo.c 
-	gcc $(CFLAGS) lavvideo.c -o lavvideo
-
-v4l-conf.o: v4l-conf.c
-	gcc -g -g -O2 -c v4l-conf.c -o v4l-conf.o
-
-v4l-conf: v4l-conf.o
-	gcc -g -g -O2 -o v4l-conf v4l-conf.o -L/usr/X11R6/lib -lXxf86vm -lXxf86dga  -lXext -lX11 
-
-install:
-	su -c "cp -v $(M_OBJS) /usr/local/bin/"
-
-clean:
-		rm -f *.o lavplay lavrec movtar_play
-
-realclean:
-		rm -f *.o lavplay lavrec
-		cd quicktime/quicktime; make clean
-		cd jpeg-6b-mmx; make clean
-		cd mjpeg; make clean
-		cd movtar; make clean
-#		cd utils; make clean
-#		cd xlav; make clean
-#		cd mpeg2enc; make clean
-#		cd aenc; make clean
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/media-video/mjpeg-tools/files/digest-mjpeg-tools-1a b/media-video/mjpeg-tools/files/digest-mjpeg-tools-1a
deleted file mode 100644
index 99175f5a35ec..000000000000
--- a/media-video/mjpeg-tools/files/digest-mjpeg-tools-1a
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7348fba52e85f20516da427feeb9ab9b mjpeg_beta_1a.tar.gz 1036493
-MD5 7261b77fb8b730a2f02e3304c09887d9 quicktime4linux-1.1.9.tar.gz 207921
diff --git a/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild b/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild
deleted file mode 100644
index 1cae51ff6a22..000000000000
--- a/media-video/mjpeg-tools/mjpeg-tools-1a.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2000 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/mjpeg-tools/mjpeg-tools-1a.ebuild,v 1.8 2001/06/03 09:54:22 achim Exp $
-
-P=mjpeg-tools-1a
-A="mjpeg_beta_1a.tar.gz quicktime4linux-1.1.9.tar.gz"
-S=${WORKDIR}/mjpeg_beta
-DESCRIPTION="Tools for MJPEG video"
-SRC_URI="http://download.sourceforge.net/mjpeg/${A}
-	 http://heroinewarrior.com/quicktime4linux-1.1.9.tar.gz"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-
-DEPEND="virtual/glibc
-	>=dev-libs/glib-1.2.8
-	>=media-libs/libsdl-1.1.5
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.7
-	alsa? ( >=media-libs/alsa-lib-0.5.10 ) "
-RDEPEND="virtual/glibc
-	>=dev-libs/glib-1.2.8
-	>=media-libs/libsdl-1.1.5
-	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.7"
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-  sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > Makefile
-  if [ "`use alsa`" ] ; then
-    cp Makefile Makefile.orig
-    sed -e "s:^#USE_ALSA:USE_ALSA:" Makefile.orig > Makefile
-  fi
-  if [ "`use nas`" ] ; then
-    cp Makefile Makefile.orig
-    sed -e "s:^L_FLAGS =:L_FLAGS = -L/usr/X11R6/lib -lXt:" Makefile.orig > Makefile
-  fi
-
-  cd aenc
-  cp Makefile Makefile.orig
-  sed -e "s:\.\./jpeg-6b-mmx/libjpeg\.a:-ljpeg:" \
-      -e "s:-O3 -m486:${CFLAGS}:" Makefile.orig > Makefile
-
-
-
-}
-src_compile() {
-
-    cd ${S}
-    try make
-    cd aenc
-    try make
-    cd ../mpegjoin
-    try make
-    cd ../mplex
-    try make
-}
-
-src_install () {
-
-    cd ${S}
-    into /usr
-    dobin lavplay lavrec lavvideo aenc/aenc mpegjoin/mpegjoin mplex/mplex
-    dodoc BUGS CHANGES COPYING HINTS PLANS README* TODO
-    newdoc aenc/README README.aenc
-    newdoc mpegjoin/README README.mpegjoin
-    docinto mplex
-    dodoc mplex/COPYING mplex/INSTRUCT mplex/README
-
-
-}
-
-