diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-09-17 21:05:25 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-09-17 21:05:25 +0000 |
| commit | e91dd954604974d985e589f45d4323b4f5ad892d (patch) | |
| tree | 4430ec0f39fe26efa69e7f9e8878f7aaf35d0831 /www-servers/tomcat | |
| parent | alpha/2008.0/no-nptl has been removed (diff) | |
| download | historical-e91dd954604974d985e589f45d4323b4f5ad892d.tar.gz historical-e91dd954604974d985e589f45d4323b4f5ad892d.tar.bz2 historical-e91dd954604974d985e589f45d4323b4f5ad892d.zip | |
Detect if tomcat-servlet-api is built with java5 support but for tomcat java5 is off.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686
Diffstat (limited to 'www-servers/tomcat')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 7 | ||||
| -rw-r--r-- | www-servers/tomcat/Manifest | 10 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-5.5.27-r1.ebuild | 11 |
3 files changed, 20 insertions, 8 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 264a56292f2e..fd1451ff1c59 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.194 2008/09/17 20:32:34 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.195 2008/09/17 21:05:25 betelgeuse Exp $ + + 17 Sep 2008; Petteri Räty <betelgeuse@gentoo.org> + tomcat-5.5.27-r1.ebuild: + Detect if tomcat-servlet-api is built with java5 support but for tomcat + java5 is off. 17 Sep 2008; Petteri Räty <betelgeuse@gentoo.org> tomcat-5.5.27-r1.ebuild: diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 979230ab97fc..fd93f1c36526 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -16,16 +16,16 @@ DIST apache-tomcat-5.5.27-src.tar.gz 7382057 RMD160 8114fa3be19fd28a5d2d0d7e7087 DIST apache-tomcat-6.0.16-src.tar.gz 3527896 RMD160 8e6c0900889439f4cb89db35afb0c27e77103c00 SHA1 74127ba3da450a97869f2a2a2f0e134d23474018 SHA256 9e0a776f9d9c5fe935a39b066f74c07e7d26b4f30b66b22622a20dec235b0a7f DIST apache-tomcat-6.0.18-src.tar.gz 3484249 RMD160 ef85db0d65a4f3bdd3ca821420d06535050b6a93 SHA1 9182b0d6b2d0cb2d60f04be6211f3b3516bc518e SHA256 f5ad5dd12e221d75e25234ca734fb434cf45f3fcea93623232a73dc9bfd03dc4 EBUILD tomcat-5.5.26.ebuild 10956 RMD160 def823fb1872b6a29fce27f2fbb3d821e02f0047 SHA1 c55fc5fe2815405cce9df2700e0194f2e5b23610 SHA256 fe7e7e9dc8bad29644611cc532ff6d6709056b5953929d8bf91e6ec3093ba4b7 -EBUILD tomcat-5.5.27-r1.ebuild 11000 RMD160 994c1191f54ee0410872a0dba5b860665c6f34f0 SHA1 b6d3971ed8c8eb6e42baaa864e6fb0386bee1714 SHA256 ca7f5cc49e42cb83d546486af301936adabc7fb0803167f85ba32eaba406fb0a +EBUILD tomcat-5.5.27-r1.ebuild 11245 RMD160 9924b0769a87efcc19e2f010137b60e1b636473b SHA1 0128a06f70f045ab7ee2749872826a7ffaa34296 SHA256 509cf3a4d63147c0bb9cb733849cf0e739fa5dcdc02c8ca47d0f54bc18c52077 EBUILD tomcat-5.5.27.ebuild 10823 RMD160 3c8839d68755592ed1423813e9536b241cbb5752 SHA1 49bbda26a57877cd09a32895ce7021e8812a63a5 SHA256 471ba2ce604e29e6f6aedd32a5d9e10c779ba2bd5834dcf812cdca2ad5ea5f94 EBUILD tomcat-6.0.16.ebuild 6290 RMD160 8ddb427fbd5f776da58a1efbeafab9861f8ddcba SHA1 eedebefa220053bb55a5e500aba1f25129ae231d SHA256 6ea2a0011e98dd70235e7431b55a620e81b513fad110b10eda5b6c406bf634ef EBUILD tomcat-6.0.18.ebuild 6292 RMD160 06ef935b55eb04a604b909dab996d2227ab03c7a SHA1 7519b3837e81c1c4a0ddeccceaa10ea73785d457 SHA256 47ba94b7be1df148216f6b0f7dd740a5d9b3bdc2dd2fd7fb2d21c0e703551e9d -MISC ChangeLog 54104 RMD160 a818dd667983f500e5876a04bb6adc63878c5b28 SHA1 5e2734587ac5d7a661b40e655c123fcc4f63ca1a SHA256 257f903334108e8dc28db9177c82248d4bdd2f0566a7b744786cb1f7b8f9e0d5 +MISC ChangeLog 54275 RMD160 355225e092d15b611800b9bc8dafce9a90612ed5 SHA1 5d934ac1623e29e26f673e5c2296ad3492668c64 SHA256 c3d97fc9b70e5f04921e316552e8a835feb0480cc40cc1980230c412bdceb474 MISC metadata.xml 627 RMD160 2dab78e07362b6486455f4d572705ebecd9a291e SHA1 c4b4ef839599dded0996fc0feb31d70c0108580b SHA256 d321a949ce5495ef446bd75104539808e69fb6f6ae2e53b5fa583b48ea5f5749 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkjRaWwACgkQcxLzpIGCsLRG7gCeN0MMa9XETAmNzWeXr3CahTQg -zMwAnjXbRouI5YMZxQ858wDbThfDSIGS -=Ka0U +iEYEARECAAYFAkjRcR4ACgkQcxLzpIGCsLTFvgCfcT4Plw6pStTbAUPVFibZWQk5 +pUoAn2QkgkmeJjzoNQiCiaiP+5JXjdb+ +=eCaN -----END PGP SIGNATURE----- diff --git a/www-servers/tomcat/tomcat-5.5.27-r1.ebuild b/www-servers/tomcat/tomcat-5.5.27-r1.ebuild index bbbe96468831..0d27b6039f60 100644 --- a/www-servers/tomcat/tomcat-5.5.27-r1.ebuild +++ b/www-servers/tomcat/tomcat-5.5.27-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27-r1.ebuild,v 1.2 2008/09/17 20:32:34 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27-r1.ebuild,v 1.3 2008/09/17 21:05:25 betelgeuse Exp $ EAPI=1 JAVA_PKG_IUSE="doc source" @@ -19,6 +19,7 @@ LICENSE="Apache-2.0" IUSE="admin java5 examples test" +SERVLET_API="~dev-java/tomcat-servlet-api-${PV}" RDEPEND="dev-java/eclipse-ecj:3.3 dev-java/ant-eclipse-ecj:3.3 dev-java/commons-beanutils:1.7 @@ -37,7 +38,7 @@ RDEPEND="dev-java/eclipse-ecj:3.3 =dev-java/junit-3* >=dev-java/log4j-1.2.9 >=dev-java/saxpath-1.0 - ~dev-java/tomcat-servlet-api-${PV} + ${SERVLET_API} dev-java/ant-core admin? ( dev-java/struts:1.2 ) dev-java/sun-javamail @@ -67,6 +68,12 @@ pkg_setup() { enewuser tomcat -1 -1 /dev/null tomcat java-pkg_filter-compiler ecj-3.1 ecj-3.2 + if use !java5 && built_with_use ${SERVLET_API} java5; + then + eerror "With USE=\"-java5\" ${SERVLET_API} must also" + eerror "be built without java5 support" + die "Rebuild ${SERVLET_API} without java5 support" + fi } src_unpack() { |