cleanup

3 files changed, 26 insertions, 114 deletions

diff --git a/media-video/mpeg-movie/files/digest-mpeg-movie-1.6.0 b/media-video/mpeg-movie/files/digest-mpeg-movie-1.6.0
deleted file mode 100644
index 0c76a6d2ac1b..000000000000
--- a/media-video/mpeg-movie/files/digest-mpeg-movie-1.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e87f6b84143f925be123388d72ae9c5 mpeg_movie-1.6.0.tar.gz 2492258
diff --git a/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild b/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
index ccd915dfcecf..e0f2e67233e9 100644
--- a/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
+++ b/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild
@@ -1,9 +1,9 @@
 # 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>
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild,v 1.1 2002/03/27 11:06:25 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg-movie/mpeg-movie-1.6.0-r1.ebuild,v 1.2 2002/04/27 12:13:06 seemant Exp $
 
-MY_P="mpeg_movie"
+MY_P=${PN/-/_}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Tools for MPEG-I movies"
 SRC_URI="http://heroine.linuxave.net/${MY_P}-${PV}.tar.gz"
@@ -23,30 +23,30 @@ src_unpack() {
 		cd ${S}/${i}
 		cp Makefile Makefile.orig
 		sed -e "s:gnu/types\.h:bits/types\.h:" \
-		-e "s:stdio_lim\.h:bits/stdio_lim\.h:" \
-		-e "s:bytesex\.h::" \
-		-e "s:selectbits\.h::" \
-		-e "s:huge_val\.h:bits/huge_val\.h:" \
-		-e "s:mathcalls\.h:bits/mathcalls\.h:" \
-		-e "s:posix1_lim\.h:bits/posix1_lim\.h:" \
-		-e "s:posix2_lim\.h:bits/posix2_lim\.h:" \
-		-e "s:posix_opt\.h:bits/posix_opt\.h:" \
-		-e "s:local_lim\.h:bits/local_lim\.h:" \
-		-e "s:socketbits\.h::" \
-		-e "s:sockaddrcom\.h::" \
-		-e "s:errnos\.h::" \
-		-e "s:statbuf\.h::" \
-		-e "s:ipc_buf\.h::" \
-		-e "s:shm_buf\.h::" \
-		-e "s:timebits\.h::" \
-		-e "s:confname\.h:bits/confname\.h:" \
-		-e "s:sigset\.h:bits/sigset\.h:" \
-		-e "s:signum\.h:bits/signum\.h:" \
-		-e "s:sigaction\.h:bits/sigaction\.h:" \
-		-e "s:asm/sigcontext\.h:bits/sigcontext\.h:" \
-		-e "s:include/sigcontext\.h:include/bits/sigcontext\.h:" \
-		-e "s:/usr/lib/X11:/usr/X11R6/lib:" \
-		Makefile.orig > Makefile
+			-e "s:stdio_lim\.h:bits/stdio_lim\.h:" \
+			-e "s:bytesex\.h::" \
+			-e "s:selectbits\.h::" \
+			-e "s:huge_val\.h:bits/huge_val\.h:" \
+			-e "s:mathcalls\.h:bits/mathcalls\.h:" \
+			-e "s:posix1_lim\.h:bits/posix1_lim\.h:" \
+			-e "s:posix2_lim\.h:bits/posix2_lim\.h:" \
+			-e "s:posix_opt\.h:bits/posix_opt\.h:" \
+			-e "s:local_lim\.h:bits/local_lim\.h:" \
+			-e "s:socketbits\.h::" \
+			-e "s:sockaddrcom\.h::" \
+			-e "s:errnos\.h::" \
+			-e "s:statbuf\.h::" \
+			-e "s:ipc_buf\.h::" \
+			-e "s:shm_buf\.h::" \
+			-e "s:timebits\.h::" \
+			-e "s:confname\.h:bits/confname\.h:" \
+			-e "s:sigset\.h:bits/sigset\.h:" \
+			-e "s:signum\.h:bits/signum\.h:" \
+			-e "s:sigaction\.h:bits/sigaction\.h:" \
+			-e "s:asm/sigcontext\.h:bits/sigcontext\.h:" \
+			-e "s:include/sigcontext\.h:include/bits/sigcontext\.h:" \
+			-e "s:/usr/lib/X11:/usr/X11R6/lib:" \
+			Makefile.orig > Makefile
 	done
 
 	cd ${S}/audio_out
diff --git a/media-video/mpeg-movie/mpeg-movie-1.6.0.ebuild b/media-video/mpeg-movie/mpeg-movie-1.6.0.ebuild
deleted file mode 100644
index dd415c0b7feb..000000000000
--- a/media-video/mpeg-movie/mpeg-movie-1.6.0.ebuild
+++ /dev/null
@@ -1,87 +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/mpeg-movie/mpeg-movie-1.6.0.ebuild,v 1.10 2001/06/03 09:54:22 achim Exp $
-
-P=mpeg-movie-1.6.0
-A=mpeg_movie-1.6.0.tar.gz
-S=${WORKDIR}/mpeg_movie
-DESCRIPTION="Tools for MPEG-I movies"
-SRC_URI="http://heroine.linuxave.net/${A}"
-HOMEPAGE="http://heroine.linuxave.net/toys.html"
-
-DEPEND="virtual/glibc
-	>=sys-devel/gcc-2.95.2
-	>=media-libs/jpeg-6b
-	>=media-libs/libsdl-1.1.5
-	virtual/x11"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-  for i in video_in video_out
-  do
-    cd ${S}/${i}
-    cp Makefile Makefile.orig
-    sed -e "s:gnu/types\.h:bits/types\.h:" \
-	-e "s:stdio_lim\.h:bits/stdio_lim\.h:" \
-	-e "s:bytesex\.h::" \
-	-e "s:selectbits\.h::" \
-	-e "s:huge_val\.h:bits/huge_val\.h:" \
-	-e "s:mathcalls\.h:bits/mathcalls\.h:" \
-	-e "s:posix1_lim\.h:bits/posix1_lim\.h:" \
-	-e "s:posix2_lim\.h:bits/posix2_lim\.h:" \
-	-e "s:posix_opt\.h:bits/posix_opt\.h:" \
-	-e "s:local_lim\.h:bits/local_lim\.h:" \
-	-e "s:socketbits\.h::" \
-	-e "s:sockaddrcom\.h::" \
-	-e "s:errnos\.h::" \
-	-e "s:statbuf\.h::" \
-	-e "s:ipc_buf\.h::" \
-	-e "s:shm_buf\.h::" \
-	-e "s:timebits\.h::" \
-	-e "s:confname\.h:bits/confname\.h:" \
-	-e "s:sigset\.h:bits/sigset\.h:" \
-	-e "s:signum\.h:bits/signum\.h:" \
-	-e "s:sigaction\.h:bits/sigaction\.h:" \
-	-e "s:asm/sigcontext\.h:bits/sigcontext\.h:" \
-	-e "s:include/sigcontext\.h:include/bits/sigcontext\.h:" \
-	-e "s:/usr/lib/X11:/usr/X11R6/lib:" \
-	Makefile.orig > Makefile
-
-  done
-  cd ${S}/audio_out
-  cp GNUmake GNUmake.orig
-  sed -e "s:SDL_DIR += /usr/local:SDL_DIR += /usr:" GNUmake.orig > GNUmake
-  if [ "`use nas`" ] ; then
-	cp GNUmake GNUmake.orig
-	sed -e "s#^SDLLIB := -L#SDLLIB := -L/usr/X11R6/lib -lXt -L#" GNUmake.orig > GNUmake
-  fi
-  
-}
-src_compile() {
-    try make
-
-}
-
-src_install () {
-
-    into /usr
-    newbin audio_in/encode mpeg_audio_encode
-    newbin audio_out/plaympeg mpeg_audio_play
-    newbin mplex_in/mplex mpeg_mplex
-    newbin mplex_out/dmplex mpeg_dmplex
-    newbin video_in/mpeg_encode mpeg_video_encode
-    dobin video_out/mpeg_play
-
-    dodoc docs/*.txt
-    docinto html
-    dodoc docs/index.html
-    docinto html/quicktime
-    dodoc quicktime4linux/src/docs/*.html
-}
-
-
-
-
-