cleanup

6 files changed, 20 insertions, 72 deletions

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"