Towards a perfect society

4 files changed, 4 insertions, 86 deletions

diff --git a/net-www/tomcat/files/digest-tomcat-3.2.1 b/net-www/tomcat/files/digest-tomcat-3.2.1
deleted file mode 100644
index e5112c899342..000000000000
--- a/net-www/tomcat/files/digest-tomcat-3.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1f2b85000ad4b65c04e735b08bc4ef06 jakarta-ant-1.3-src.tar.gz 1019904
-MD5 b9d4c9f6714e6a1f42276767c5974a5c jakarta-servletapi-3.2-src.tar.gz 102400
-MD5 ca0307722836c778392a17b2c6c9a598 jakarta-tomcat-3.2.1-src.tar.gz 921600
diff --git a/net-www/tomcat/tomcat-3.2.1.ebuild b/net-www/tomcat/tomcat-3.2.1.ebuild
deleted file mode 100644
index 1ee19fe0ef2d..000000000000
--- a/net-www/tomcat/tomcat-3.2.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: System Team <system@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-3.2.1.ebuild,v 1.3 2002/01/23 20:06:16 karltk Exp $
-
-A="jakarta-tomcat-3.2.1-src.tar.gz jakarta-servletapi-3.2-src.tar.gz jakarta-ant-1.3-src.tar.gz"
-S=${WORKDIR}
-DESCRIPTION="Apache Servlet Engine"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.1/src/jakarta-tomcat-3.2.1-src.tar.gz
-	 http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.1/src/jakarta-servletapi-3.2-src.tar.gz
-	 http://jakarta.apache.org/builds/jakarta-ant/release/v1.3/src/jakarta-ant-1.3-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org"
-
-DEPEND=">=sys-apps/bash-2.04
-	>=sys-libs/glibc-2.1.3
-	>=dev-lang/jdk-1.2
-	>=net-www/apache-1.3"
-
-src_unpack() {
-	unpack ${A}
-	mv jakarta-ant-1.3 jakarta-ant
-	mv jakarta-servletapi-3.2-src jakarta-servletapi
-	mv jakarta-tomcat-3.2.1-src jakarta-tomcat
-}
-
-src_compile() {
-
-	export CLASSPATH=`java-config --full-classpath=jaxp,ant,jsse`
-
-	echo "Building ant..."
-	cd ${S}/jakarta-ant
-	./bootstrap.sh
-	mv bootstrap/bin .
-	echo "Building servletapi..."
-	cd ${S}/jakarta-servletapi
-	sh ./build.sh dist
-	echo "Building tomcat..."
-	cd ${S}/jakarta-tomcat
-	sh ./build.sh dist
-	cd src/native/apache1.3
-	make -f Makefile.linux
-
-}
-
-src_install() {
-	
-	dodir /usr/share/tomcat
-	cp -a ${S}/build/tomcat/* ${D}/usr/share/tomcat
-	dodir /usr/share/tomcat/lib
-	insinto /usr/share/tomcat/lib
-	doins ${S}/build/tomcat/classes/tomcat.jar
-	doins ${S}/build/tomcat/lib/xml.jar
-	rm -rf ${D}/opt/tomcat/classes
-	insinto /usr/lib/apache
-	doins ${S}/jakarta-tomcat/src/native/apache/jserv/mod_jserv.so
-	insinto /etc/httpd
-	doins ${FILESDIR}/httpd.tomcat
-	insinto /etc/rc.d/init.d
-	insopts -m755
-	doins ${FILESDIR}/jakarta
-	#insinto /opt/tomcat/conf
-	#doins ${O}/files/web.xml
-
-	cd ${S}/jakarta-tomcat
-	dodoc BUGS LICENSE README RELEASE-* TODO etc/*.txt src/doc/faq src/doc/readme
-	dohtml etc/*.html
-	dohtml *.html
-	dohtml -r src/doc/*.html
-}
-
-pkg_config() {
-
-   einfo "Activating Servlet Engine..."
-   ${ROOT}/usr/sbin/rc-update add jakarta
-}
-
-
-
diff --git a/net-www/tomcat/tomcat-3.2.2.ebuild b/net-www/tomcat/tomcat-3.2.2.ebuild
index 484950cb6609..8d1e557e512b 100644
--- a/net-www/tomcat/tomcat-3.2.2.ebuild
+++ b/net-www/tomcat/tomcat-3.2.2.ebuild
@@ -1,7 +1,7 @@
 # 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/tomcat/tomcat-3.2.2.ebuild,v 1.5 2002/01/23 20:06:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-3.2.2.ebuild,v 1.6 2002/01/29 12:58:55 karltk Exp $
 
 A="jakarta-tomcat-3.2.2-src.tar.gz jakarta-servletapi-3.2.2-src.tar.gz jakarta-ant-1.3-src.tar.gz"
 S=${WORKDIR}
@@ -13,7 +13,7 @@ HOMEPAGE="http://jakarta.apache.org"
 
 DEPEND=">=sys-apps/bash-2.04
 	>=sys-libs/glibc-2.1.3
-	>=dev-lang/jdk-1.2
+	>=virtual/jdk-1.2
 	>=dev-java/jaxp-1.0.1
 	>=dev-java/jsse-1.0.2
 	>=net-www/apache-1.3"
diff --git a/net-www/tomcat/tomcat-4.0.1.ebuild b/net-www/tomcat/tomcat-4.0.1.ebuild
index 3dd30b01ab77..c0c7fb56a275 100644
--- a/net-www/tomcat/tomcat-4.0.1.ebuild
+++ b/net-www/tomcat/tomcat-4.0.1.ebuild
@@ -1,14 +1,14 @@
 # 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/tomcat/tomcat-4.0.1.ebuild,v 1.3 2002/01/23 20:06:16 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-4.0.1.ebuild,v 1.4 2002/01/29 12:58:55 karltk Exp $
 
 S=${WORKDIR}/jakarta-${P}
 DESCRIPTION="Apache Servlet Engine"
 SRC_URI="http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v${PV}/bin/jakarta-tomcat-4.0.1.tar.gz"
 HOMEPAGE="http://jakarta.apache.org/tomcat"
 
-RDEPEND=">=dev-lang/jdk-1.2"
+RDEPEND=">=virtual/jdk-1.2"
 
 src_install() {
 	dodir /opt/jakartqa/tomcat