CVS sucks!

3 files changed, 12 insertions, 97 deletions

diff --git a/net-www/tomcat/ChangeLog b/net-www/tomcat/ChangeLog
index a04df1d2be34..19118a281b04 100644
--- a/net-www/tomcat/ChangeLog
+++ b/net-www/tomcat/ChangeLog
@@ -1,11 +1,6 @@
 # ChangeLog for net-www/tomcat
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.4 2002/07/14 20:25:23 aliz Exp $
-
-*tomcat-3.2.2.ebuild (14 July 2002)
-
-  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> tomcat-3.2.2.ebuild :
-  Added KEYWORDS, SLOT.
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.5 2002/08/01 18:11:42 karltk Exp $
 
 *tomcat-4.0.4 (23 Jun 2002)
 
@@ -38,3 +33,14 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
+
+*tomcat-3.2.2.ebuild (14 Jul 2002)
+
+  01 Jul 2002; Karl Trygve Kalleberg <karltk@gentoo.org> tomcat-3.2.2.ebuild files/digest-tomcat-3.2.2 :
+
+  This package has been masked for a while. Finally removed to get rid of 
+  dev-java/jaxp entirely.
+   
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> tomcat-3.2.2.ebuild :
+  Added KEYWORDS, SLOT.
+
diff --git a/net-www/tomcat/files/digest-tomcat-3.2.2 b/net-www/tomcat/files/digest-tomcat-3.2.2
deleted file mode 100644
index 598dc91ce26c..000000000000
--- a/net-www/tomcat/files/digest-tomcat-3.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7d39a2b7d3b1bf0ba14591891d4b6d0 jakarta-tomcat-3.2.2-src.tar.gz 979971
-MD5 ca6158f3d005f97afb8723ac4f91a337 jakarta-servletapi-3.2.2-src.tar.gz 103107
-MD5 1f2b85000ad4b65c04e735b08bc4ef06 jakarta-ant-1.3-src.tar.gz 1017752
diff --git a/net-www/tomcat/tomcat-3.2.2.ebuild b/net-www/tomcat/tomcat-3.2.2.ebuild
deleted file mode 100644
index 3442a8e987ca..000000000000
--- a/net-www/tomcat/tomcat-3.2.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-3.2.2.ebuild,v 1.9 2002/08/01 11:59:03 seemant 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}
-DESCRIPTION="Apache Servlet Engine"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.2/src/jakarta-tomcat-3.2.2-src.tar.gz
-	 http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.2/src/jakarta-servletapi-3.2.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"
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="Apache-1.1"
-
-DEPEND=">=sys-apps/bash-2.04
-	>=sys-libs/glibc-2.1.3
-	>=virtual/jdk-1.2
-	>=dev-java/jaxp-1.0.1
-	>=dev-java/jsse-1.0.2
-	>=net-www/apache-1.3"
-
-src_unpack() {
-	unpack ${A}
-	mv jakarta-ant-1.3 jakarta-ant
-	mv jakarta-servletapi-3.2.2-src jakarta-servletapi
-	mv jakarta-tomcat-3.2.2-src jakarta-tomcat
-}
-
-src_compile() {
-
-	CLASSPATH=`java-config --full-classpath=jaxp,jsse,ant`
-
-	echo "Building ant..."
-	cd ${S}/jakarta-ant
-	./bootstrap.sh
-	mv bootstrap/bin .
-	cp build/lib/* lib
-	cd ..
-	mkdir jaxp-1.0.1
-	mv jakarta-ant/lib/{jaxp,parser}.jar jaxp-1.0.1  
-
-	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/jakarta
-	cp -a ${S}/dist/servletapi ${D}/usr/share/jakarta
-	cp -a ${S}/dist/tomcat ${D}/usr/share/jakarta
-	rm -r ${D}/usr/share/jakarta/{servletapi,tomcat}/src
-	rm -r ${D}/usr/share/jakarta/tomcat/lib/{ant,jaxp,parser}.jar
-	insinto /usr/lib/apache
-	doins ${S}/jakarta-tomcat/src/native/apache1.3/mod_jk.so
-	insinto /etc/httpd
-	doins ${FILESDIR}/httpd.tomcat
-	insinto /etc/rc.d/init.d
-	insopts -m755
-	doins ${FILESDIR}/tomcat
-
-	#insinto /opt/tomcat/conf
-	#doins ${O}/files/web.xml
-
-	cd ${S}/jakarta-tomcat
-	dodoc BUGS LICENSE README RELEASE-* TODO src/doc/faq src/doc/readme src/doc/JDBCRealm.howto
-
-	dohtml src/doc/*.html
-
-	cd ${D}/usr/share/doc/${PF}/html
-	mv ${D}/opt/jakarta/servletapi/docs servletapi
-}
-
-pkg_config() {
-
-	einfo "Activating Servlet Engine..."
-	${ROOT}/usr/sbin/rc-update add jakarta
-}
-
-
-