cleanup

10 files changed, 90 insertions, 139 deletions

diff --git a/media-libs/mesa/mesa-3.4.2.ebuild b/media-libs/mesa/mesa-3.4.2.ebuild
index 51fb298c195e..d65d1c6ba814 100644
--- a/media-libs/mesa/mesa-3.4.2.ebuild
+++ b/media-libs/mesa/mesa-3.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# 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-libs/mesa/mesa-3.4.2.ebuild,v 1.3 2001/10/27 14:18:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-3.4.2.ebuild,v 1.4 2002/04/27 11:41:02 seemant Exp $
 
-P=Mesa-${PV}
-S=${WORKDIR}/${P}
+MY_P=Mesa-${PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="OpenGL like graphic library for Linux"
 SRC_URI="http://download.sourceforge.net/mesa3d/MesaLib-${PV}.tar.bz2
          http://download.sourceforge.net/mesa3d/MesaDemos-${PV}.tar.bz2"
diff --git a/media-libs/mesa/mesa-3.5.ebuild b/media-libs/mesa/mesa-3.5.ebuild
index 3c5e3247babd..ff2c588bf142 100644
--- a/media-libs/mesa/mesa-3.5.ebuild
+++ b/media-libs/mesa/mesa-3.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-3.5.ebuild,v 1.1 2002/01/13 21:33:42 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-3.5.ebuild,v 1.2 2002/04/27 11:41:02 seemant Exp $
 
-P=Mesa-${PV}
-S=${WORKDIR}/${P}
+MY_P=Mesa-${PV}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="OpenGL like graphic library for Linux"
 SRC_URI="http://download.sourceforge.net/mesa3d/MesaLib-${PV}.tar.bz2
          http://download.sourceforge.net/mesa3d/MesaDemos-${PV}.tar.bz2"
diff --git a/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild b/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild
index 27983d59f740..e25a7c4f4cde 100644
--- a/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild
+++ b/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# 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-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild,v 1.4 2001/08/11 03:44:19 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mpeg-lib/mpeg-lib-1.3.1-r1.ebuild,v 1.5 2002/04/27 11:42:30 seemant Exp $
 
-P=mpeg_lib-${PV}
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
+MY_P=${P/-/_}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="A lib for MPEG-1 video"
-SRC_URI="ftp://ftp.mni.mcgill.ca/pub/mpeg/${A}"
+SRC_URI="ftp://ftp.mni.mcgill.ca/pub/mpeg/${MY_P}.tar.gz"
 HOMEPAGE="http://"
 
 DEPEND="virtual/glibc"
 
 src_compile() {
 
-    try ./configure --prefix=/usr --host=${CHOST} --disable-dither
+	./configure --prefix=/usr --host=${CHOST} --disable-dither || die
 
-    # Doesn't work with -j 4 (hallski)
-    try make OPTIMIZE="$CFLAGS"
+	# Doesn't work with -j 4 (hallski)
+	make OPTIMIZE="$CFLAGS" || die
 
 }
 
 src_install () {
 
-    try make prefix=${D}/usr install
-    dodoc CHANGES README
-    docinto txt
-    dodoc doc/image_format.eps doc/mpeg_lib.*
+	make prefix=${D}/usr install || die
+	dodoc CHANGES README
+	docinto txt
+	dodoc doc/image_format.eps doc/mpeg_lib.*
 
 }
-
diff --git a/media-libs/sgi-oss-glu/oss-opengl-glu-1.3.ebuild b/media-libs/sgi-oss-glu/oss-opengl-glu-1.3.ebuild
index 981f9b41588f..9203c783e0c6 100644
--- a/media-libs/sgi-oss-glu/oss-opengl-glu-1.3.ebuild
+++ b/media-libs/sgi-oss-glu/oss-opengl-glu-1.3.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sgi-oss-glu/oss-opengl-glu-1.3.ebuild,v 1.1 2001/08/16 23:19:35 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sgi-oss-glu/oss-opengl-glu-1.3.ebuild,v 1.2 2002/04/27 11:44:02 seemant Exp $
 
-A=oss-opengl-glu-20000925-1.i386.rpm
-P=oss-opengl-glu-20000925-1.i386.rpm
+MY_P=oss-opengl-glu-20000925-1
 S=${WORKDIR}/usr
 DESCRIPTION="SGI'd GLU"
-SRC_URI="ftp://mesa3d.sourceforge.net/pub/mesa3d/SI-GLU/${A}"
+SRC_URI="ftp://mesa3d.sourceforge.net/pub/mesa3d/SI-GLU/${MY_P}.i386.rpm"
 HOMEPAGE="http://www.mesa3d.org/downloads/sgi.html"
 
 DEPEND=">=app-arch/rpm-3.0.6"
@@ -15,13 +14,13 @@ DEPEND=">=app-arch/rpm-3.0.6"
 
 src_unpack() {
 
-  rpm2cpio ${DISTDIR}/${P} |cpio -i --make-directories
+	rpm2cpio ${DISTDIR}/${P} |cpio -i --make-directories
 
 }
 
 src_compile() {
 
-    einfo  "Only binary package, nothing to compile"
+	einfo  "Only binary package, nothing to compile"
 
 }
 
@@ -34,4 +33,3 @@ src_install () {
 
 
 }
-
diff --git a/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild b/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild
index c8ad6e2983d3..bdf2b161394f 100644
--- a/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild
+++ b/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild
@@ -1,31 +1,26 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# 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-libs/smjpeg/smjpeg-0.2.1-r2.ebuild,v 1.4 2001/08/11 03:44:19 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/smjpeg/smjpeg-0.2.1-r2.ebuild,v 1.5 2002/04/27 11:45:30 seemant Exp $
 
-P=smjpeg-0.2.1
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="SDL Motion JPEG Library"
-SRC_URI="ftp://ftp.linuxgames.com/loki/open-source/smjpeg/${A}"
+SRC_URI="ftp://ftp.linuxgames.com/loki/open-source/smjpeg/${P}.tar.gz"
 HOMEPAGE="http://www.lokigames.com/development/smjpeg.php3"
 
 DEPEND=">=media-libs/libsdl-1.1.7"
 
 src_compile() {
-    if [ "`use nas`" ] ; then
-	LDFLAGS="-L/usr/X11R6/lib -lXt"
-    fi
-    try LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST}
-    try make
+	use nas && LDFLAGS="-L/usr/X11R6/lib -lXt"
+		
+	LDFLAGS="$LDFLAGS" ./configure --prefix=/usr --host=${CHOST}
+	make || die
 
 }
 
 src_install () {
 
-    try make DESTDIR=${D} install
-    dodoc CHANGES COPYING README TODO SMJPEG.txt
+	make DESTDIR=${D} install || die
+	dodoc CHANGES COPYING README TODO SMJPEG.txt
 
 }
-
-
diff --git a/media-libs/svgalib/svgalib-1.4.2-r1.ebuild b/media-libs/svgalib/svgalib-1.4.2-r1.ebuild
index 501ebaa9019f..2f4d52ea9a50 100644
--- a/media-libs/svgalib/svgalib-1.4.2-r1.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.2-r1.ebuild
@@ -1,48 +1,46 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Peter Gavin <pete@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.2-r1.ebuild,v 1.2 2001/08/11 03:44:19 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.2-r1.ebuild,v 1.3 2002/04/27 11:47:44 seemant Exp $
 
-#P=
-A=${PN}-${PV}.tar.gz
-S=${WORKDIR}/${PN}-${PV}
+S=${WORKDIR}/${P}
 DESCRIPTION="a library for running svga graphics on the console"
-SRC_URI="http://www.svgalib.org/${A}"
+SRC_URI="http://www.svgalib.org/${P}.tar.gz"
 HOMEPAGE="http://www.svgalib.org/"
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}
-    patch -p1 < ${FILESDIR}/${PN}-${PV}-gentoo.diff
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PN}-${PV}-gentoo.diff
 }
 
 src_compile() {
 
-    try make OPTIMIZE="${CFLAGS}" static
-    try make OPTIMIZE="${CFLAGS}" shared
-    try make OPTIMIZE="${CFLAGS}" textutils
-    try make OPTIMIZE="${CFLAGS}" lrmi
-    try make OPTIMIZE="${CFLAGS}" utils
-    # Build the gl stuff tpp
-    try make OPTIMIZE="${CFLAGS}" -C gl
-    try make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV}
+	 make OPTIMIZE="${CFLAGS}" static || die
+	 make OPTIMIZE="${CFLAGS}" shared || die
+	 make OPTIMIZE="${CFLAGS}" textutils || die
+	 make OPTIMIZE="${CFLAGS}" lrmi || die
+	 make OPTIMIZE="${CFLAGS}" utils || die
+	# Build the gl stuff tpp
+	 make OPTIMIZE="${CFLAGS}" -C gl || die
+	 make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} || die
 }
 
 src_install () {
 
-    dodir /etc/svga /usr/{include,lib,bin,share/man}
-    try make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install
-    insinto /usr/include
-    doins gl/vgagl.h
-    dolib.a gl/libvgagl.a
-    dolib.so gl/libvgagl.so.${PV}
-    dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
-
-    cd doc
-    dodoc 0-README CHANGES* DESIGN NEWS TODO
-    docinto txt
-    dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
+	dodir /etc/svga /usr/{include,lib,bin,share/man}
+	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install || die
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a gl/libvgagl.a
+	dolib.so gl/libvgagl.so.${PV}
+	dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
+
+	cd doc
+	dodoc 0-README CHANGES* DESIGN NEWS TODO
+	docinto txt
+	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
 
 }
diff --git a/media-libs/svgalib/svgalib-1.4.3.ebuild b/media-libs/svgalib/svgalib-1.4.3.ebuild
index 06b7ac43f14a..dbcc1f7da44f 100644
--- a/media-libs/svgalib/svgalib-1.4.3.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.3.ebuild
@@ -1,48 +1,46 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Peter Gavin <pete@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3.ebuild,v 1.2 2001/08/11 03:44:19 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3.ebuild,v 1.3 2002/04/27 11:47:45 seemant Exp $
 
-#P=
-A=${PN}-${PV}.tar.gz
-S=${WORKDIR}/${PN}-${PV}
+S=${WORKDIR}/${P}
 DESCRIPTION="a library for running svga graphics on the console"
-SRC_URI="http://www.svgalib.org/${A}"
+SRC_URI="http://www.svgalib.org/${P}.tar.gz"
 HOMEPAGE="http://www.svgalib.org/"
 
 DEPEND="virtual/glibc"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}
-    patch -p1 < ${FILESDIR}/${PN}-${PV}-gentoo.diff
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PN}-${PV}-gentoo.diff
 }
 
 src_compile() {
 
-    try make OPTIMIZE="${CFLAGS}" static
-    try make OPTIMIZE="${CFLAGS}" shared
-    try make OPTIMIZE="${CFLAGS}" textutils
-    try make OPTIMIZE="${CFLAGS}" lrmi
-    try make OPTIMIZE="${CFLAGS}" utils
-    # Build the gl stuff tpp
-    try make OPTIMIZE="${CFLAGS}" -C gl
-    try make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV}
+	 make OPTIMIZE="${CFLAGS}" static || die
+	 make OPTIMIZE="${CFLAGS}" shared || die
+	 make OPTIMIZE="${CFLAGS}" textutils || die
+	 make OPTIMIZE="${CFLAGS}" lrmi || die
+	 make OPTIMIZE="${CFLAGS}" utils || die
+	# Build the gl stuff tpp
+	 make OPTIMIZE="${CFLAGS}" -C gl || die
+	 make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} || die
 }
 
 src_install () {
 
-    dodir /etc/svga /usr/{include,lib,bin,share/man}
-    try make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install
-    insinto /usr/include
-    doins gl/vgagl.h
-    dolib.a gl/libvgagl.a
-    dolib.so gl/libvgagl.so.${PV}
-    dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
-
-    cd doc
-    dodoc 0-README CHANGES* DESIGN NEWS TODO
-    docinto txt
-    dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
+	dodir /etc/svga /usr/{include,lib,bin,share/man}
+	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" install || die
+	insinto /usr/include
+	doins gl/vgagl.h
+	dolib.a gl/libvgagl.a
+	dolib.so gl/libvgagl.so.${PV}
+	dosym libvgagl.so.${PV} /usr/lib/libvgagl.so
+
+	cd doc
+	dodoc 0-README CHANGES* DESIGN NEWS TODO
+	docinto txt
+	dodoc  Driver-programming-HOWTO README.* add_driver svgalib.lsm
 
 }
diff --git a/media-libs/tiff/files/digest-tiff-3.5.6_beta-r1 b/media-libs/tiff/files/digest-tiff-3.5.6_beta-r1
deleted file mode 100644
index 178df52b0b5f..000000000000
--- a/media-libs/tiff/files/digest-tiff-3.5.6_beta-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa74b76536f4b2d540857680877b34e0 tiff-v3.5.6-beta.tar.gz 907483
diff --git a/media-libs/tiff/tiff-3.5.6_beta-r1.ebuild b/media-libs/tiff/tiff-3.5.6_beta-r1.ebuild
deleted file mode 100644
index 91418f564c42..000000000000
--- a/media-libs/tiff/tiff-3.5.6_beta-r1.ebuild
+++ /dev/null
@@ -1,35 +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-libs/tiff/tiff-3.5.6_beta-r1.ebuild,v 1.1 2001/11/14 16:39:12 hallski Exp $
-
-P=${PN}-v3.5.6-beta
-S=${WORKDIR}/${P}
-DESCRIPTION="libtiff"
-SRC_URI="http://www.libtiff.org/${P}.tar.gz"
-HOMEPAGE="http://www.libtiff.org/"
-
-DEPEND=">=media-libs/jpeg-6b >=sys-libs/zlib-1.1.3-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp ${FILESDIR}/config.site-${PV} config.site
-	echo "DIR_HTML="${D}/usr/share/doc/${PF}/html"" >> config.site
-}
-
-src_compile() {
-	./configure --noninteractive || die
-
-	emake OPTIMIZER="${CFLAGS}" || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib,share/man,share/doc/${PF}/html}
-	dodir /usr/share/doc/${PF}/html
-	make INSTALL="/bin/sh ${S}/port/install.sh" install || die
-	prepalldocs
-    
-	preplib /usr
-	dodoc COPYRIGHT README TODO VERSION
-}
diff --git a/media-libs/tiff/tiff-3.5.7.ebuild b/media-libs/tiff/tiff-3.5.7.ebuild
index 81f40d3ebaa0..6d8aaacef1ca 100644
--- a/media-libs/tiff/tiff-3.5.7.ebuild
+++ b/media-libs/tiff/tiff-3.5.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# 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-libs/tiff/tiff-3.5.7.ebuild,v 1.2 2001/12/11 02:18:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.5.7.ebuild,v 1.3 2002/04/27 11:51:24 seemant Exp $
 
 MY_P=${P/tiff-/tiff-v}
 S=${WORKDIR}/${MY_P}