Fixed issue with examples not being compiled and/or complete. Thanks to nostromo...

Package-Manager: portage-2.1.2-r1

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 50a43330c12d84ce3c18ba1eb82dd24c3c82b996..e901ba4a0d2f3bfcb5dc18b8706eb9e8d67b376b 100644 (file)
--- 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/Manifest b/www-servers/tomcat/Manifest
index d91093c927b16bec8a864c3b402e8a35f851f65f..e9361a61af5e00aad00a453216334352c12c68a4 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -106,10 +106,10 @@ AUX 5.5.20/tomcatbuild-xml.patch 12470 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06
 MD5 83d2b72b5c1c52e80492ee5199eb3625 files/5.5.20/tomcatbuild-xml.patch 12470
 RMD160 e936baf49d5f1a34b5b3c5787d62fb5a06ea52a2 files/5.5.20/tomcatbuild-xml.patch 12470
 SHA256 d76b0dcc3a6d8d60c0305d74ef980e5461bbcaef1059a306e38e5d358c2a01a4 files/5.5.20/tomcatbuild-xml.patch 12470
-AUX 6/build-xml.patch 2123 RMD160 3999e521bdfa34496130aab5269fe8602601013c SHA1 743c8df0e89ebb8c6f50aeb9f175b2e944a42950 SHA256 421d9aa75047f5fa793daecf7f715a729f6e2a67bd22ae31c59a197e585683c6
-MD5 3e8e78fce622eb87b75a2d2cd7a0e688 files/6/build-xml.patch 2123
-RMD160 3999e521bdfa34496130aab5269fe8602601013c files/6/build-xml.patch 2123
-SHA256 421d9aa75047f5fa793daecf7f715a729f6e2a67bd22ae31c59a197e585683c6 files/6/build-xml.patch 2123
+AUX 6/build-xml.patch 2611 RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d SHA1 a41e61f07453d14904d1f4b59c71e577840a9b01 SHA256 7bf3bf095504f1063d5d282643ee2b61bc6bd6b4f32f80906484af53757e02c6
+MD5 8533b95643881c578f24e30098d3d178 files/6/build-xml.patch 2611
+RMD160 639b3f080dc47f799bf029c36e082c2c1976fd9d files/6/build-xml.patch 2611
+SHA256 7bf3bf095504f1063d5d282643ee2b61bc6bd6b4f32f80906484af53757e02c6 files/6/build-xml.patch 2611
 AUX 6/tomcat.conf 2669 RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe SHA1 53bf051861b624f619f78d99d8ea634b8e617464 SHA256 ae15a874568a888d5998db3ddbcc6469ceab1e1dcd72239b441e924ceb0465cb
 MD5 87c3a871a5f81aa03cec06fe5b195bed files/6/tomcat.conf 2669
 RMD160 0f0b660670f1a5fd43aba9bac75d40ee33e902fe files/6/tomcat.conf 2669
@@ -143,18 +143,18 @@ EBUILD tomcat-5.5.20-r8.ebuild 10299 RMD160 dd99a6649a603e8262aeb33ae75a13466a3e
 MD5 8af16e1d4381d7656ed93be48867ad03 tomcat-5.5.20-r8.ebuild 10299
 RMD160 dd99a6649a603e8262aeb33ae75a13466a3e36aa tomcat-5.5.20-r8.ebuild 10299
 SHA256 9873ddf7870807f4bf6701a9f00ccc0202ae273c859a7c0c05a0e7c4c59a5601 tomcat-5.5.20-r8.ebuild 10299
-EBUILD tomcat-6.0.7_beta-r5.ebuild 4808 RMD160 ee4ceeb8c7fafb6615ed9aef9a9c2995614da21f SHA1 7a6b84d8b7cffb5abe8156bd7da9c235443c0dd2 SHA256 27cc71e71a27e2de33881e20228fc32b5197ec56b7e3b16da4edfd3ca93c32df
-MD5 83ef9ef94cd2c66234a4f0b3b8e95953 tomcat-6.0.7_beta-r5.ebuild 4808
-RMD160 ee4ceeb8c7fafb6615ed9aef9a9c2995614da21f tomcat-6.0.7_beta-r5.ebuild 4808
-SHA256 27cc71e71a27e2de33881e20228fc32b5197ec56b7e3b16da4edfd3ca93c32df tomcat-6.0.7_beta-r5.ebuild 4808
-EBUILD tomcat-6.0.8_alpha-r2.ebuild 4810 RMD160 3c9c5b304374cab2203a9ccd49a718aa593a811d SHA1 f4718e65928e81164a6f0845e14d107a40547456 SHA256 da7d0ca7d42c9a935f91550d8d00ef4fbf34d937e1249896ab3ba459c3d8e3cc
-MD5 a2638d7f714be80b91a5280cc9ba4df3 tomcat-6.0.8_alpha-r2.ebuild 4810
-RMD160 3c9c5b304374cab2203a9ccd49a718aa593a811d tomcat-6.0.8_alpha-r2.ebuild 4810
-SHA256 da7d0ca7d42c9a935f91550d8d00ef4fbf34d937e1249896ab3ba459c3d8e3cc tomcat-6.0.8_alpha-r2.ebuild 4810
-MISC ChangeLog 36035 RMD160 370027a6a4656c27bbb2314ea4981622826fc009 SHA1 eaff72faa21bd6a3a0742db6901aeb69bc16cf31 SHA256 05ace11dd0461fa71f7b51c9c6f42697950745ecdc3464e8f3b6169a6e0e28c1
-MD5 e8cc25e1fd76834d46def35e6afda0fa ChangeLog 36035
-RMD160 370027a6a4656c27bbb2314ea4981622826fc009 ChangeLog 36035
-SHA256 05ace11dd0461fa71f7b51c9c6f42697950745ecdc3464e8f3b6169a6e0e28c1 ChangeLog 36035
+EBUILD tomcat-6.0.7_beta-r6.ebuild 5067 RMD160 44ce9312389bdcafe32fc157348e8a2be8b2d365 SHA1 ff88a62d5bd89fa59c1d76c43d8b530e4c92998a SHA256 a917527477cdc9af5ea513012e77d7477665179911bdbac822736eedbbcbaa7b
+MD5 df881beab94b9682804b8024e294018e tomcat-6.0.7_beta-r6.ebuild 5067
+RMD160 44ce9312389bdcafe32fc157348e8a2be8b2d365 tomcat-6.0.7_beta-r6.ebuild 5067
+SHA256 a917527477cdc9af5ea513012e77d7477665179911bdbac822736eedbbcbaa7b tomcat-6.0.7_beta-r6.ebuild 5067
+EBUILD tomcat-6.0.8_alpha-r3.ebuild 5069 RMD160 a8ed92456c4a466aa7dc441d49d4a404ad9f6c5e SHA1 2ad02d9c6f0a9e82de8e1be80a9a0eb12b152cc3 SHA256 5cef4eace55421d2e3ff692e21446f75a34825df5154c1b0a372133829dcb12e
+MD5 f1d2a293f9b4f2325a6ead9973b4ccc7 tomcat-6.0.8_alpha-r3.ebuild 5069
+RMD160 a8ed92456c4a466aa7dc441d49d4a404ad9f6c5e tomcat-6.0.8_alpha-r3.ebuild 5069
+SHA256 5cef4eace55421d2e3ff692e21446f75a34825df5154c1b0a372133829dcb12e tomcat-6.0.8_alpha-r3.ebuild 5069
+MISC ChangeLog 36573 RMD160 fa550ae8374dcf89c9228f78b7441a7aebd311d7 SHA1 7d87961a88c17ef726ef2fe0677a48c6605e62e1 SHA256 00699cf856fd30320859897fa695d34727630713847b6453972d86104af6cda7
+MD5 bf535874d775580ab9754b29632099cd ChangeLog 36573
+RMD160 fa550ae8374dcf89c9228f78b7441a7aebd311d7 ChangeLog 36573
+SHA256 00699cf856fd30320859897fa695d34727630713847b6453972d86104af6cda7 ChangeLog 36573
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -174,9 +174,9 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277
-MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r5 274
-RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r5 274
-SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r5 274
-MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha-r2 274
-RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha-r2 274
-SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha-r2 274
+MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r6 274
+RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r6 274
+SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r6 274
+MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha-r3 274
+RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha-r3 274
+SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha-r3 274

diff --git a/www-servers/tomcat/files/6/build-xml.patch b/www-servers/tomcat/files/6/build-xml.patch
index 59d811a4279c6975eb7cd96f13334cf2134b3589..fce017234234e1caf9e026a59688c8a8bb84dada 100644 (file)
--- 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
similarity index 100%
rename from www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r5
rename to 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
similarity index 100%
rename from www-servers/tomcat/files/digest-tomcat-6.0.8_alpha-r2
rename to 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
similarity index 87%
rename from www-servers/tomcat/tomcat-6.0.7_beta-r5.ebuild
rename to www-servers/tomcat/tomcat-6.0.7_beta-r6.ebuild
index 1b693a826af249bde2ac117711ff8b4702e41f70..3ba88460f2602c2c03ac5e565207259f7445be64 100644 (file)
--- 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
similarity index 87%
rename from www-servers/tomcat/tomcat-6.0.8_alpha-r2.ebuild
rename to www-servers/tomcat/tomcat-6.0.8_alpha-r3.ebuild
index 72485f99adfd4ec82bcf1e47f15ad37d2e7bcb6e..41a8e3e7623a7d0207e204b1830cf7e6a81b3d5b 100644 (file)
--- 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