From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6466A1395E2 for ; Fri, 9 Dec 2016 14:53:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECED6E0B45; Fri, 9 Dec 2016 14:53:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB30DE0B45 for ; Fri, 9 Dec 2016 14:53:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 29434341422 for ; Fri, 9 Dec 2016 14:53:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAAEC24B0 for ; Fri, 9 Dec 2016 14:53:19 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1481295182.6cecf79f7570186cae13fb748a36d820a05f81aa.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/tomcat/Manifest www-servers/tomcat/files/tomcat-7.0.73-build.xml.patch www-servers/tomcat/files/tomcat-8.5.9-build.xml.patch www-servers/tomcat/files/tomcat-9.0.0_alpha13-build.xml.patch www-servers/tomcat/files/tomcat-9.0.0_alpha15-build.xml.patch www-servers/tomcat/tomcat-7.0.73.ebuild www-servers/tomcat/tomcat-8.5.9.ebuild www-servers/tomcat/tomcat-9.0.0_alpha13.ebuild www-servers/tomcat/tomcat-9.0.0_alpha15.ebuild X-VCS-Directories: www-servers/tomcat/ www-servers/tomcat/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 6cecf79f7570186cae13fb748a36d820a05f81aa X-VCS-Branch: master Date: Fri, 9 Dec 2016 14:53:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6db6020c-0b04-4ac7-bc0d-670ee99e8ee8 X-Archives-Hash: c1105d3e8bb6c6b8f0baf0ea95be3796 commit: 6cecf79f7570186cae13fb748a36d820a05f81aa Author: Miroslav Šulc gentoo org> AuthorDate: Fri Dec 9 14:52:20 2016 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Dec 9 14:53:02 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cecf79f www-servers/tomcat: version bumps for version 7.0, 8.5 and 9.0 Package-Manager: portage-2.3.3 www-servers/tomcat/Manifest | 4 +- .../tomcat/files/tomcat-7.0.73-build.xml.patch | 149 +++++++++++++++++++++ ...uild.xml.patch => tomcat-8.5.9-build.xml.patch} | 56 ++++---- ....patch => tomcat-9.0.0_alpha15-build.xml.patch} | 0 ...t-9.0.0_alpha13.ebuild => tomcat-7.0.73.ebuild} | 54 ++++---- ...at-9.0.0_alpha13.ebuild => tomcat-8.5.9.ebuild} | 25 ++-- ..._alpha13.ebuild => tomcat-9.0.0_alpha15.ebuild} | 8 +- 7 files changed, 224 insertions(+), 72 deletions(-) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index c44a3fe..28bc50a 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -2,6 +2,7 @@ DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639 DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256 abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512 dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c WHIRLPOOL 594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05 DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568ef4fde91debfd22f50a8d7d1676c018cf330b SHA512 14025071497dd3d1b601958297dcce5f4e4d2ec192ece3484fcdedfe0ca8d5e9a37941e8db857e90716c73484a2415c0aadc9334a292d8a15b5181dda23b05ce WHIRLPOOL 1713fdfcffcc454d9b04cdd108b14cb49daf790f60a607fba22d828183f3f8c1c53d99a225da838d9cadbf5890d81789f0d1c5636ef30afb4e721d1bec4e9667 DIST apache-tomcat-7.0.70-src.tar.gz 4661050 SHA256 c15b193a2f3ed22d460fa135dd8719381bdddde0e59eb359c50d5a9c61868251 SHA512 e7a6108d2c5c5e66ac9c8c55493445d6d8eaf9a3949006e0f3f445d8dbae5a1e8a0e99106545a9048434968c945616377f63af5351765ce340e2df35eb5f1ef1 WHIRLPOOL 42ddd71b768f205a981e50ed6daa5b7c0d2342f7bae901f996695224a749bae1973c2859988e6db24d7692f66b868ae2632976983655bde3fdec5efd3cf5126d +DIST apache-tomcat-7.0.73-src.tar.gz 4674971 SHA256 e3e236fb551ae9deb85024d8472fd08a76b14380e3ddaa2a1aff1fc670de5d87 SHA512 4754628c271d0aed3572ac0961c47653c10fcdfd0d13d8d1bc1b5774e961e6327cbb6b11b0e7e2f8eff525e2e60f741da49aeb855bb9d94e84cc87f346cf9ce6 WHIRLPOOL b9e75f53e41f1e9b9767fe8bc603ee5b7db2d3b1b7d2d900d430f4c0b73881a7ad36e0a0bfce773432b73ea8743865e933363ceec037d11d8f1008d8619ac1f1 DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727 DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966 @@ -14,4 +15,5 @@ DIST apache-tomcat-8.5.4-src.tar.gz 5000058 SHA256 bb35d2b37e2ff237e09e389dbfb0a DIST apache-tomcat-8.5.5-src.tar.gz 5017061 SHA256 28c50366e0b8f16086ab792fbe4c3dba5a716185d0c8c143661b7fed870147c0 SHA512 37b390fe12a356e9621b047d7838027bc33d3c32cb1489957589399f5557e9cf0c788a8a623821e69969983321f233518604629233337355ef7c918ae364f586 WHIRLPOOL b6f79e2acf88aa0980e3726131805b8f5098d887a978ba7d8fb028e261f8ba0fea4da6fafc2f1f4129ff5313011519f7a6cfa827da7bd6778e4ed666ba21a716 DIST apache-tomcat-8.5.6-src.tar.gz 5028904 SHA256 7690e985544f30bd9cfdec2d0b1088f9cd2f2fbd1575116cb92c79cfed863fc6 SHA512 3b9d3b6edf4f3832891207d38d9f4a5aed9aa53fad895fccce2f6311d197aa1e0877052ad5fc8239b53cc671e373c8ae3c6d284a8b17bb15bf427bda7111a508 WHIRLPOOL a74bfc20efa0a44433205c514124496d17289f109e7b2cd2ad90f7556c8e4dc235531137f7dfc22085f46f9ed7d026d4e5d8ebd42101c4815acb631008849eb6 DIST apache-tomcat-8.5.8-src.tar.gz 5051497 SHA256 ee58ee69d536d7a8f748ed7b334eb2161d3d75664f0c87178b12fe5eebbbe45f SHA512 b10ef601d5abb1ce9cd50eec25cbec33d1a11da82df7cbcb7b152c5fdd36a36b95b2e8819421ae0145b2c2a6be662a774e2ee672b6540f9962285a436ffa84b7 WHIRLPOOL 21040a1c309ed96487fbc7e81a01e15d689c2d41229d3d72cc0a80753413b64ec8cf2aeab8783758d603d87ada3e0a1a4b7825eb282ececf576dea63dbb34fda -DIST apache-tomcat-9.0.0.M13-src.tar.gz 5065756 SHA256 9297bc76cd8f5b3d1bb7d154257ced77580b09db18a14fd29ab1659eb0663580 SHA512 dafb6fba3faca905cd082076ba6d2f270b51627d63ba241cffecba5027c15d3045c8090102f2fbb3d6dba7ee11a082d448b118dafc80457117ad3d4af0748ace WHIRLPOOL 4542761ed7d8283cac11efaef321e390399ed5cb79b63a61e1255b52e9bf69c0f9117552a8b171443d33c40c6ddcf2eccbcc2c2f0961c89cf8aedda3134d07c4 +DIST apache-tomcat-8.5.9-src.tar.gz 5059352 SHA256 65b4ed45950263cb4e4ca82a9b469943053eb85656a7568d6e0eb446ab34afe5 SHA512 85534e88467b298dfbf6d3ec274592da4e73c34ee3f8e84582f95aa7f69959b47076a7fd9e31c705b12e914fefad53ffc954a09c7d7f3da0203752033e70bf17 WHIRLPOOL 0dbcbc1bc0c9fdb8ca50dc7d630dc86d92c606a0e554e6fd8f68c1d34682e2581d4b730198161f75e64340c857f251244237ae0dcbc406caa90585236b5d69df +DIST apache-tomcat-9.0.0.M15-src.tar.gz 5075694 SHA256 c8101177073c2a4aa63cf04ef58226a2768b1cfacb14861d74966881a2791251 SHA512 76d68ebe49f8d5f3c1dcfc629b901453eda58410d071db1e5c1e339fb6aeda54d1402f00a4056e368ea8495841d462d46d4d62dbedb52dc538dc587fdc4f3757 WHIRLPOOL c098ee812b84ca617b710a154a3505ef0c0fcc9616c69db0e6396e300e2b90a3ed684507e407aaab6efdccbb5ea109b8e3d203f09062d25df7479296a5dfe049 diff --git a/www-servers/tomcat/files/tomcat-7.0.73-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.73-build.xml.patch new file mode 100644 index 00000000..481591f --- /dev/null +++ b/www-servers/tomcat/files/tomcat-7.0.73-build.xml.patch @@ -0,0 +1,149 @@ +diff -Naur apache-tomcat-7.0.63-src.orig/build.xml apache-tomcat-7.0.63-src/build.xml +--- apache-tomcat-7.0.63-src.orig/build.xml 2015-06-30 09:15:44.000000000 +0100 ++++ apache-tomcat-7.0.63-src/build.xml 2015-08-22 21:13:12.453038827 +0100 +@@ -660,12 +660,14 @@ + + + ++ + + + +@@ -721,26 +723,32 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + ++ + + ++ + + ++ + + + + ++ + + + +@@ -1051,14 +1061,15 @@ + + + ++ + + +- ++ + + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -1886,6 +1897,7 @@ + description="Create the Tomcat javadoc" > + ++ + + + ++ + + + +@@ -2642,7 +2657,7 @@ + + + ++ description="Download (and build) components necessary to compile" unless="noget"> + + + +@@ -2699,7 +2714,7 @@ + + + ++ description="Download additional components for the tests" unless="noget"> + + + +@@ -2727,7 +2742,7 @@ + + + ++ description="Download additional components for a distribution" unless="noget"> + + + diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha13-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.9-build.xml.patch similarity index 86% copy from www-servers/tomcat/files/tomcat-9.0.0_alpha13-build.xml.patch copy to www-servers/tomcat/files/tomcat-8.5.9-build.xml.patch index 3c4e5c2..611c99d 100644 --- a/www-servers/tomcat/files/tomcat-9.0.0_alpha13-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-8.5.9-build.xml.patch @@ -1,11 +1,11 @@ -diff --git a/apache-tomcat-9.0.0.M8-src/build.xml b/apache-tomcat-9.0.0.M8-src/build.xml -index dfec1f7..4dfc5d8 100644 ---- a/apache-tomcat-9.0.0.M8-src/build.xml -+++ b/apache-tomcat-9.0.0.M8-src/build.xml -@@ -695,24 +695,30 @@ +diff --git a/apache-tomcat-8.5.4-src/build.xml b/apache-tomcat-8.5.4-src/build.xml +index 655e379..b973b7f 100644 +--- a/apache-tomcat-8.5.4-src/build.xml ++++ b/apache-tomcat-8.5.4-src/build.xml +@@ -691,24 +691,29 @@ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - + + - + @@ -50,7 +50,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -1053,7 +1059,7 @@ +@@ -1049,7 +1054,7 @@ @@ -59,7 +59,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -1087,7 +1093,7 @@ +@@ -1083,7 +1088,7 @@ @@ -68,7 +68,7 @@ index dfec1f7..4dfc5d8 100644 @@ -77,7 +77,7 @@ index dfec1f7..4dfc5d8 100644 @@ -90,7 +90,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -1583,7 +1590,7 @@ +@@ -1579,7 +1585,7 @@ -@@ -1731,6 +1738,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1727,6 +1733,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. @@ -107,7 +107,7 @@ index dfec1f7..4dfc5d8 100644 @@ -115,7 +115,7 @@ index dfec1f7..4dfc5d8 100644 @@ -127,7 +127,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2578,7 +2589,7 @@ skip.installer property in build.properties" /> +@@ -2574,7 +2584,7 @@ skip.installer property in build.properties" /> -@@ -2612,7 +2623,7 @@ skip.installer property in build.properties" /> +@@ -2608,7 +2618,7 @@ skip.installer property in build.properties" /> -@@ -2669,7 +2680,7 @@ skip.installer property in build.properties" /> +@@ -2665,7 +2675,7 @@ skip.installer property in build.properties" /> -@@ -2695,18 +2706,18 @@ skip.installer property in build.properties" /> +@@ -2691,18 +2701,18 @@ skip.installer property in build.properties" /> @@ -176,7 +176,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2718,7 +2729,7 @@ skip.installer property in build.properties" /> +@@ -2714,7 +2724,7 @@ skip.installer property in build.properties" /> @@ -185,7 +185,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2737,7 +2748,7 @@ skip.installer property in build.properties" /> +@@ -2733,7 +2743,7 @@ skip.installer property in build.properties" /> @@ -194,7 +194,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2748,7 +2759,7 @@ skip.installer property in build.properties" /> +@@ -2744,7 +2754,7 @@ skip.installer property in build.properties" /> @@ -203,7 +203,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" /> +@@ -2762,7 +2772,7 @@ skip.installer property in build.properties" /> @@ -212,7 +212,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2776,7 +2787,7 @@ skip.installer property in build.properties" /> +@@ -2772,7 +2782,7 @@ skip.installer property in build.properties" /> @@ -221,7 +221,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2799,7 +2810,7 @@ skip.installer property in build.properties" /> +@@ -2795,7 +2805,7 @@ skip.installer property in build.properties" /> @@ -230,7 +230,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2810,7 +2821,7 @@ skip.installer property in build.properties" /> +@@ -2806,7 +2816,7 @@ skip.installer property in build.properties" /> @@ -239,7 +239,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2821,7 +2832,7 @@ skip.installer property in build.properties" /> +@@ -2817,7 +2827,7 @@ skip.installer property in build.properties" /> =virtual/jre-1.7 ) + !websockets? ( >=virtual/jre-1.6 ) + !=virtual/jdk-1.7 ) + !websockets? ( >=virtual/jdk-1.6 ) + test? ( dev-java/ant-junit:0 )" S=${WORKDIR}/${MY_P} @@ -46,34 +43,38 @@ pkg_setup() { enewuser tomcat 265 -1 /dev/null tomcat } -java_prepare() { - find -name '*.jar' -type f -delete -print || die +src_prepare() { + default # Remove bundled servlet-api rm -rv java/javax/{el,servlet} || die + java-pkg_clean + epatch "${FILESDIR}/${P}-build.xml.patch" # For use of catalina.sh in netbeans sed -i -e "/^# ----- Execute The Requested Command/ a\ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ bin/catalina.sh || die + + java-pkg-2_src_prepare } JAVA_ANT_REWRITE_CLASSPATH="true" EANT_BUILD_TARGET="deploy" EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" EANT_NEEDS_TOOLS="true" EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" # revisions of the scripts -IM_REV="-r2" +IM_REV="-r1" INIT_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 } @@ -99,13 +100,6 @@ src_install() { ### Webapps ### - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - insinto "${dest}"/webapps doins -r output/build/webapps/{host-manager,manager,ROOT} use extra-webapps && doins -r output/build/webapps/{docs,examples} @@ -118,7 +112,7 @@ src_install() { fperms 0750 "${dest}"/logs # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" + local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die # prepend gentoo.classpath to common.loader, see #453212 diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha13.ebuild b/www-servers/tomcat/tomcat-8.5.9.ebuild similarity index 92% copy from www-servers/tomcat/tomcat-9.0.0_alpha13.ebuild copy to www-servers/tomcat/tomcat-8.5.9.ebuild index 76dbdc9..b7ce7e4 100644 --- a/www-servers/tomcat/tomcat-9.0.0_alpha13.ebuild +++ b/www-servers/tomcat/tomcat-8.5.9.ebuild @@ -2,37 +2,36 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 JAVA_PKG_IUSE="doc source test" inherit eutils java-pkg-2 java-ant-2 prefix user -MY_PV="${PV/_alpha/.M}" -MY_P="apache-${PN}-${MY_PV}-src" +MY_P="apache-${P}-src" -DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container" +DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz" +SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" -SLOT="9" +SLOT="8.5" KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? ECJ_SLOT="4.5" -SAPI_SLOT="4.0" +SAPI_SLOT="3.1" COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - =dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" + >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" RDEPEND="${COMMON_DEP} !=virtual/jre-1.8" + >=virtual/jre-1.7" DEPEND="${COMMON_DEP} app-admin/pwgen - >=virtual/jdk-1.8 + >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 @@ -46,7 +45,9 @@ pkg_setup() { enewuser tomcat 265 -1 /dev/null tomcat } -java_prepare() { +src_prepare() { + default + find -name '*.jar' -type f -delete -print || die # Remove bundled servlet-api @@ -58,6 +59,8 @@ java_prepare() { sed -i -e "/^# ----- Execute The Requested Command/ a\ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ bin/catalina.sh || die + + java-pkg-2_src_prepare } JAVA_ANT_REWRITE_CLASSPATH="true" diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha13.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha15.ebuild similarity index 98% rename from www-servers/tomcat/tomcat-9.0.0_alpha13.ebuild rename to www-servers/tomcat/tomcat-9.0.0_alpha15.ebuild index 76dbdc9..c22bad3 100644 --- a/www-servers/tomcat/tomcat-9.0.0_alpha13.ebuild +++ b/www-servers/tomcat/tomcat-9.0.0_alpha15.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 JAVA_PKG_IUSE="doc source test" @@ -46,7 +46,9 @@ pkg_setup() { enewuser tomcat 265 -1 /dev/null tomcat } -java_prepare() { +src_prepare() { + default + find -name '*.jar' -type f -delete -print || die # Remove bundled servlet-api @@ -58,6 +60,8 @@ java_prepare() { sed -i -e "/^# ----- Execute The Requested Command/ a\ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ bin/catalina.sh || die + + java-pkg-2_src_prepare } JAVA_ANT_REWRITE_CLASSPATH="true"