Override java.7.home property unconditionally. This was causing tomcat's javadoc generation to fail.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

5 files changed, 23 insertions, 18 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index a414203d8e85..59b82dad1907 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.362 2015/07/22 12:21:07 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.363 2015/07/22 13:03:26 monsieurp Exp $
+
+  22 Jul 2015; Patrice Clement <monsieurp@gentoo.org> tomcat-7.0.59-r1.ebuild,
+  tomcat-7.0.59-r2.ebuild, tomcat-7.0.59.ebuild:
+  Override java.7.home property unconditionally. This was causing tomcat's
+  javadoc generation to fail.
 
   22 Jul 2015; Patrice Clement <monsieurp@gentoo.org> tomcat-6.0.44-r0.ebuild,
   tomcat-7.0.59-r2.ebuild, tomcat-8.0.23-r2.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index b5d1f437d4fa..c6fde14f99db 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -14,22 +14,22 @@ DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
 EBUILD tomcat-6.0.44-r0.ebuild 4137 SHA256 c55f429410203107fd1b85fdfa2d72517c5b23b233dc032df7d13368a98d57c3 SHA512 653d3a0ecf574fd653c92cefcab59a02b8e14fd86e5230994c09b7c93d857e509cda7860973f67cc9f87ec92c81d8dd618ea6e3cf1d5cabcb90acf080ebcb142 WHIRLPOOL 57ef1a30138f194c3102ecb9c7ec0ee73fc7586a5145ebbe3b44d475a2aae912f67a1da9d6c994a6bc8daffb16c447ff7429baf96c517cf4e60fb9e1a25eb645
 EBUILD tomcat-6.0.44.ebuild 3981 SHA256 9c9c65233de3f8b3c67fd2284596ddf11ffa909c8ffdefd3fae6740d65e077a8 SHA512 895ff3b45dcef71f111842a36e40267e913ed5182a448fb2dd90584d318b8b4404adbe02225cc0fadf7c3b59ffd26ebb27a8a1bf67925eb18b054e2fed09d6d4 WHIRLPOOL 1f6a81f4f697234f5615f51105d24998b3f813bf4f325cff1e1ccea2283ebfdb0babe00bdfbd6568d8964709f9fda0a7d0d0cc76a91ea875a599087fa3a8d66e
-EBUILD tomcat-7.0.59-r1.ebuild 4322 SHA256 f9be909f3ef9a4e451fcd80ff93ecc85650b0cd60519f2534aa5bfd3e0b840d3 SHA512 3df119a2cc39ec494e71e943f6067f58bda0c0c06922cc1d0c219528b3cd59ba0060881d7cb2a07e3bbb02a2655afde0fbc3ed4e9a47b836cb7a1a14c8609741 WHIRLPOOL 1642c6cda43daea4f0a376344cb505457854907c144bc08c0a4d9438f44fef889efcaa145fcccb362fe52d104d9f89d0e80bd916f82d8dd88392537e7ecf6e97
-EBUILD tomcat-7.0.59-r2.ebuild 4462 SHA256 20b2fd39b3781c1efe72f8670e49438667451bf72c86e5917c22cd9fdc0b2dba SHA512 40d2c623a021e153efa46bf53993661174113bbd135f37473d4b26e2b967724f67a34228a17ff86c7cce447380a7eee1db795cb87e345db695e8e9f73c359d9c WHIRLPOOL bd85546584374618f397ed67ff2a5dbc28d2f285fc34f32a0cbafa9b891fbe6f71bb49deb8bef1993e5e59df2cafd5cdc58eaf5eeefde8892c764d556b04575f
-EBUILD tomcat-7.0.59.ebuild 4355 SHA256 d3bb85c86f500a7ee59a4e85d362d67d7741792dc0af6fa1e3ed694076e6a822 SHA512 2f7e2b7a33c87af7498c1b4c84a7c7e0af5fae4fe2edafdd7d6fb84f13f32bc4a2ea7b3334d1c7b423a91c60a5981df3b65cbedccaec140f7e47a904630e7bef WHIRLPOOL 953632ee7590be60c342a748dc3d92e8e7e22fa840057476b6f083497993c756240a93f7902104e175935d19b9d9251e7ed2b9adf7618930474ac4c2583e95f2
+EBUILD tomcat-7.0.59-r1.ebuild 4306 SHA256 a7dd95ce7b6c35363cf9097dfb5f28f4f562347e396b9ae1169ec0e5afa3c25f SHA512 be8762dbaa0ce6bc566c394d87efa074737a3922e249b462b9d4d6c92caa065c1264f9cad5e15fe7a20f0e2fabb298a710ebd9ae64847270ef1823d8441b7171 WHIRLPOOL 0575b329b1418f4328bd34b2fd2ac8770c5b3036d878d2a88083900507647b27683cb29c1036c4038f4782d36bb8a18da5e59cc5bc3321a4f14b2e2a35dfc844
+EBUILD tomcat-7.0.59-r2.ebuild 4446 SHA256 d0bd78752b8e511f3965b282e3a4885b374205593197fb237c1e353f149d6fea SHA512 9cf2cc20cde66f22fd32ce02c33b0628b1dde9347d280554c2b37d554aa02e6fe228235fd43a7a52e7ead125e6b9d4aa451122c74ace1eb081127d9faa6b559e WHIRLPOOL 012b3299c38c9c70a6f5ef3a099198bdc0d3f9a9cb0f5ebb853a7b01a0a474c343f804ef1a7a61eaeb0ddafb00efc490fc311b4d33498ebd58fd28d4d127cc28
+EBUILD tomcat-7.0.59.ebuild 4345 SHA256 11f5537efb984d4efe48e003ae205ac065f21ac9301f5c9fc8c48697e227a348 SHA512 70d5eb906de80e6bb6abe754116a1f648c7574b5f9aab1a4be16c101ae967767e799a95bd80f7b463e2dcde1750a4a7b4d8c1ca844b6f82cb027e7964f3cfe8e WHIRLPOOL 0837948d1a57a555207c1264fc9c140b1e35fb2503f9163403ace593cd5445e58e0a195bd863665a527a740dd712faea484f1dc8a6da60ceb18a3703a9a41828
 EBUILD tomcat-8.0.23-r1.ebuild 4153 SHA256 da6b77d97c1ce9c4358080edd1682ed86aa5e265acc7eecff30622cccd95d0f8 SHA512 083f04e9f936cdbb5ef9b591ecbce56423e5bf50c8e86aa26101b86cbcd0bb7dbc7da6f74c785c4cbb4038f12353f114f31e274ac6897ae9a9718646b0a7e8cf WHIRLPOOL 30206000dfca5c5522e4bb0f8da5a2b3edb94734766eae25580e34c6ed9efd6b78cf8d3bbd633315785d2d7c4500e9a73c480f8a75f0a6e7de4f994a420b9cfb
 EBUILD tomcat-8.0.23-r2.ebuild 4280 SHA256 c4230f6246868d439b0cf50545592a1ba4210157852bfebf74497529e3424331 SHA512 4d94bab2f704ad6fa639a3cc06318dc23b6f1c8412195609d9fc03b1a1eafc851399f1ab23149a21ab5a81a7ef47f1e21bbe9c2b45d413cb409548ad7fe9e105 WHIRLPOOL 4b90527be5ba37117e618273a292f3634c0d32d512321242d42c8143709513ea48e1f969671ec2c004e6e4ce7016672c185f98516b9f1f3ff0c556cc4231031b
 EBUILD tomcat-8.0.23.ebuild 4195 SHA256 a3d63d0ac2e032f06f87e8be7c6dd6205e25ff090d26e2a4545b13c15027678c SHA512 632113159f1bcf2ec364ce4d4d5774316fcfeaab1f52101ea1298e7aecf5551b62cb291488f594edb6b2b040b60eb3856f421cc3f45fac4cea88b94e5af141dd WHIRLPOOL 29aaa1db8b67f239c4b271a7d277b22179a6ca4dd3490c6af51ba8585a3e4c862236d6250c3a9244861755f47668b4caf96bd7423ee8b96b1c91e5e8532b2c95
-MISC ChangeLog 85638 SHA256 e093a6541f2eec79ac03295cf1994ed8b8c34fb2f0d25c171ea5a8504558ef61 SHA512 31d4578f62526cd96a481ce9f9c847ab4edc3624d0c3df81ad63cb776be528f3caf557f9dda82c8ab84377ea43a73dbcf3964a4f349352654c4b4e7939309a96 WHIRLPOOL bbca1d4ecd84acc5be7305a3762b14fff56e50471cbb93725b673d9a71ea48fab72d2a7ad380a6b5a08b9638cd93a015052a503ab082a0a8cd162ab47e224dfe
+MISC ChangeLog 85872 SHA256 6fde8ae9433a754af4af3572f8703baae33ecde54fdecdfcfc633aff28980786 SHA512 e53c5e46b4e3b9e87ffdfe82d18697ab9f656e4cdbef4786fecf93306b5943028573567b1005cd1b8d2707cb56a7e13a4997108361889283ec2a283921591b88 WHIRLPOOL cb7232da47a238f819f15f15c4d75fad3c50301aba3cd9427a1f0848139f98f4059657716c5a2a3b792c49d373812a2e756d6bb818860a39db968dfdf1c57ae1
 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVr5j+AAoJEJGRpfGTSRu4ShwH/inyC/T5lWwjBgL5a8g6H/kb
-Rcdx2DYgDPJQVvl2BgzBWMajTQ7mQifpwLrxvkM70Tf0RT565oMYjpk23yn5Vmtn
-CkfxmN2T5s0dKCZJDYdHXJXQfedyWlQF2s1NtC6MkQWR4z+Z4+idKButmLpPzrJK
-b9bXJahzC4ycE1uqn+BNWE0l4k9qmB3MHofp/9a5tuoZHDTQ9usHDmbZtfVI5Vbo
-LQk3uABPg/1pXJVBx4GmjQmScJFAkAvJVcn5Y0Am/WMFYBcio4M/45s6NcbLTVFE
-gRmlMchcohbHsgVxQrm0xJZfnjeQH3WrGrXTo7AvHXZPbSqrFaFTFNnGFM5sEWI=
-=R//g
+iQEcBAEBCAAGBQJVr6LvAAoJEJGRpfGTSRu4y+kIAMHX5eV7l3iOk1zqYVp4v9Tn
+4CkPrygIEdzF3pA/AE2wP9Q7UaaQ9Pbrt10L3SDFcByci33AGq9Gl8LowlgFOKde
+8Lj1NlDV34187Kh8/P926+3ZMHdEGIsjhykUkcl4PVUGeglFTkE9G9qdKQ+kR0fa
+HgUHdMvlC7ElwO/EVihEn6PAKgYKbpFfNbzdqUCoWaiMA6sql8RZyq2hP23d3/t5
+02VkivZ98YCWC92aji8OuFHouruiBf4BX8OrCFghfFJSP2UBW6jFn1bTQu5FtOrl
+8xqr079iG4z3YJWRGl/DdvYqrKsFUpqPKD2W3CyqgD0tWsZbn3gHpzMN7pUl4rk=
+=OBlY
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-7.0.59-r1.ebuild b/www-servers/tomcat/tomcat-7.0.59-r1.ebuild
index 13a69a09a1ee..30c2afa0326b 100644
--- a/www-servers/tomcat/tomcat-7.0.59-r1.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.59-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r1.ebuild,v 1.1 2015/06/09 09:24:32 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r1.ebuild,v 1.2 2015/07/22 13:03:26 monsieurp Exp $
 
 EAPI=5
 
@@ -69,7 +69,7 @@ EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=f
 IM_REV="-r1"
 
 src_compile() {
-	use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
+	EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
 	java-pkg-2_src_compile
 }
diff --git a/www-servers/tomcat/tomcat-7.0.59-r2.ebuild b/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
index ea658fdbfd6d..f77687b2e550 100644
--- a/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild,v 1.2 2015/07/22 12:21:07 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild,v 1.3 2015/07/22 13:03:26 monsieurp Exp $
 
 EAPI=5
 
@@ -69,7 +69,7 @@ EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=f
 IM_REV="-r1"
 
 src_compile() {
-	use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
+	EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
 	java-pkg-2_src_compile
 }
diff --git a/www-servers/tomcat/tomcat-7.0.59.ebuild b/www-servers/tomcat/tomcat-7.0.59.ebuild
index 50118509a475..4d4941114a47 100644
--- a/www-servers/tomcat/tomcat-7.0.59.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.59.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v 1.6 2015/06/15 08:27:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v 1.7 2015/07/22 13:03:26 monsieurp Exp $
 
 EAPI=5
 
@@ -71,7 +71,7 @@ EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=f
 IM_REV="-r1"
 
 src_compile() {
-	use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
+	EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
 	java-pkg-2_src_compile
 }