cleanup

10 files changed, 70 insertions, 177 deletions

diff --git a/net-news/knews/files/digest-knews-1.0.1b b/net-news/knews/files/digest-knews-1.0.1b
deleted file mode 100644
index e1917fe7a9c7..000000000000
--- a/net-news/knews/files/digest-knews-1.0.1b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 850ebff7772d576314060ebe6ef81b73 knews-1.0b.1.tar.gz 392225
diff --git a/net-news/knews/knews-1.0.1b-r1.ebuild b/net-news/knews/knews-1.0.1b-r1.ebuild
index 66de66689780..5ed2320544b5 100644
--- a/net-news/knews/knews-1.0.1b-r1.ebuild
+++ b/net-news/knews/knews-1.0.1b-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/net-news/knews/knews-1.0.1b-r1.ebuild,v 1.2 2002/04/12 22:15:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/knews/knews-1.0.1b-r1.ebuild,v 1.3 2002/04/27 21:25:50 seemant Exp $
 
-MY_P=knews-1.0b.1
+MY_P=${PN}-1.0b.1
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="A threaded newsreader for X."
 SRC_URI="http://www.matematik.su.se/~kjj/${MY_P}.tar.gz"
 HOMEPAGE="http://www.matematik.su.se/~kjj/"
 
 DEPEND=">=x11-base/xfree-4.0
-        >=media-libs/jpeg-6
+	>=media-libs/jpeg-6
 	>=media-libs/libpng-1.2.1
 	>=media-libs/compface-1.4"
 
diff --git a/net-news/knews/knews-1.0.1b.ebuild b/net-news/knews/knews-1.0.1b.ebuild
deleted file mode 100644
index f7d13b7c536a..000000000000
--- a/net-news/knews/knews-1.0.1b.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org>
-# $Header: /var/cvsroot/gentoo-x86/net-news/knews/knews-1.0.1b.ebuild,v 1.1 2001/04/23 18:31:57 michael Exp $
-
-#P=knews-1.0.1b
-A=knews-1.0b.1.tar.gz
-S=${WORKDIR}/knews-1.0b.1
-DESCRIPTION="A threaded newsreader for X."
-SRC_URI="http://www.matematik.su.se/~kjj/${A}"
-HOMEPAGE="http://www.matematik.su.se/~kjj/"
-
-DEPEND=">=x11-base/xfree-4.0
-        >=media-libs/jpeg-6
-	>=media-libs/libpng-1.0.9
-	>=media-libs/compface-1.4"
-
-# If knews used autoconf, we wouldn't need this patch.
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}.patch
-}
-
-src_compile() {
-    try xmkmf
-    try make Makefiles
-    try make clean
-    try make all
-    try pushd util/knewsd
-    try xmkmf
-    try make all
-    try popd
-}
-
-src_install () {
-    #Install knews
-    try make DESTDIR=${D} install
-    try make DESTDIR=${D} DOCHTMLDIR=/usr/share/doc/${P} \
-             MANPATH=/usr/share/man MANSUFFIX=1 install.man
-
-    #Install knewsd
-    try pushd util/knewsd
-    try make DESTDIR=${D} install
-    try make DESTDIR=${D} DOCHTMLDIR=/usr/share/doc/${P} \
-             MANPATH=/usr/share/man MANSUFFIX=1 install.man
-    try popd
-
-    #Other docs.
-    dodoc COPYING COPYRIGHT Changes README
-}
-
diff --git a/net-print/pdq/pdq-2.2.1-r1.ebuild b/net-print/pdq/pdq-2.2.1-r1.ebuild
index 3b77e753a470..78a9b67a6c2c 100644
--- a/net-print/pdq/pdq-2.2.1-r1.ebuild
+++ b/net-print/pdq/pdq-2.2.1-r1.ebuild
@@ -1,68 +1,66 @@
-# 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 Grant Goodyear <grant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-print/pdq/pdq-2.2.1-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/pdq/pdq-2.2.1-r1.ebuild,v 1.2 2002/04/27 21:27:09 seemant Exp $
 
-#P=
-A=${P}.tgz
 S=${WORKDIR}/${P}
 DESCRIPTION="A non-daemon-centric print system which has a built-in, and sensible, driver configuration syntax."
-SRC_URI="http://pdq.sourceforge.net/ftp/${A}"
+SRC_URI="http://pdq.sourceforge.net/ftp/${P}.tgz"
 HOMEPAGE="http://pdq.sourceforge.net"
 
 DEPEND="gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
 
 src_compile() {
 
-    try ./configure --prefix=/usr --host=${CHOST}
-    cd src
-    if [ -z "`use gtk`" ] ; then
-        echo "Making only pdq (xpdq disabled)"
-    	try make pdq
-    else
-        echo "Making pdq and xpdq"
-    	try make
-    fi
-    cd ..
-    cd lpd
-    try make
-    cd ..
+	./configure --prefix=/usr --host=${CHOST} || die
+	cd src
+	if [ -z "`use gtk`" ] ; then
+		echo "Making only pdq (xpdq disabled)"
+		make pdq || die
+	else
+		echo "Making pdq and xpdq"
+		make || die
+	fi
+	cd ..
+	cd lpd
+	make || die
+	cd ..
 
 }
 
 src_install () {
 
-    cd src
-    exeinto /usr/bin
-    if [ -z "`use gtk`" ] ; then
-        doexe pdq
-    else
-        doexe pdq xpdq
-    fi
-    cd ..
-    cd lpd
-    exeopts -m 4755 -o root
-    exeinto /usr/bin
-    doexe lpd_cancel lpd_print lpd_status
-    cd ..
-    cd doc
-    if [ -z "`use gtk`" ] ; then
-        echo "man w/o gtk"
-        doman lpd_cancel.1 lpd_print.1 lpd_status.1 pdq.1 pdqstat.1 printrc.5
-    else
-        echo "man w/ gtk"
-        doman *.1 *.5
-    fi
-    dodoc rfc1179.txt
-    cd ..
-    cd etc
-    mv Makefile Makefile.orig
-    sed -e 's/$$dir/$(DESTDIR)$$dir/' -e 's/$(pdqlibdir)\/$$file/$(DESTDIR)\/$(pdqlibdir)\/$$file/' Makefile.orig > Makefile
-    insinto /etc/pdq
-    newins printrc.example printrc
-    try make DESTDIR=${D} install
-    cd ..
-    dodoc CHANGELOG INSTALL README LICENSE BUGS
+	cd src
+	exeinto /usr/bin
+	if [ -z "`use gtk`" ] ; then
+		doexe pdq
+	else
+		doexe pdq xpdq
+	fi
+	cd ..
+	cd lpd
+	exeopts -m 4755 -o root
+	exeinto /usr/bin
+	doexe lpd_cancel lpd_print lpd_status
+	cd ..
+	cd doc
+	if [ -z "`use gtk`" ] ; then
+		echo "man w/o gtk"
+		doman lpd_cancel.1 lpd_print.1 lpd_status.1 pdq.1 pdqstat.1 printrc.5
+	else
+		echo "man w/ gtk"
+		doman *.1 *.5
+	fi
+	dodoc rfc1179.txt
+	cd ..
+	cd etc
+	mv Makefile Makefile.orig
+	sed -e 's/$$dir/$(DESTDIR)$$dir/' -e 's/$(pdqlibdir)\/$$file/$(DESTDIR)\/$(pdqlibdir)\/$$file/' Makefile.orig > Makefile
+	insinto /etc/pdq
+	newins printrc.example printrc
+	make DESTDIR=${D} install || die
+	cd ..
+	dodoc CHANGELOG INSTALL README LICENSE BUGS
 
 }
 
diff --git a/net-www/amaya/amaya-4.1-r1.ebuild b/net-www/amaya/amaya-4.1-r1.ebuild
index c4b4ed8ddc6d..40afb6bbc114 100644
--- a/net-www/amaya/amaya-4.1-r1.ebuild
+++ b/net-www/amaya/amaya-4.1-r1.ebuild
@@ -1,10 +1,8 @@
-# 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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-4.1-r1.ebuild,v 1.1 2001/10/06 11:33:58 verwilst Exp $
+# Author: Bart Verwilst <verwilst@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-4.1-r1.ebuild,v 1.2 2002/04/27 21:28:05 seemant Exp $
 
-#P=
-A=${PN}-src-${PV}.tgz
 S=${WORKDIR}/Amaya/LINUX-ELF
 DESCRIPTION="The W3C Web-Browser"
 SRC_URI="ftp://ftp.w3.org/pub/amaya/${PN}-src-${PV}.tgz"
@@ -15,22 +13,22 @@ RDEPEND=">=x11-libs/openmotif-2.1.30"
 
 src_compile() {
 
-    mkdir ${S}
-    cd ${S}
+	mkdir ${S}
+	cd ${S}
 
-    try ../configure --prefix=/usr --host=${CHOST}
-    try make
+	../configure --prefix=/usr --host=${CHOST} || die
+	make || die
 
 }
 
 src_install () {
 
-    dodir /usr
-    try make prefix=${D}/usr install
-    rm ${D}/usr/bin/amaya
-    rm ${D}/usr/bin/print
-    dosym /usr/Amaya/applis/bin/amaya /usr/bin/amaya
-    dosym /usr/Amaya/applis/bin/print /usr/bin/print
-    
+	dodir /usr
+	make prefix=${D}/usr install || die
+	rm ${D}/usr/bin/amaya
+	rm ${D}/usr/bin/print
+	dosym /usr/Amaya/applis/bin/amaya /usr/bin/amaya
+	dosym /usr/Amaya/applis/bin/print /usr/bin/print
+	
 }
 
diff --git a/net-www/jakarta/jakarta-3.1-r2.ebuild b/net-www/jakarta/jakarta-3.1-r2.ebuild
index 8602f9d72fef..f2d1df00fe36 100644
--- a/net-www/jakarta/jakarta-3.1-r2.ebuild
+++ b/net-www/jakarta/jakarta-3.1-r2.ebuild
@@ -1,11 +1,9 @@
-# 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
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/jakarta/jakarta-3.1-r2.ebuild,v 1.6 2002/01/24 19:39:46 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/jakarta/jakarta-3.1-r2.ebuild,v 1.7 2002/04/27 21:28:50 seemant Exp $
 
-P=jakarta-3.1
-A="jakarta-tomcat.tar.gz jakarta-ant.tar.gz"
 S=${WORKDIR}
 DESCRIPTION="Apache Servlet Engine"
 SRC_URI="http://jakarta.apache.org/builds/tomcat/release/v3.1/src/jakarta-tomcat.tar.gz
diff --git a/net-www/w3m/files/digest-w3m-0.1.10-r1 b/net-www/w3m/files/digest-w3m-0.1.10-r1
deleted file mode 100644
index b8466f9161ad..000000000000
--- a/net-www/w3m/files/digest-w3m-0.1.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e0ed5e8db8ac8d7eb1e6996b74ace1d w3m-0.1.10.tar.gz 649960
diff --git a/net-www/w3m/w3m-0.1.10-r1.ebuild b/net-www/w3m/w3m-0.1.10-r1.ebuild
deleted file mode 100644
index 456754408ab1..000000000000
--- a/net-www/w3m/w3m-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,47 +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/net-www/w3m/w3m-0.1.10-r1.ebuild,v 1.6 2000/11/02 08:31:53 achim Exp $
-
-P=w3m-0.1.10
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Text based WWW browser, supports tables and frames"
-SRC_URI="ftp://ftp.umlauf.de/pub/w3m/${A}"
-#	 ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/${A}"
-
-HOMEPAGE="http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/eng/"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gpm-1.19.3
-	>=sys-libs/ncurses-5.1
-	>=dev-libs/openssl-0.9.6"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}
-  zcat ${O}/files/${P}.diff.gz | patch -p1
-  sed -e "s:^def_libdir.*:def_libdir='/usr/libexec/w3m':" \
-      -e "s:^def_helpdir.*:def_helpdir='/usr/doc/${PF}/html':" \
-      -e "s:gentoolinux\.mydomain:${HOSTNAME}:" \
-	${O}/files/config.param > config.param
-}
-
-src_compile() {                           
-  cd ${S}
-  try ./configure --prefix=/usr --nonstop -lang=en -model=monster -cflags="${CFLAGS}"
-  try make
-}
-
-src_install() {                               
-  cd ${S}
-  try make DESTDIR=${D} install
-  dodoc doc/README* doc/*.default doc/menu.submenu doc/HISTORY
-  doman doc/w3m.1
-}
-
-
-
-
-
-
diff --git a/net-www/w3m/w3m-0.2.2.ebuild b/net-www/w3m/w3m-0.2.2.ebuild
index c8c419932a14..02b90a10a9b3 100644
--- a/net-www/w3m/w3m-0.2.2.ebuild
+++ b/net-www/w3m/w3m-0.2.2.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/net-www/w3m/w3m-0.2.2.ebuild,v 1.2 2001/12/29 03:15:03 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.2.2.ebuild,v 1.3 2002/04/27 21:30:00 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text based WWW browser, supports tables and frames"
diff --git a/net-www/w3m/w3m-0.3.ebuild b/net-www/w3m/w3m-0.3.ebuild
index ef2019aebd69..4f6d1509c9b6 100644
--- a/net-www/w3m/w3m-0.3.ebuild
+++ b/net-www/w3m/w3m-0.3.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/net-www/w3m/w3m-0.3.ebuild,v 1.1 2002/04/26 17:59:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3.ebuild,v 1.2 2002/04/27 21:30:00 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text based WWW browser, supports tables and frames"