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 B7EBE138330 for ; Tue, 6 Sep 2016 17:23:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3DD421C06D; Tue, 6 Sep 2016 17:23:17 +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 40D4121C06A for ; Tue, 6 Sep 2016 17:23:17 +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 15C313408EC for ; Tue, 6 Sep 2016 17:23:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53B9D2471 for ; Tue, 6 Sep 2016 17:23:14 +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: <1473182554.3de55fc614b7eb6aa2edebb09e059cbc0a0ab1e2.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/tomcat/Manifest www-servers/tomcat/files/tomcat-8.0.37-build.xml.patch www-servers/tomcat/files/tomcat-8.5.5-build.xml.patch www-servers/tomcat/files/tomcat-9.0.0_alpha10-build.xml.patch www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch www-servers/tomcat/tomcat-8.0.37.ebuild www-servers/tomcat/tomcat-8.5.5.ebuild www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild X-VCS-Directories: www-servers/tomcat/files/ www-servers/tomcat/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 3de55fc614b7eb6aa2edebb09e059cbc0a0ab1e2 X-VCS-Branch: master Date: Tue, 6 Sep 2016 17:23:14 +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: 9e6243ef-5ad8-4142-ad88-ecdabb812cb2 X-Archives-Hash: 1f1e7f2874692fb3eeb3f8468f703078 commit: 3de55fc614b7eb6aa2edebb09e059cbc0a0ab1e2 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Sep 6 17:21:41 2016 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Sep 6 17:22:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de55fc6 www-servers/tomcat: bump for main versions 8.0, 8.5 and 9.0 Package-Manager: portage-2.3.0 www-servers/tomcat/Manifest | 4 +- ...ild.xml.patch => tomcat-8.0.37-build.xml.patch} | 65 ++++++++++++---------- ...uild.xml.patch => tomcat-8.5.5-build.xml.patch} | 56 +++++++++---------- ....patch => tomcat-9.0.0_alpha10-build.xml.patch} | 0 ...at-9.0.0_alpha9.ebuild => tomcat-8.0.37.ebuild} | 17 +++--- ...cat-9.0.0_alpha9.ebuild => tomcat-8.5.5.ebuild} | 17 +++--- ...0_alpha9.ebuild => tomcat-9.0.0_alpha10.ebuild} | 0 7 files changed, 84 insertions(+), 75 deletions(-) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index be4796c..05e8497 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -6,6 +6,8 @@ DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2 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 DIST apache-tomcat-8.0.36-src.tar.gz 4988679 SHA256 36db67592adda575fc08dd5f0cd3532934d2edb117028e29bdd9f702bf31ab10 SHA512 192a31eb42afdc345fa5ea5f05b03766e70a67841fca9bd9c76bcd47ae1d505fd3cd1fde6bc64e145add2b6a9e88ecc50ab1a0954942704c139ec3c7a6bf7286 WHIRLPOOL da1bb6570d62caedfe83948f2e850ec7e8bdba36925d1f000067864c98b1bd780aabf2f1cbcb66cb544db292156a98819e9cc6dfa42a345064f09dcc4471a7c3 +DIST apache-tomcat-8.0.37-src.tar.gz 5003508 SHA256 72bfdfeed09f535990d234429ed7b3f1856ee3d0b89168472a40256cc8efcf1d SHA512 cb4da5cf8a056a2a5549914fb405ec66867021da90877415f399b2f4aeb62b776d6d4b1ed176ab53070f7de2525bcde549919f7cbddb2e89945092ae95f914f6 WHIRLPOOL 90218e0b7ab01973ed321ea6bd25f28bfde0534cbe9537d3e931a8ed9ad5eba9592245ff018ddfe241c7ddcc7bd9370b111c3082048f800a5653bb1270fc4ec7 DIST apache-tomcat-8.5.3-src.tar.gz 5001008 SHA256 d0d1ecfd88d733cf3666cc39483ea092627840cd2cfab8fae09f93b7bf05d21d SHA512 7c4da46725c6e34669f538f406e699c235b99b4ec47a289f4fcbf93b49a35082cea3e041bee8a2772a29c240521d8720b2b50b5cda7afe0ec0f2b4f5cb29bda5 WHIRLPOOL 2ad999e8ee068d66164e2a256ee58f47799251fab60cf9af3a67128b131a07116a2faf2da6eef132e13f5df6ed78f1c44ac69bf5615178b63452fbffc62a4852 DIST apache-tomcat-8.5.4-src.tar.gz 5000058 SHA256 bb35d2b37e2ff237e09e389dbfb0a99fa8a71f11c947c20f5bbea375f6f3449d SHA512 65d4d72eb46d75d6985f07c6d630d0b27cafb08f3cf125710b78d29d5737798341d484b1f12ae5cfc7347f9984563213b00a5aaab64f920f65f13a3d6009083d WHIRLPOOL bef3192957e91e4964d84f969961c32a61e4a4b5c8acdfcf56c6f6a87c6f3f4dd4350d099fd9904e07e9e1ba8369fa4e86c54a8e25c26a7c0b6a3518aacd9582 -DIST apache-tomcat-9.0.0.M9-src.tar.gz 5024180 SHA256 aa7e3bc52be5f94ed01c3ecbfe2663452152c996f0104d755cd339a15beb99d4 SHA512 66484a58b97dd5511e6ff3a56db4d290ab7c0dd0c8f661f85b8166905072ac6d5bb6c410aa170457fe09c967175eb881f044421dc75a9561e4609094c6aa0116 WHIRLPOOL 497bdb5dca49f138d4f905ea35a364f07ec5de851096f4b6aa5919bd4f2802ed015d8a762131631bb787434cb63d1ca1047411afba97ad6c55b677873ff241f2 +DIST apache-tomcat-8.5.5-src.tar.gz 5017061 SHA256 28c50366e0b8f16086ab792fbe4c3dba5a716185d0c8c143661b7fed870147c0 SHA512 37b390fe12a356e9621b047d7838027bc33d3c32cb1489957589399f5557e9cf0c788a8a623821e69969983321f233518604629233337355ef7c918ae364f586 WHIRLPOOL b6f79e2acf88aa0980e3726131805b8f5098d887a978ba7d8fb028e261f8ba0fea4da6fafc2f1f4129ff5313011519f7a6cfa827da7bd6778e4ed666ba21a716 +DIST apache-tomcat-9.0.0.M10-src.tar.gz 5046851 SHA256 d1cd106ed13facdc34b7b9416d381df9cd59b49a574585d1afd44ed779a3fe4e SHA512 925ea178448c2d26ec22a70b08ac3e9c55f02a6989759a77eace46abcb4c41ed006253d85253f744ac3b9ac4763babc6ed3f06d53a34e27dd901fef3f5445843 WHIRLPOOL 2f19c21d27767cdcfcfbd2705356d3f6a40918ebe8016bfe6ed268ee36816cbe016f8643d3c55f0d22531754e92a8e1fd17112e2d378f1c17b31b8175442cf2d diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.37-build.xml.patch similarity index 83% copy from www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch copy to www-servers/tomcat/files/tomcat-8.0.37-build.xml.patch index 3c4e5c2..cefd59f 100644 --- a/www-servers/tomcat/files/tomcat-9.0.0_alpha9-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-8.0.37-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.0.36-src/build.xml b/apache-tomcat-8.0.36-src/build.xml +index 1ba0dae..81a0a2c 100644 +--- a/apache-tomcat-8.0.36-src/build.xml ++++ b/apache-tomcat-8.0.36-src/build.xml +@@ -701,24 +701,29 @@ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - + + - + @@ -50,7 +50,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -1053,7 +1059,7 @@ +@@ -1053,7 +1058,7 @@ @@ -59,7 +59,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -1087,7 +1093,7 @@ +@@ -1087,7 +1092,7 @@ @@ -68,7 +68,7 @@ index dfec1f7..4dfc5d8 100644 @@ -77,7 +77,7 @@ index dfec1f7..4dfc5d8 100644 @@ -90,7 +90,16 @@ index dfec1f7..4dfc5d8 100644 -@@ -1583,7 +1590,7 @@ +@@ -1594,7 +1600,7 @@ + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -1733,7 +1739,7 @@ -@@ -1731,6 +1738,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1928,6 +1934,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. @@ -107,7 +116,7 @@ index dfec1f7..4dfc5d8 100644 @@ -115,7 +124,7 @@ index dfec1f7..4dfc5d8 100644 @@ -127,7 +136,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2578,7 +2589,7 @@ skip.installer property in build.properties" /> +@@ -2757,7 +2767,7 @@ skip.installer property in build.properties" /> -@@ -2612,7 +2623,7 @@ skip.installer property in build.properties" /> +@@ -2791,7 +2801,7 @@ skip.installer property in build.properties" /> -@@ -2669,7 +2680,7 @@ skip.installer property in build.properties" /> +@@ -2848,7 +2858,7 @@ skip.installer property in build.properties" /> -@@ -2695,18 +2706,18 @@ skip.installer property in build.properties" /> +@@ -2874,18 +2884,18 @@ skip.installer property in build.properties" /> @@ -176,7 +185,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2718,7 +2729,7 @@ skip.installer property in build.properties" /> +@@ -2897,7 +2907,7 @@ skip.installer property in build.properties" /> @@ -185,7 +194,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2737,7 +2748,7 @@ skip.installer property in build.properties" /> +@@ -2916,7 +2926,7 @@ skip.installer property in build.properties" /> @@ -194,7 +203,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2748,7 +2759,7 @@ skip.installer property in build.properties" /> +@@ -2927,7 +2937,7 @@ skip.installer property in build.properties" /> @@ -203,7 +212,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" /> +@@ -2945,7 +2955,7 @@ skip.installer property in build.properties" /> @@ -212,7 +221,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2776,7 +2787,7 @@ skip.installer property in build.properties" /> +@@ -2955,7 +2965,7 @@ skip.installer property in build.properties" /> @@ -221,7 +230,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2799,7 +2810,7 @@ skip.installer property in build.properties" /> +@@ -2978,7 +2988,7 @@ skip.installer property in build.properties" /> @@ -230,7 +239,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2810,7 +2821,7 @@ skip.installer property in build.properties" /> +@@ -2989,7 +2999,7 @@ skip.installer property in build.properties" /> @@ -239,7 +248,7 @@ index dfec1f7..4dfc5d8 100644 -@@ -2821,7 +2832,7 @@ skip.installer property in build.properties" /> +@@ -3000,7 +3010,7 @@ skip.installer property in build.properties" /> - + + - + @@ -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" 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 diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild b/www-servers/tomcat/tomcat-8.5.5.ebuild similarity index 92% copy from www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild copy to www-servers/tomcat/tomcat-8.5.5.ebuild index 76dbdc9..b0508e4 100644 --- a/www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild +++ b/www-servers/tomcat/tomcat-8.5.5.ebuild @@ -8,31 +8,30 @@ 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 diff --git a/www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild b/www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild similarity index 100% rename from www-servers/tomcat/tomcat-9.0.0_alpha9.ebuild rename to www-servers/tomcat/tomcat-9.0.0_alpha10.ebuild