Removed past unused 5.5.x version. Added (migrated servletapi) ebuilds for 2.2 and 2.3 slots using upstream sources vs ours. Quoted vars in existing.

(Portage version: 2.1.3.16)

9 files changed, 95 insertions, 64 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index dd0183aadc0a..e2454df135f6 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.34 2007/10/27 09:01:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.35 2007/11/03 02:01:25 wltjr Exp $
+
+*tomcat-servlet-api-4.1.36 (03 Nov 2007)
+*tomcat-servlet-api-3 (03 Nov 2007)
+
+  03 Nov 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +tomcat-servlet-api-3.ebuild, +tomcat-servlet-api-4.1.36.ebuild,
+  -tomcat-servlet-api-5.5.23.ebuild, tomcat-servlet-api-5.5.25.ebuild,
+  tomcat-servlet-api-6.0.14.ebuild:
+  Removed past unused 5.5.x version. Added (migrated servletapi) ebuilds for
+  2.2 and 2.3 slots using upstream sources vs ours. Quoted vars in existing.
 
   27 Oct 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   tomcat-servlet-api-5.5.25.ebuild:
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-3 b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-3
new file mode 100644
index 000000000000..877abc0ee19b
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-3
@@ -0,0 +1,3 @@
+MD5 4ab97805b2ba8b55ba21ff580f99ed6a jakarta-servletapi-src.tar.gz 65342
+RMD160 9fc0def14700c4850455da1312e50135fd56eea9 jakarta-servletapi-src.tar.gz 65342
+SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 jakarta-servletapi-src.tar.gz 65342
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-4.1.36 b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-4.1.36
new file mode 100644
index 000000000000..35683bca85f4
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-4.1.36
@@ -0,0 +1,3 @@
+MD5 b7707846b37133cf422084ab315eaa0d apache-tomcat-4.1.36-src.tar.gz 3715200
+RMD160 344230cac551a483cef439153dd18bc5ff570f1a apache-tomcat-4.1.36-src.tar.gz 3715200
+SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951 apache-tomcat-4.1.36-src.tar.gz 3715200
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.23 b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.23
deleted file mode 100644
index e0e59f68fbb2..000000000000
--- a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.23
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 362d1d8b15dc09882440dcab8c592dd7 apache-tomcat-5.5.23-src.tar.gz 4895919
-RMD160 fe669f6b864fd7dcf4ad74dad22a0256e5417005 apache-tomcat-5.5.23-src.tar.gz 4895919
-SHA256 e2f7ce250643349507b511a5ea96df7364030a061a8f4d5b71d8b5a099e2b6bd apache-tomcat-5.5.23-src.tar.gz 4895919
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
new file mode 100644
index 000000000000..ab5583a3dd5b
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-3.ebuild,v 1.1 2007/11/03 02:01:25 wltjr Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="${PN/tomcat/}"
+MY_PN="jakarta-${MY_PN//-/}-src"
+DESCRIPTION="Tomcat's Servlet API 2.2/JSP API 1.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="http://archive.apache.org/dist/jakarta/tomcat-3/src/${MY_PN}.tar.gz"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="Apache-1.1"
+SLOT="2.2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+S="${WORKDIR}/${MY_PN}"
+
+EANT_BUILD_TARGET="all"
+
+src_install() {
+	java-pkg_dojar ../dist/servletapi/lib/servlet.jar
+
+	use doc && java-pkg_dohtml -r ../dist/servletapi/docs/*
+	use source && java-pkg_dosrc src/share/javax
+	dodoc ../dist/README.txt
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
new file mode 100644
index 000000000000..29d9fde70a0f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild,v 1.1 2007/11/03 02:01:25 wltjr Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="apache-${P/-servlet-api/}-src"
+DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
+LICENSE="Apache-1.1"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+S="${WORKDIR}/${MY_P}/servletapi"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	einfo "Removing bundled jars and classes"
+	find "${WORKDIR}/${MY_P}" '(' -name '*.class' -o -name '*.jar' ')' -delete
+}
+
+EANT_BUILD_TARGET="all"
+
+src_install() {
+	java-pkg_dojar dist/lib/servlet.jar
+
+	use doc && java-pkg_dohtml -r dist/docs/*
+	use source && java-pkg_dosrc src/share/javax
+	dodoc dist/README.txt
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild
deleted file mode 100644
index bfe7beabc8ef..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild,v 1.6 2007/05/15 20:09:59 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="apache-${P/-servlet-api/}-src"
-DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.4"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="doc java5 source"
-
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( =virtual/jdk-1.4* )
-	source? ( app-arch/zip )"
-RDEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( =virtual/jdk-1.4* )"
-
-S="${WORKDIR}/${MY_P}/servletapi"
-
-src_compile() {
-	local antflags="jar $(use_doc javadoc examples)"
-	eant ${antflags} -f jsr154/build.xml
-	eant ${antflags} -f jsr152/build.xml
-}
-
-src_install() {
-	mv jsr{154,152}/dist/lib/*.jar ${S}
-
-	if use doc ; then
-		mkdir docs
-		cd ${S}/jsr154/build
-		mv docs ${S}/docs/servlet
-		mv examples ${S}/docs/servlet/examples
-
-		cd ${S}/jsr152/build
-		mv docs ${S}/docs/jsp
-		mv examples ${S}/docs/jsp/examples
-	fi
-
-	cd ${S}
-	java-pkg_dojar *.jar
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild
index bde0bd43162c..502790de2265 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild,v 1.2 2007/10/27 09:01:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild,v 1.3 2007/11/03 02:01:25 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -29,20 +29,20 @@ src_compile() {
 }
 
 src_install() {
-	mv jsr{154,152}/dist/lib/*.jar ${S}
+	mv jsr{154,152}/dist/lib/*.jar "${S}"
 
 	if use doc ; then
 		mkdir docs
-		cd ${S}/jsr154/build
-		mv docs ${S}/docs/servlet
-		mv examples ${S}/docs/servlet/examples
+		cd "${S}/jsr154/build"
+		mv docs "${S}/docs/servlet"
+		mv examples "${S}/docs/servlet/examples"
 
-		cd ${S}/jsr152/build
-		mv docs ${S}/docs/jsp
-		mv examples ${S}/docs/jsp/examples
+		cd "${S}/jsr152/build"
+		mv docs "${S}/docs/jsp"
+		mv examples "${S}/docs/jsp/examples"
 	fi
 
-	cd ${S}
+	cd "${S}"
 	java-pkg_dojar *.jar
 	use doc && java-pkg_dohtml -r docs/*
 	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild
index 871742d5f3fa..d9cdf5244c23 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild,v 1.5 2007/09/02 15:05:55 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild,v 1.6 2007/11/03 02:01:25 wltjr Exp $
 
 JAVA_PKG_IUSE="source"
 
@@ -25,7 +25,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	cp ${FILESDIR}/${SLOT}-build.xml build.xml || die "Could not replace build.xml"
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
 	rm */*/build.xml
 }