Use new websocket use flag (requires java7) to build websocket as it won't work on java < 7.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

4 files changed, 26 insertions, 17 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 5747d49095a5..0a32d93a0f20 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.331 2014/11/11 18:21:05 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.332 2014/11/11 18:40:52 ercpe Exp $
+
+  11 Nov 2014; Johann Schmitz <ercpe@gentoo.org> metadata.xml,
+  tomcat-7.0.56.ebuild:
+  Use new websocket use flag (requires java7) to build websocket as it won't
+  work on java < 7.
 
   11 Nov 2014; Johann Schmitz <ercpe@gentoo.org>
   files/tomcat-7.0.56-build.xml.patch, tomcat-7.0.56.ebuild:
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 3b4f7eeaa46a..e4541fedc99c 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -25,17 +25,17 @@ EBUILD tomcat-6.0.41.ebuild 4106 SHA256 35232da099632e8be06a2c4c21c2aeeef048319b
 EBUILD tomcat-7.0.42.ebuild 4036 SHA256 c717c7d67b0ba3931c848057980a10a7897db8d6b5e1ea975f3daef321546290 SHA512 55ddd1823146d6cce2e19ed71bdd36cc778f276c01eb699147744fef0378f4ac1f6c2e357b823274d0ac42887af4f83c832306ffa09e2740ccd1f97589251669 WHIRLPOOL b6d7ee5c22d8e89903ca0f6b99ecf78c72eccb6a788f36d37c672edef9f0d3c92f585a02877653b3ca2b8dcb6fb606f76f26466d852e955e3ec4aaa621e1a378
 EBUILD tomcat-7.0.47.ebuild 4047 SHA256 fd45a575e61eada7d36e7b6f4b93435d4684093efe1d8fe7e5871bcd300bc1c2 SHA512 0ac833f9e80b6fea175c4894df53ffeb1c2930e54dbfdb506e86e3b28ec36698d1d3d907fe11d97c71b70ceb36a4ccd236851519e1e0834bde9c3dffe95350f0 WHIRLPOOL 6d5184b23115b7d2d89621aa72eca2e411d5e8362179ef0fea8ac702acf986142ea5a0361d6f7fad6b8b51848fa5edd165a48726e08d487eea92a43062d21ccf
 EBUILD tomcat-7.0.52.ebuild 4047 SHA256 21a962b9afb1f8b3e0a0d5564de05a5b79d9b8de885493ffb2304fb84833f02d SHA512 326b2fb72ac1133c21e5d4267b6aaba3d5819df1c4f513c48f8009c1dee8d7c251c9d476feac08b743b80d664a6439868f5f98c9380b861781d6f5cbcf4d0173 WHIRLPOOL c5d8079a8e5b4c49b726313ec08fe003e9e38a18fe2502efe25d8f37410cdef4b0d9f56c67b7fda84c2751e1bbc0b24536bc36c800fb5b16a0c84c5b03c67761
-EBUILD tomcat-7.0.56.ebuild 4221 SHA256 74d60208e3b0772ccb5828a93103039dd66d998db35f79673061bed174bc46f3 SHA512 4fab3938983add7a241dcd2d9a75ecd9256d34d58ec0136788e1c67c6efb257fee10c29702e6e2a8bfef4f6d83fa8b27dfa7337c23bb2eb73f709515766fea90 WHIRLPOOL a9548894e8bd517fe1e5208a622c765e8ec5df8052984a85ec6f72cd2777258c6b2e1611c4635d37b0cbdd056772eb12f49e5e94e1aa6a0643d558bf7d946f24
-MISC ChangeLog 79159 SHA256 56f3636c0154c667c9fc57a60beab275dc97b3fbcea1a51783d878eacda76330 SHA512 35ff7f87cb644067f196477b6757943252f80637d001931920fe00356733be17c46d7cd49a8522e377fa95cd05c65a6e7276cdce7553c760c40ef8d58daf18ee WHIRLPOOL fa70980340c5465f1fdd280a1f9eb46ef32a180d53d4d03a6d627bd106b967c25dfc17bfac9b34cff04d2715f7caac557e029c44ada07cdbb5c8928c60376102
-MISC metadata.xml 561 SHA256 a53b91aa1c4371952ed465d0b570fde6eebd1a621804990aa3d2c31f3a8cecab SHA512 354849871d8ff7e9d3bba1bd412f78789693518f1f9804aac412b64e9e86622fb86080b8290bbe16424c760b3601e96824cb3f0b956edbc2245dfa5be299c8c5 WHIRLPOOL f740fcc281807c913934662fcff48a023d42065ec0b50564d4a12ff970ce09447cac0a71016a33ff4896a596dcd86cd9372b4a12286fb0bf46bb01bb6bd2c7e1
+EBUILD tomcat-7.0.56.ebuild 4371 SHA256 60db4c0368622482325fb50740a28008c100cced858c532bdacb6c64ee387c87 SHA512 d795da58b5d7e9d0358506c8993421254ff995647c9cdb8617e3417d651cb5f3a58b745d286d4c2668526c7d7eea45d7159971b26b10978e56e4942ccdc821fa WHIRLPOOL d96123f86799fafeb2343d4fe8fb6155807259fb5bd8f925a68dc0ac856f9866c83aa4dc4b3bf745f768362caa07caa77e35d0c89eff87b0875dd0e1a693e671
+MISC ChangeLog 79344 SHA256 824a19c1a0a4863f20f2c2b8d1a24772fdaa84406b7964b700e8433e6ba9154a SHA512 ad00c0348aedecdd4d336528ca6af90670783552c51d883b98751838f3926835e091ddb1c909db098a136f65cf1c84c37bdd05128ceccb567bf34eba169b6e87 WHIRLPOOL dae2906c02529f19bddc940d3815103dc9ce3104795eb76b41d69ca632b6fdc5a6b28e32d972eefd31073305b58fe834b27c0e0f2fa1e9b8e0ebf24d36490768
+MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUYlOYAAoJEKCEBkJ3xQHt7TsIAJEksbe1ugtoqZppOebGQ0gF
-zt4gR7wdE2auCEYskHH/k7lJ+9kZyuSJOhE0QBpfmQp4sT3KLpEaacq/F1BBi7jP
-qEno79G+0mKLvqrT9QpVsZtX6VNaqt+84tQknHAnCQ0EFSh7B1w9HtlwLni/DF0+
-h8iTe9KuoQyAdK4qNIx6YPioXnvFcWQ2UgyBdZ4cWJBruu40wdwIwbsdFHVYUPpY
-wNrzQc9R6q5n692RcILcphPG9+tK0Q07ybLFD3MgigeWStsuAdy+uYLwCaPy+UtG
-XxwxFdxk/XkEl66T0pcbAaIEE8O1H1fjXBCZE/az3zEjE02yqX6GD7ouWTI+CLc=
-=k8gT
+iQEcBAEBCAAGBQJUYlg6AAoJEKCEBkJ3xQHtaEMIAJj8lfKP0Q5TNvBslroqFjY6
+Hbi9weJUevX3DRp04usZei3uI/pBpeo7cBmlBcbgQjgZikKFVDg2lVUiQpH10ITy
+v3Zi10rbJNcI+JBVbdUSYersXT0xNsA3+Svll9S7QkSwzMckWI9+AzjrsLz8JU3p
+UPaX+5CfT/MuRm/2MGTfyDjsV1w8vZShEQHxPzD0v3+fJdgKwCJCkdYTFWqwQ+Zu
+JTJZpV1zOCMW3NkaM1NVFAh2MwiRjWhXNQZMIKTC+6Owv9RbsiOXhqnqLhfoW68M
+YfBa8ZVFavIPP/kZ44WRzYH6t0FgcICABpaysL6uRLHJVMPUKp/5fvea2o9UyEs=
+=dowd
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/metadata.xml b/www-servers/tomcat/metadata.xml
index f957b79d7d7b..6f8636c1d0e5 100644
--- a/www-servers/tomcat/metadata.xml
+++ b/www-servers/tomcat/metadata.xml
@@ -10,5 +10,6 @@
   </longdescription>
   <use>
     <flag name='extra-webapps'>Build also the docs and examples webapp</flag>
+	<flag name="websockets">Builds websockets api and implementation (requires java 7)</flag>
   </use>
 </pkgmetadata>
diff --git a/www-servers/tomcat/tomcat-7.0.56.ebuild b/www-servers/tomcat/tomcat-7.0.56.ebuild
index 2a1472b6067a..343bc76f3265 100644
--- a/www-servers/tomcat/tomcat-7.0.56.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.2 2014/11/11 18:21:05 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.3 2014/11/11 18:40:52 ercpe Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="7"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
+IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?
 
@@ -30,9 +30,11 @@ COMMON_DEP="
 	extra-webapps? ( dev-java/jakarta-jstl:0 )"
 RDEPEND="${COMMON_DEP}
 	!<dev-java/tomcat-native-1.1.24
-	>=virtual/jre-1.6"
+	websockets? ( >=virtual/jre-1.6 )
+	!websockets? ( >=virtual/jre-1.6 )"
 DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.6
+	websockets? ( >=virtual/jdk-1.6 )
+	!websockets? ( >=virtual/jdk-1.6 )
 	>=dev-java/ant-core-1.8.1:0
 	test? (
 		dev-java/ant-junit:0
@@ -49,7 +51,7 @@ pkg_setup() {
 
 java_prepare() {
 	find -type f -name '*.jar' -exec rm -frv {} + || die
-	epatch "${FILESDIR}/${P}-2-build.xml.patch"
+	epatch "${FILESDIR}/${P}-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
@@ -63,12 +65,13 @@ EANT_BUILD_TARGET="deploy"
 EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
 EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Djava.7.home=${JAVA_HOME}"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
 
 # revision of the instance-manager script
 IM_REV="-r1"
 
 src_compile() {
+	use websockets && 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
 }