From 76cba73c47c8694e74377004634daca18f2d9c08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Apr 2018 01:05:40 +0100 Subject: gentoo resync : 14.04.2018 --- www-servers/tomcat/Manifest | 15 +- .../tomcat/files/tomcat-8.5.24-build.xml.patch | 247 --------------------- www-servers/tomcat/tomcat-8.5.24.ebuild | 158 ------------- www-servers/tomcat/tomcat-8.5.27.ebuild | 158 ------------- www-servers/tomcat/tomcat-8.5.28.ebuild | 2 +- www-servers/tomcat/tomcat-8.5.30.ebuild | 158 +++++++++++++ www-servers/tomcat/tomcat-9.0.4.ebuild | 158 ------------- www-servers/tomcat/tomcat-9.0.5.ebuild | 2 +- www-servers/tomcat/tomcat-9.0.7.ebuild | 158 +++++++++++++ 9 files changed, 324 insertions(+), 732 deletions(-) delete mode 100644 www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch delete mode 100644 www-servers/tomcat/tomcat-8.5.24.ebuild delete mode 100644 www-servers/tomcat/tomcat-8.5.27.ebuild create mode 100644 www-servers/tomcat/tomcat-8.5.30.ebuild delete mode 100644 www-servers/tomcat/tomcat-9.0.4.ebuild create mode 100644 www-servers/tomcat/tomcat-9.0.7.ebuild (limited to 'www-servers/tomcat') diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index da51f15900c6..496da9158559 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -2,7 +2,6 @@ AUX tomcat-7.0.82-build.xml.patch 5062 BLAKE2B 2015107f6898b3ad836ce45ddc68b75df AUX tomcat-7.0.84-build.xml.patch 5771 BLAKE2B fc7ceb5503836f2d2e52611b1fef76390d62668ac030cfc51b51ab20278d80fb4c3561e6ff4eb0fa5f7461b72f73930a69af6c616bc10b6dd6a3c4033d6ad618 SHA512 3583167e6e7b307ab282982779ef58e1f401e0ada8ddf0fc1ac9669147a22d6472ab9ec09aa293f2846be2f406dda63df5fc0351eac67c86742606140293a0c3 AUX tomcat-8.0.48-build.xml.patch 10538 BLAKE2B 3ffe21072643f533c12422ecdbfa6c026f49c2325c26459835dc6bab0ec195e4343a2d3a8730e5927a27534a0a0309a91ba4dd1ae86917432385741a86226c97 SHA512 0dd20126ff34b30a3fdc64bf26e15f0b7921905881d237df0097509cb041e34830c8508b29e8fb760517d10810cc256bfe623498062eed0495bee0624f1f5aa8 AUX tomcat-8.0.49-build.xml.patch 10779 BLAKE2B db42886b59bd50f8ba4011ce34ce4ab8b44af0cef09bc66704b774914d1421121e4041ee1abc2fef5a907ea72f960f31a87502d40855817110b52cf5c5ad92c7 SHA512 ee8d9e689a4744c93554968c97b717c9102dfa94c6e1740ca44575f7226946e6209199b2845575faec7bf1d1d6b9bad62110bc4551a1ac0d84c564599e3a49e0 -AUX tomcat-8.5.24-build.xml.patch 10158 BLAKE2B a20d93dda5bdabcd5865e2554483ae3be60878f4197a4116fa9448cb6e688d920504a38422af64ba242679d2ee580fcd5b3112915a3709b665a106190ad6dd4b SHA512 37f50804a6439ac670efcc2774d94b238eaa98e3825e112fff8ac7f8b362f07b96e1e126e9b502b226e277e20af3da1ad88f3e5e2290cffef951f8629008c0b0 AUX tomcat-8.5.27-build.xml.patch 10399 BLAKE2B 66df2c023b89d23bad249bf00695b0863b10b2c72b67fe7344104cc2c5f2187656298faa9abca55f3604043cecbdad57c3d7f379f2e23836fd4828dbc5c90051 SHA512 f09527b693d86fae244f3d54ce2f894e9a6e70a80345995e1521847298417ab0737c481ea59bdb243529edf2d717bb8b0d94af5443c4b0827589cb0c8395474a AUX tomcat-9.0.4-build.xml.patch 10399 BLAKE2B 3ec7f4d315b51056884b44abbd03093e2bf3675acfb572c556a62a8a32de3209dae82ee3f3b1c65178b2a62b42f5d4c3fba2e765aa27aa7147a9d8478d09f0f0 SHA512 60729e4f085951aa1133b0d6fdc6386bac9fd4bcd421814eb87c8a45a62819fab1ea2347dfffd12150e93c54fda2ba98bf1df4bc39a622de5ac9ea0c2e81a710 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570 @@ -15,20 +14,18 @@ DIST apache-tomcat-7.0.85-src.tar.gz 4718223 BLAKE2B 3067709eb143feee5cc1f31cdd8 DIST apache-tomcat-8.0.48-src.tar.gz 5009969 BLAKE2B 4b1db654d74b02f5fd589590197561496ecfb9b219e445fd18f2e967c78fb95f7fc71a21a6ed9ab5f8c6cee448b74a1729eb3627bcf1a59e2d2748c9c80cc76c SHA512 c56aaa7335c4ef221b2e5de7a7d4946ae1221127f977da5f46a97b062d909abc918b0e6ceb887d98ea5f5b38a26bbe9a3de481972492be593636f6f7e6ef7841 DIST apache-tomcat-8.0.49-src.tar.gz 5017328 BLAKE2B a3494c73fc6b9ffecfe7b09380f9fb3a632e167861f876ac827848e6ae5fd41dc9d3f8a0da9d484edd87b88532de05809c8019941d3a2639e925066ff0a8cc87 SHA512 36ae75d37874430ea6b567d8415a9249f104b57afdd8689621f659f6a2c0b229f207e63cdcdfacb1eabd13af567295ff1335cb052abbefe46efdccc20f2d5a73 DIST apache-tomcat-8.0.50-src.tar.gz 5023017 BLAKE2B 862799b7f6a227217c93e1b65aacc49a765b6d11886d0f2278a860c3f4e2b89692cfb724e323d3afe074ad3af3ef8cfd780e4be1ad2f55fee381e5054fbb1941 SHA512 c46efe03cfaadbc2b89063c05c5ec9f315a4eeacdfbf6dd43691c3d23a87d75b23b6679550518d825f8ec7ed853a899ca88cc54c61da9983b025ec7042c3bfff -DIST apache-tomcat-8.5.24-src.tar.gz 5101516 BLAKE2B c19c46cca562f0c4c4733608ec007dd423f9a8ed0595bfb835554a7d08be06b791933e4beacbb0fe472589feae82f7d1a46934c0fb68930343cb2f4589bf6530 SHA512 f4ef9a66f2cafb3207c5a38c0f88efc1189e72f02fa88ef2a1b3626a03a57d0ba505b099f6185d747d5ab858aa3f8f3446ae60789312a900ec443eac45233efc -DIST apache-tomcat-8.5.27-src.tar.gz 5123614 BLAKE2B 0051a7b5a9d3529a012338e0b12ed5fca218fc6740a0c576d3195a9c7848a78d93d0a6151541e314d82723de1b533b28024eeb231e33b21c38a2c4f702007415 SHA512 d3cac3d618283f0c26f861df67223fcb889da750f5e42563ec2ebc17d72169a7639d05d4d42fe403f4e49052962da09bc4b312b012c31309d8a096036baec8ab DIST apache-tomcat-8.5.28-src.tar.gz 5128929 BLAKE2B fe862a44fe57a50502b95d6f31863567b5596b183355a75fb7b75827a697299878920cc5ca5c24ffcdabae885a893266f40f174c76c32f449bec31e7a1be489b SHA512 55970e8babc1fde783e6e9f67a221012cae88e871391aa751e3c87c0fc7e58cd45662f025dc286dd529caced317dada48bb65786f87b44abbc9ce16f0d8fb0b5 -DIST apache-tomcat-9.0.4-src.tar.gz 5073991 BLAKE2B 7efffbba395d78d5ab051dd2bdb7a1491cb04159421bec17deebcb901bbca5cfec67a651f8e1fcd9a394ba3e0650fc61e7da039f0f979ae60a87f477bc4bc3b8 SHA512 bb8777f6fff861a53381b15a4196053abd9cc01e080f0511032f69eb6f57f5c6ed0eafd8a94155f19a4654bce4fad39e0fcaa2e5473cb269bceeb46a2ea43557 +DIST apache-tomcat-8.5.30-src.tar.gz 5143270 BLAKE2B 3bdcff663ca509efc3b2ee92ce140a3a22abf7fc0e32b5fa9a0ee713bdc1065ebde0b77cf624cedc2e0893194518d10e1f5df5b2f41edf76cb61157ac4d02862 SHA512 53729cfd1859872109f816df2642e3cd776a7faf8c55b1d50df0459f12958aacbf36debe6e8f10c19ab0a5bb2973fa63a2fec57f83ecaf19f4cf9d82e4a20265 DIST apache-tomcat-9.0.5-src.tar.gz 5077379 BLAKE2B db345767f6c35557054c33d789fc40b1d2071501130bec57df41bb3fdf6f8be5260c0faed317b9fe6fa40474f9de1f29c6a71039eb0b7d07fee4ee0109ac16e4 SHA512 4d0b24dcf26b94f4280382f64bcdeb74f24b69b86b1410ad40d4a0284d6787809485f7c2501b66126d778a73a5c3eb155856ac6d3b3e2a477d1742d8588c1e84 +DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 EBUILD tomcat-7.0.82.ebuild 4337 BLAKE2B e5c731a5144ba84663d1a161167afc3c318e2f5bbcdff922bdc86eec16d120b9dafc9c6ee4c1a216215f18b3913bf895af8c7d7ba1ae04216b456075eddfd5b6 SHA512 ebf08288d0eab4611ad2fbf8e90d4a376d4b6bf631285e53de82690e99dcd2825fa6df0e19272fb8c0f809fc39fedd67e0a7d055bd8dc1956cfa2a4c76fdec20 EBUILD tomcat-7.0.84.ebuild 4234 BLAKE2B e1653306170d6e1aee5f18e0da865259557c870cacbec166253c89497fe3bb2aa7f6093ef573972bf152da535472c44157aef530d30bf4b99f81c65c46a1d768 SHA512 2e8434929733dee2639470b350db79ced82fbce9febf7291abed67048ad4e02afd4830737eeb79dc3c70f8ebd2d418a269b7041f4ad73393841aff755e1cdd0e EBUILD tomcat-7.0.85.ebuild 4234 BLAKE2B e1653306170d6e1aee5f18e0da865259557c870cacbec166253c89497fe3bb2aa7f6093ef573972bf152da535472c44157aef530d30bf4b99f81c65c46a1d768 SHA512 2e8434929733dee2639470b350db79ced82fbce9febf7291abed67048ad4e02afd4830737eeb79dc3c70f8ebd2d418a269b7041f4ad73393841aff755e1cdd0e EBUILD tomcat-8.0.48.ebuild 4529 BLAKE2B f72552331f8a1688251a15f4f427f2e8a15c65050c8acfa7467fbea3899232d7f0390890a1868cf866a38961530a7e9caee80afeb7bd4703fa06e1d972ed6c46 SHA512 6744d87a843fb3e2bf71887ac94675de5e76f57bcda57b08936045deece3b643396051fbe3addca953f71abe6858ca5e9adf23a9b96fad84f9e445486f8dd2f3 EBUILD tomcat-8.0.49.ebuild 4538 BLAKE2B 544cca9236fcef33c98f7616150f6631df71f653d10817c1f4dc9c22766243b28a2fb7d0f0b5bc99c7a27bb8aa58f96cb92d9e609003b511338c44d75bd6e75b SHA512 36f6556ee6ba254bea6f29f95370673e69170d0d3e5918bd0fd353e459617e1923c015b0c0f35d4ed81081f77ad41833ea756fdc4c063bd88369860036746dce EBUILD tomcat-8.0.50.ebuild 4538 BLAKE2B 544cca9236fcef33c98f7616150f6631df71f653d10817c1f4dc9c22766243b28a2fb7d0f0b5bc99c7a27bb8aa58f96cb92d9e609003b511338c44d75bd6e75b SHA512 36f6556ee6ba254bea6f29f95370673e69170d0d3e5918bd0fd353e459617e1923c015b0c0f35d4ed81081f77ad41833ea756fdc4c063bd88369860036746dce -EBUILD tomcat-8.5.24.ebuild 4577 BLAKE2B 165a298ee88010600781a06f9941120c5a374f3b3836cb8e59b0b43eb04cb7594b327729846849903b8dc74827a9210fac08ceb9b6fb17947b28d9602732acc7 SHA512 05c68e5c8f446d1ea1588eef3d1e6797268a4f0364a9d0ade06c8ff5d963e8f04f1426302aec754095b27b7840046578813b6203e21e7069e863e9ae229d2943 -EBUILD tomcat-8.5.27.ebuild 4586 BLAKE2B afa66a827f2bdbcda4f9fd61fe5b09fdd56646cfa52eb91e1bc479ae08b4c6f0d3713aa0be421200a415358ec3d69827f5c32fd5a552c7c445adc4f7f2513f5c SHA512 e8606cbf952bddb9d83a54d7de9031fdd717ea421d7ca7cfc087dda4d0ec2eab51f01c189b035fe677d4fdec7fddc8ba97490d45f4ac9ba319713ba50920fbd0 -EBUILD tomcat-8.5.28.ebuild 4586 BLAKE2B afa66a827f2bdbcda4f9fd61fe5b09fdd56646cfa52eb91e1bc479ae08b4c6f0d3713aa0be421200a415358ec3d69827f5c32fd5a552c7c445adc4f7f2513f5c SHA512 e8606cbf952bddb9d83a54d7de9031fdd717ea421d7ca7cfc087dda4d0ec2eab51f01c189b035fe677d4fdec7fddc8ba97490d45f4ac9ba319713ba50920fbd0 -EBUILD tomcat-9.0.4.ebuild 4565 BLAKE2B 0f03e66e037307f48e030caf36b65a2bfc71c5bfeee045b0eb62e71fcc881cf07ffe41e45b5f45860981c71bc8a80593a7f828687641231279e561e51987c60e SHA512 cc4fdb1c9ca53668cdb9e88b201d780e6507c71f7f9246a8025d9b92dcfa523ad5194f5e8cd4903368db104e3bf1c5a24e88ace1a8765b152ac76a64faa1432f -EBUILD tomcat-9.0.5.ebuild 4565 BLAKE2B 0f03e66e037307f48e030caf36b65a2bfc71c5bfeee045b0eb62e71fcc881cf07ffe41e45b5f45860981c71bc8a80593a7f828687641231279e561e51987c60e SHA512 cc4fdb1c9ca53668cdb9e88b201d780e6507c71f7f9246a8025d9b92dcfa523ad5194f5e8cd4903368db104e3bf1c5a24e88ace1a8765b152ac76a64faa1432f +EBUILD tomcat-8.5.28.ebuild 4585 BLAKE2B d90821190b776649a36890b1bb97a93fe64cd179e03a3e36e899a51578a568e0306cb3b1746adb063bd6319a4ac756356cbe7f4d3f95ece894986b66624ad389 SHA512 94bb4bb77e1db0ee7723712fc962712496d20ee61ff041a5fe54a8c21ce201a18aacfd12fdcab5ebb64b9910ef21ebea17060a0aa6cade9bc015c34f27a4d28f +EBUILD tomcat-8.5.30.ebuild 4586 BLAKE2B afa66a827f2bdbcda4f9fd61fe5b09fdd56646cfa52eb91e1bc479ae08b4c6f0d3713aa0be421200a415358ec3d69827f5c32fd5a552c7c445adc4f7f2513f5c SHA512 e8606cbf952bddb9d83a54d7de9031fdd717ea421d7ca7cfc087dda4d0ec2eab51f01c189b035fe677d4fdec7fddc8ba97490d45f4ac9ba319713ba50920fbd0 +EBUILD tomcat-9.0.5.ebuild 4564 BLAKE2B 1d827fc4fb3592ac1eb24d03c74ae9c4651a2d55a5af4530b762a0555ca494019fa955f261fdc7a338c8ffa60ee2506111a3dfe59030f2c7b5045efb36fb8ccf SHA512 c423a141b56618c4589d6f0818db7bd78ebe93f62607113db9a5e4782f9820f069a781f04a42bee63b77549d3d83a2d8baf7a313bc6099a88dfc35ee0066e211 +EBUILD tomcat-9.0.7.ebuild 4565 BLAKE2B 0f03e66e037307f48e030caf36b65a2bfc71c5bfeee045b0eb62e71fcc881cf07ffe41e45b5f45860981c71bc8a80593a7f828687641231279e561e51987c60e SHA512 cc4fdb1c9ca53668cdb9e88b201d780e6507c71f7f9246a8025d9b92dcfa523ad5194f5e8cd4903368db104e3bf1c5a24e88ace1a8765b152ac76a64faa1432f MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109 diff --git a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch deleted file mode 100644 index 9db6d4046744..000000000000 --- a/www-servers/tomcat/files/tomcat-8.5.24-build.xml.patch +++ /dev/null @@ -1,247 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -714,24 +714,29 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - -+ - -+ - - -+ - - - -- -+ - - - -@@ -1072,7 +1077,7 @@ - - - -- -+ - - - -@@ -1106,7 +1111,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - - - - - - -+ - - - -@@ -2607,7 +2618,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download (and build) components necessary to compile" unless="noget"> - - - -@@ -2641,7 +2652,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2698,7 +2709,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -2724,18 +2735,18 @@ skip.installer property in build.properties" /> - - - -- -+ - - - - -- -+ - - - - -- -+ - - - -@@ -2747,7 +2758,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2777,7 +2788,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2805,7 +2816,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2839,7 +2850,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2850,7 +2861,7 @@ skip.installer property in build.properties" /> - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - diff --git a/www-servers/tomcat/tomcat-8.5.24.ebuild b/www-servers/tomcat/tomcat-8.5.24.ebuild deleted file mode 100644 index a9d17b4ed6a0..000000000000 --- a/www-servers/tomcat/tomcat-8.5.24.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source test" - -inherit eutils java-pkg-2 java-ant-2 prefix user - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="8.5" -KEYWORDS="amd64 ~x86 ~x86-fbsd ~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="3.1" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" -RDEPEND="${COMMON_DEP} - !=virtual/jre-1.7" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=virtual/jdk-1.7 - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - # Remove bundled servlet-api - rm -rv java/javax/{el,servlet} || die - - 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 -Dexecute.validate=false" - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" - java-pkg-2_src_compile -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### 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} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" - - elog "To manage Tomcat instances, run:" - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" - ewarn "from upstream binary if you need it. Gentoo Bug # 144276" - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" - einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." -} diff --git a/www-servers/tomcat/tomcat-8.5.27.ebuild b/www-servers/tomcat/tomcat-8.5.27.ebuild deleted file mode 100644 index 0fb74bf75f01..000000000000 --- a/www-servers/tomcat/tomcat-8.5.27.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source test" - -inherit eutils java-pkg-2 java-ant-2 prefix user - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="8.5" -KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" -RDEPEND="${COMMON_DEP} - !=virtual/jre-1.7" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=virtual/jdk-1.7 - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - # Remove bundled servlet-api - rm -rv java/javax/{el,servlet} || die - - epatch "${FILESDIR}/${PN}-8.5.27-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 -Dexecute.validate=false" - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" - java-pkg-2_src_compile -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### 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} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" - - elog "To manage Tomcat instances, run:" - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" - ewarn "from upstream binary if you need it. Gentoo Bug # 144276" - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" - einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." -} diff --git a/www-servers/tomcat/tomcat-8.5.28.ebuild b/www-servers/tomcat/tomcat-8.5.28.ebuild index 0fb74bf75f01..5e09cb9bab2f 100644 --- a/www-servers/tomcat/tomcat-8.5.28.ebuild +++ b/www-servers/tomcat/tomcat-8.5.28.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="8.5" -KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? diff --git a/www-servers/tomcat/tomcat-8.5.30.ebuild b/www-servers/tomcat/tomcat-8.5.30.ebuild new file mode 100644 index 000000000000..0fb74bf75f01 --- /dev/null +++ b/www-servers/tomcat/tomcat-8.5.30.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_IUSE="doc source test" + +inherit eutils java-pkg-2 java-ant-2 prefix user + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="8.5" +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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="3.1" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" +RDEPEND="${COMMON_DEP} + !=virtual/jre-1.7" +DEPEND="${COMMON_DEP} + app-admin/pwgen + >=virtual/jdk-1.7 + test? ( + >=dev-java/ant-junit-1.9:0 + dev-java/easymock:3.2 + )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + java-pkg-2_pkg_setup + enewgroup tomcat 265 + enewuser tomcat 265 -1 /dev/null tomcat +} + +src_prepare() { + default + + find -name '*.jar' -type f -delete -print || die + + # Remove bundled servlet-api + rm -rv java/javax/{el,servlet} || die + + epatch "${FILESDIR}/${PN}-8.5.27-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 -Dexecute.validate=false" + +# revisions of the scripts +IM_REV="-r2" +INIT_REV="-r1" + +src_compile() { + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" + java-pkg-2_src_compile +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + dodoc RELEASE-NOTES RUNNING.txt + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api + use source && java-pkg_dosrc java/* + + ### 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} + + ### Config ### + + # create "logs" directory in $CATALINA_BASE + # and set correct perms, see #458890 + dodir "${dest}"/logs + fperms 0750 "${dest}"/logs + + # replace the default pw with a random one, see #92281 + local randpw="$(pwgen -s -B 15 1)" + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + # prepend gentoo.classpath to common.loader, see #453212 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash +} + +pkg_postinst() { + elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" + elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." + elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" + + elog "To manage Tomcat instances, run:" + elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" + ewarn "from upstream binary if you need it. Gentoo Bug # 144276" + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" + einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." +} diff --git a/www-servers/tomcat/tomcat-9.0.4.ebuild b/www-servers/tomcat/tomcat-9.0.4.ebuild deleted file mode 100644 index 36b0d0916999..000000000000 --- a/www-servers/tomcat/tomcat-9.0.4.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source test" - -inherit eutils java-pkg-2 java-ant-2 prefix user - -MY_P="apache-${PN}-${PV}-src" - -DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="9" -KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - =dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" -RDEPEND="${COMMON_DEP} - !=virtual/jre-1.8" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=virtual/jdk-1.8 - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - # Remove bundled servlet-api - rm -rv java/javax/{el,servlet} || die - - epatch "${FILESDIR}/${PN}-9.0.4-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" -INIT_REV="-r1" - -src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" - java-pkg-2_src_compile -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### 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} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" - - elog "To manage Tomcat instances, run:" - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" - ewarn "from upstream binary if you need it. Gentoo Bug # 144276" - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" - einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." -} diff --git a/www-servers/tomcat/tomcat-9.0.5.ebuild b/www-servers/tomcat/tomcat-9.0.5.ebuild index 36b0d0916999..b07ff55c989f 100644 --- a/www-servers/tomcat/tomcat-9.0.5.ebuild +++ b/www-servers/tomcat/tomcat-9.0.5.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="9" -KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? diff --git a/www-servers/tomcat/tomcat-9.0.7.ebuild b/www-servers/tomcat/tomcat-9.0.7.ebuild new file mode 100644 index 000000000000..36b0d0916999 --- /dev/null +++ b/www-servers/tomcat/tomcat-9.0.7.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_IUSE="doc source test" + +inherit eutils java-pkg-2 java-ant-2 prefix user + +MY_P="apache-${PN}-${PV}-src" + +DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="9" +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~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" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + =dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}" +RDEPEND="${COMMON_DEP} + !=virtual/jre-1.8" +DEPEND="${COMMON_DEP} + app-admin/pwgen + >=virtual/jdk-1.8 + test? ( + >=dev-java/ant-junit-1.9:0 + dev-java/easymock:3.2 + )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + java-pkg-2_pkg_setup + enewgroup tomcat 265 + enewuser tomcat 265 -1 /dev/null tomcat +} + +src_prepare() { + default + + find -name '*.jar' -type f -delete -print || die + + # Remove bundled servlet-api + rm -rv java/javax/{el,servlet} || die + + epatch "${FILESDIR}/${PN}-9.0.4-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" +INIT_REV="-r1" + +src_compile() { + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" + java-pkg-2_src_compile +} + +src_test() { + java-pkg-2_src_test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + dodoc RELEASE-NOTES RUNNING.txt + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api + use source && java-pkg_dosrc java/* + + ### 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} + + ### Config ### + + # create "logs" directory in $CATALINA_BASE + # and set correct perms, see #458890 + dodir "${dest}"/logs + fperms 0750 "${dest}"/logs + + # replace the default pw with a random one, see #92281 + local randpw="$(pwgen -s -B 15 1)" + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + # prepend gentoo.classpath to common.loader, see #453212 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash +} + +pkg_postinst() { + elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" + elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." + elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" + + elog "To manage Tomcat instances, run:" + elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" + ewarn "from upstream binary if you need it. Gentoo Bug # 144276" + + einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" + einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." +} -- cgit v1.2.3