Fixed issue with examples not being compiled and/or complete. Thanks to nostromo who provided some help there. Updated patch for examples compilation and to make docs compilation depend on doc USE flag. A few other syntax and policy corrections

(Portage version: 2.1.2-r1)

6 files changed, 60 insertions, 28 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 50a43330c12d..e901ba4a0d2f 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.110 2007/01/28 07:26:59 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.111 2007/01/28 23:00:54 wltjr Exp $
+
+*tomcat-6.0.8_alpha-r3 (28 Jan 2007)
+*tomcat-6.0.7_beta-r6 (28 Jan 2007)
+
+  28 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/6/build-xml.patch, -tomcat-6.0.7_beta-r5.ebuild,
+  +tomcat-6.0.7_beta-r6.ebuild, -tomcat-6.0.8_alpha-r2.ebuild,
+  +tomcat-6.0.8_alpha-r3.ebuild:
+  Fixed issue with examples not being compiled and/or complete. Thanks to
+  nostromo who provided some help there. Updated patch for examples
+  compilation and to make docs compilation depend on doc USE flag. A few other
+  syntax and policy corrections
 
 *tomcat-6.0.8_alpha-r2 (28 Jan 2007)
 *tomcat-6.0.7_beta-r5 (28 Jan 2007)
diff --git a/www-servers/tomcat/files/6/build-xml.patch b/www-servers/tomcat/files/6/build-xml.patch
index 59d811a4279c..fce017234234 100644
--- a/www-servers/tomcat/files/6/build-xml.patch
+++ b/www-servers/tomcat/files/6/build-xml.patch
@@ -1,5 +1,5 @@
---- ../build.xml	2007-01-26 14:42:58.000000000 -0500
-+++ build.xml	2007-01-26 14:58:59.000000000 -0500
+--- ../build.xml	2007-01-28 17:08:59.000000000 -0500
++++ build.xml	2007-01-28 17:15:32.000000000 -0500
 @@ -94,6 +94,7 @@
             excludes="**/CVS/**,**/.svn/**">
        <classpath refid="tomcat.classpath" />
@@ -40,6 +40,15 @@
  
      <!-- JSP 2.1 EL Implementation JAR File -->
      <jar  jarfile="${el-api.jar}">
+@@ -299,7 +300,7 @@
+ 
+   </target>
+ 
+-  <target name="build-docs">
++  <target name="build-docs" unless="nobuild.docs">
+ 
+     <copy todir="${tomcat.build}/webapps">
+       <fileset dir="webapps">
 @@ -447,11 +448,16 @@
  
    <target name="deploy" depends="build-only,build-docs">
@@ -57,7 +66,12 @@
  
    	<!-- Copy scripts -->
      <copy todir="${tomcat.build}/bin">
-@@ -492,8 +498,10 @@
+@@ -488,12 +494,14 @@
+              destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
+              debug="${compile.debug}" deprecation="${compile.deprecation}"
+              optimize="${compile.optimize}"
+-    	     classpath="${tomcat.classes}"
++    	     classpath="${tomcat.classes}:${jsp-api.jar}"
               excludes="**/CVS/**,**/.svn/**">
      </javac>
  
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r5 b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r6
index 1309a094c51c..1309a094c51c 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r5
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r6
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r2 b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r3
index d9ae7e3b1bba..d9ae7e3b1bba 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r2
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r3
diff --git a/www-servers/tomcat/tomcat-6.0.7_beta-r5.ebuild b/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild
index 1b693a826af2..3ba88460f260 100644
--- a/www-servers/tomcat/tomcat-6.0.7_beta-r5.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.7_beta-r6.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/www-servers/tomcat/tomcat-6.0.7_beta-r5.ebuild,v 1.1 2007/01/28 07:26:59 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild,v 1.1 2007/01/28 23:00:55 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -37,18 +37,17 @@ pkg_setup() {
 	enewgroup tomcat 265
 	enewuser tomcat 265 -1 /dev/null tomcat
 
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
+	WANT_ANT_TASKS="ant-trax"
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}/${SLOT}/build-xml.patch"
 
-	cd ${S}/bin
-	java-pkg_jar-from commons-daemon
+#	cd "${S}/bin"
+#	java-pkg_jar-from commons-daemon
 }
 
 src_compile(){
@@ -61,11 +60,16 @@ src_compile(){
 	# New way if others get out of heap space
 #	ANT_OPTS=-XX:MaxPermSize=128m
 
-	local antflags="build-jasper-jdt build-only -Dbase.path=${T}"
+	local antflags="build-jasper-jdt deploy -Dbase.path=${T}"
 	antflags="${antflags} -Dcompile.debug=false"
+	if ! use doc; then
+		antflags="${antflags} -Dnobuild.docs=true"
+	fi
 	antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
 	antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)"
 	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)"
+	antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)"
+	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)"
 	eant ${antflags}
 }
 
@@ -87,7 +91,7 @@ src_install() {
 	dodir   ${CATALINA_BASE}
 	diropts -m0755
 
-	cd ${S}
+	cd "${S}"
 	# we don't need dos scripts
 	rm -f bin/*.bat
 	chmod 755 bin/*.sh
@@ -121,7 +125,7 @@ src_install() {
 	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
 	java-pkg_jar-from tomcat-servlet-api-2.5
 
-	cd ${S}
+	cd "${S}"
 
 	# Copy over webapps, some controlled by use flags
 	cp -p RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
@@ -133,11 +137,10 @@ src_install() {
 	cp -pr webapps/manager ${D}${TOMCAT_HOME}/webapps
 
 	if use doc; then
-		cp -pr webapps/docs ${D}${CATALINA_BASE}/webapps
+		cp -pr output/build/webapps/docs ${D}${CATALINA_BASE}/webapps
 	fi
 	if use examples; then
-		cp -pr webapps/examples \
-			${D}${CATALINA_BASE}/webapps
+		cp -pr output/build/webapps/examples ${D}${CATALINA_BASE}/webapps
 	fi
 
 	# symlink the directories to make CATALINA_BASE possible
diff --git a/www-servers/tomcat/tomcat-6.0.8_alpha-r2.ebuild b/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild
index 72485f99adfd..41a8e3e7623a 100644
--- a/www-servers/tomcat/tomcat-6.0.8_alpha-r2.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.8_alpha-r3.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/www-servers/tomcat/tomcat-6.0.8_alpha-r2.ebuild,v 1.1 2007/01/28 07:26:59 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild,v 1.1 2007/01/28 23:00:55 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -37,18 +37,17 @@ pkg_setup() {
 	enewgroup tomcat 265
 	enewuser tomcat 265 -1 /dev/null tomcat
 
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
+	WANT_ANT_TASKS="ant-trax"
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}/${SLOT}/build-xml.patch"
 
-	cd ${S}/bin
-	java-pkg_jar-from commons-daemon
+#	cd "${S}/bin"
+#	java-pkg_jar-from commons-daemon
 }
 
 src_compile(){
@@ -61,11 +60,16 @@ src_compile(){
 	# New way if others get out of heap space
 #	ANT_OPTS=-XX:MaxPermSize=128m
 
-	local antflags="build-jasper-jdt build-only -Dbase.path=${T}"
+	local antflags="build-jasper-jdt deploy -Dbase.path=${T}"
 	antflags="${antflags} -Dcompile.debug=false"
+	if ! use doc; then
+		antflags="${antflags} -Dnobuild.docs=true"
+	fi
 	antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
 	antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)"
 	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)"
+	antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 jsp-api.jar)"
+	antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.5 servlet-api.jar)"
 	eant ${antflags}
 }
 
@@ -87,7 +91,7 @@ src_install() {
 	dodir   ${CATALINA_BASE}
 	diropts -m0755
 
-	cd ${S}
+	cd "${S}"
 	# we don't need dos scripts
 	rm -f bin/*.bat
 	chmod 755 bin/*.sh
@@ -121,7 +125,7 @@ src_install() {
 	cd "${D}/usr/share/${TOMCAT_NAME}/lib"
 	java-pkg_jar-from tomcat-servlet-api-2.5
 
-	cd ${S}
+	cd "${S}"
 
 	# Copy over webapps, some controlled by use flags
 	cp -p RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
@@ -133,11 +137,10 @@ src_install() {
 	cp -pr webapps/manager ${D}${TOMCAT_HOME}/webapps
 
 	if use doc; then
-		cp -pr webapps/docs ${D}${CATALINA_BASE}/webapps
+		cp -pr output/build/webapps/docs ${D}${CATALINA_BASE}/webapps
 	fi
 	if use examples; then
-		cp -pr webapps/examples \
-			${D}${CATALINA_BASE}/webapps
+		cp -pr output/build/webapps/examples ${D}${CATALINA_BASE}/webapps
 	fi
 
 	# symlink the directories to make CATALINA_BASE possible