2.2: fix dodoc README, bug #204622. Also add source USE flag and don't generate javadoc without USE=doc. 2.4: quote variables.

(Portage version: 2.1.4_rc14)

3 files changed, 32 insertions, 21 deletions

diff --git a/dev-java/servletapi/ChangeLog b/dev-java/servletapi/ChangeLog
index 5fe090f0881d..66a63705a40c 100644
--- a/dev-java/servletapi/ChangeLog
+++ b/dev-java/servletapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/servletapi
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.62 2007/10/15 14:09:17 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/ChangeLog,v 1.63 2008/01/06 19:04:55 caster Exp $
+
+  06 Jan 2008; Vlastimil Babka <caster@gentoo.org> servletapi-2.2-r3.ebuild,
+  servletapi-2.4-r5.ebuild:
+  2.2: fix dodoc README, bug #204622. Also add source USE flag and don't
+  generate javadoc without USE=doc. 2.4: quote variables.
 
   15 Oct 2007; Markus Rothe <corsair@gentoo.org> servletapi-2.2-r3.ebuild:
   Stable on ppc64
diff --git a/dev-java/servletapi/servletapi-2.2-r3.ebuild b/dev-java/servletapi/servletapi-2.2-r3.ebuild
index 968e9b9fe27f..e8117a3316c2 100644
--- a/dev-java/servletapi/servletapi-2.2-r3.ebuild
+++ b/dev-java/servletapi/servletapi-2.2-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r3.ebuild,v 1.10 2007/10/15 14:09:17 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.2-r3.ebuild,v 1.11 2008/01/06 19:04:55 caster Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -16,15 +18,19 @@ KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="doc"
 S="${WORKDIR}/jakarta-servletapi-src"
 
-src_compile() {
-	eant all
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i 's/compile,javadoc/compile/' build.xml || die "sed failed"
 }
 
-src_install() {
-	cd ../dist
-	java-pkg_dojar servletapi/lib/servlet.jar || die "Unable to install"
+EANT_BUILD_TARGET="all"
 
-	use doc && java-pkg_dohtml -r servletapi/docs/*
+src_install() {
+	java-pkg_dojar ../dist/servletapi/lib/servlet.jar
 
-	dodoc dist/README.txt
+	dodoc README || die
+	use doc && java-pkg_dojavadoc ../build/servletapi/docs/api
+	use source && java-pkg_dosrc src/share/javax
 }
diff --git a/dev-java/servletapi/servletapi-2.4-r5.ebuild b/dev-java/servletapi/servletapi-2.4-r5.ebuild
index b7c40838bd64..8213c9d55369 100644
--- a/dev-java/servletapi/servletapi-2.4-r5.ebuild
+++ b/dev-java/servletapi/servletapi-2.4-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r5.ebuild,v 1.6 2007/01/15 15:58:20 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/servletapi/servletapi-2.4-r5.ebuild,v 1.7 2008/01/06 19:04:55 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -28,20 +28,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