Depend on >=dev-java/java-config-2.0.31 and let it handle the java5 use flag properly.

Package-Manager: portage-2.1.2_rc3-r9

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index e4cb1ebaf3b19af8d76971872202278c08597197..d5fb28448bbded3128303acb84798e736dc30edb 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.90 2006/12/22 00:58:23 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.91 2006/12/22 22:41:26 betelgeuse Exp $
+
+  22 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  tomcat-5.5.20-r5.ebuild:
+  Depend on >=dev-java/java-config-2.0.31 and let it handle the java5 use flag
+  properly.
 
   22 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-5.5.20-r4.ebuild, tomcat-5.5.20-r5.ebuild:

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index d437b4a7acd29197a1601667be465cb555f5bd33..0cce3dee0e35e263ebf317eb3d65c878cce4353c 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.0.27/gentoo.diff 463 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc SHA1 2cac8406125e5bd360fed919eeb0d4685969462b SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc files/5.0.27/gentoo.diff 463
@@ -122,18 +125,18 @@ EBUILD tomcat-5.5.20-r4.ebuild 10282 RMD160 8198f751ee6f585b0819f2e01886f0bf7c33
 MD5 da40c6eef1749b4103ec533c58888f4d tomcat-5.5.20-r4.ebuild 10282
 RMD160 8198f751ee6f585b0819f2e01886f0bf7c331d33 tomcat-5.5.20-r4.ebuild 10282
 SHA256 739feba841bda684a2e3b32797eba995443f78cf3a76ad37503bc791072f3e8d tomcat-5.5.20-r4.ebuild 10282
-EBUILD tomcat-5.5.20-r5.ebuild 10319 RMD160 00226abaf64b9c71625d45c76b5376fdc2d27a0f SHA1 9ec4bee67a649481809b02a23b4bf42a08fc7ef0 SHA256 33e219ce28089507419467def942b335f0a9946c2d6f65d4486fce7c0422e430
-MD5 19720ee7e0e0e945892e33a26557e0e4 tomcat-5.5.20-r5.ebuild 10319
-RMD160 00226abaf64b9c71625d45c76b5376fdc2d27a0f tomcat-5.5.20-r5.ebuild 10319
-SHA256 33e219ce28089507419467def942b335f0a9946c2d6f65d4486fce7c0422e430 tomcat-5.5.20-r5.ebuild 10319
+EBUILD tomcat-5.5.20-r5.ebuild 10246 RMD160 ce75bc8b0c25d5479eefb2ba83c14c90228cdc60 SHA1 e11aef4a90c6a388df9322632df34656b1c7171a SHA256 5929973f16e3ba10e4d998c2845cb4fba2da81068e1d22c72523b9eefa753e63
+MD5 4db83193a27784e565fae63fc775f4a7 tomcat-5.5.20-r5.ebuild 10246
+RMD160 ce75bc8b0c25d5479eefb2ba83c14c90228cdc60 tomcat-5.5.20-r5.ebuild 10246
+SHA256 5929973f16e3ba10e4d998c2845cb4fba2da81068e1d22c72523b9eefa753e63 tomcat-5.5.20-r5.ebuild 10246
 EBUILD tomcat-6.0.6.ebuild 4715 RMD160 da719bb505293b8280db45c82e84a454a82ae98a SHA1 223cd5c4535630d7918f947e45b083e150326387 SHA256 88da5fa96e0e911853b8264d1fd24dd92200ce263a5f201d1fc546e039185acd
 MD5 5e13c46eed44f09d62d4a5208b13caac tomcat-6.0.6.ebuild 4715
 RMD160 da719bb505293b8280db45c82e84a454a82ae98a tomcat-6.0.6.ebuild 4715
 SHA256 88da5fa96e0e911853b8264d1fd24dd92200ce263a5f201d1fc546e039185acd tomcat-6.0.6.ebuild 4715
-MISC ChangeLog 30192 RMD160 79ce64604f8dd5b9f9a406413255db056d1c8096 SHA1 565ca5391502186885c7578832dcf57e91593e31 SHA256 727c7464d4591cd44c8e31e4fc6b2e81eb33eaa57258e7b84e9da959efc9803d
-MD5 dcd460c740c022eeefecc71f9731690b ChangeLog 30192
-RMD160 79ce64604f8dd5b9f9a406413255db056d1c8096 ChangeLog 30192
-SHA256 727c7464d4591cd44c8e31e4fc6b2e81eb33eaa57258e7b84e9da959efc9803d ChangeLog 30192
+MISC ChangeLog 30369 RMD160 be9cb861d94ce275d031b24a46cb3f9ade165375 SHA1 9b1ef5d33d937e911361762dd0a73eb5bfab502f SHA256 172ba450c9f923d0e691c9f19702f3307823c1126ed42f92c192225b7e2c40b6
+MD5 9939fad7b5b0f59f1cc4e5547017e119 ChangeLog 30369
+RMD160 be9cb861d94ce275d031b24a46cb3f9ade165375 ChangeLog 30369
+SHA256 172ba450c9f923d0e691c9f19702f3307823c1126ed42f92c192225b7e2c40b6 ChangeLog 30369
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -153,3 +156,10 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 448da02765cca1f68bb511db94de7366 files/digest-tomcat-6.0.6 274
 RMD160 fb076827535974cf7e7e029bcab60a02b5d7ff37 files/digest-tomcat-6.0.6 274
 SHA256 ea09af990170d2bcb09eb9d9c3adfec910e0428b33ea736c4afe80cbd5edd755 files/digest-tomcat-6.0.6 274
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFjF8qcxLzpIGCsLQRAhM2AJ4sn36PLj4ttK4p7vDJZDq/+JjYgQCcC7Aq
+0HmfrVsYvmppgJU/wqEO5JQ=
+=NVuC
+-----END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild
index 21952a2ccd895f101a937db4ca12cdbe802bb34c..7ff53e7d88978ac235c1d551436586975505bcbc 100644 (file)
--- a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.3 2006/12/22 00:58:23 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.4 2006/12/22 22:41:27 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -45,15 +45,10 @@ RDEPEND="=dev-java/eclipse-ecj-3.1*
           )"
 DEPEND="java5? ( >=virtual/jdk-1.5 )
        !java5? ( =virtual/jdk-1.4* )
+       >=dev-java/java-config-2.0.31
        ${RDEPEND}
        dev-java/ant"
 
-if ! use java5; then
-       JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
-else
-       JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5"
-fi
-
 S=${WORKDIR}/${MY_P}
 
 TOMCAT_NAME="${PN}-${SLOT}"