diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-17 10:00:35 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-17 10:00:35 +0100 |
commit | cf89ca044e37f79e2329552cda857215f9824e11 (patch) | |
tree | a6720b1db82c94482ed8a998aa77650c5f723358 /www-servers/tomcat | |
parent | cb627578a344c874750e23e7eb59b1acc85aa639 (diff) |
gentoo auto-resync : 17:10:2023 - 10:00:35
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r-- | www-servers/tomcat/Manifest | 10 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-10.1.14.ebuild | 181 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-10.1.15.ebuild | 2 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-8.5.94.ebuild | 154 | ||||
-rw-r--r-- | www-servers/tomcat/tomcat-8.5.95.ebuild | 2 |
5 files changed, 4 insertions, 345 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 509daaf3610b..7c93b2ee2efa 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -6,20 +6,14 @@ AUX tomcat-9.0.72-build.xml.patch 3794 BLAKE2B 886bf69f4c78f385249e02e1f91ed9106 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d -DIST apache-tomcat-10.1.14-src.tar.gz 6131823 BLAKE2B d1e3d1333ccc2b06549bbd28e4592a1e406ed832902d325ed363a544b08cb31efc7c916d57dbc29151ccc37c100fc9d185df07668226586275e1f85d344e761a SHA512 bdf0618deec57ff198e8e17b20103a9be5ffd4e48e5a51e0772004fb9552e1ea9b52f6ef708e74e040c6e015fcd3edbdedb06b808894e8d4573394c8a417b1b0 -DIST apache-tomcat-10.1.14-src.tar.gz.asc 849 BLAKE2B b12714facfb8dd6816e724c28b80f7974c793b7827021654ac6249684c6af7bb232f19dbbe3b362be4ce2c51d8126096e8f0e5f1c8b6bd0b2e27d9daf6ffee18 SHA512 25e50236db7b67cc6635627e385bc2eede2047c4c63570df608f9df6214f78771f4b0243b9bfba396438674647a27e2d12b7cfd69a8f27df58c12702ad9eb1b1 DIST apache-tomcat-10.1.15-src.tar.gz 6131479 BLAKE2B 640cd6b61cfc15e80cf9f84c55e4751789b48dbb0c05b30387ee0c2731770df3eeedf0c09c4c920cafb3c1be33c3e7e6a3c8d236e566a5c1742c5b36419849c4 SHA512 7a0b8a584d7e801446f031415551ac943be21c5c4ed9e7ee1a66c43339f0625435a80465930121633eebaf5eae95c096684ee2d99ed70805ce52509a3aa7c67e DIST apache-tomcat-10.1.15-src.tar.gz.asc 849 BLAKE2B 13c77c4adfcf280acd61f557629b5d569ab648ed98c9632bbbae7fb61fd1d297f16c1e9055ef9d6fc26d2e5264001fbed8a524ac3bb744490045f5196d4da680 SHA512 837ea0b3d0583328a8d187cd86efaff770a578cc0b029c4bfff0058affcf0e376a8981a76d7f31327e98a97600f421beaac5ca2beb411538fbcaad55536ee2b8 -DIST apache-tomcat-8.5.94-src.tar.gz 6119709 BLAKE2B ff1dcedd285eda225391b93f7aae8b8aff83c8c4c06a6b59c6b7760bd901364d8938cbe59c5eb2ae34055d414544cef3cb41e8b367e9531fdec30b010f353e6d SHA512 0b03b5ee0cfafb34d7f428dfbd5de2f1c3c676b320883d5da5a0613576a6eb68a46bfcbaf15adc015f75ef43fe1bb76dc528942502ac1ea9d3f5b95ed888891a -DIST apache-tomcat-8.5.94-src.tar.gz.asc 849 BLAKE2B afbf8426f0801dd1ed43a0e535a436b2977cc152df2e38d370f025024d24d4d8a87d8519287395204c69f69aad3b38d1b7c65d889e14500ffb9dbdcbaf0fa4a7 SHA512 17ffe4a0fb46c6cf8aa0995121a708f1069521ddc1a5580108abd2167da1775ccbafe7ebceb14ae30955a8d5180ceee339f2cc8555309c0b4c4166576fbc9ef7 DIST apache-tomcat-8.5.95-src.tar.gz 6120005 BLAKE2B 85bc74d086e8779b227af54a5f3b21e4011d8966a31ffeb0917256f1482316d97e6b759427e3c76c004ce8ac2f3d9bc57eabadd15dc4514bdf9e3160da690b71 SHA512 7532062e543c43405bda9ac8d9a99b550b4be0a0663239d97024f1c9f0b082e565a9eabd64c19baaeeacbad2c2f9b47e821538027482ae82dade42d5a95df786 DIST apache-tomcat-8.5.95-src.tar.gz.asc 849 BLAKE2B 78a9437e10595f14a90f8f78ac7711b0b4cc2aee750f1cf4d6dd3aa51e4cb56d05ef1cd24ef1052fe776e8196c25ea793f14e00819794ef7a6065295dd638e23 SHA512 a5c90336a6d75af7bd9805a928a1ffdf2e71b75fe76a0c8a2ea5e3da0ad97693d93d488bea00c0e973565b30c6b6ef2421cb417b1243ab1bba22eb705e84d3d4 DIST apache-tomcat-9.0.82-src.tar.gz 6285653 BLAKE2B 026a3f5ec58ff78c1fe0a30507ff36b9e407c5b1d8d1902a4a94b9aee8f97ac5fc9234bc1aae50e001fb9ff05369c6445712faaeb508b0d63f18271e774676e4 SHA512 0291196832150147230a263bcfd64f7ac9ce9f6c26924f72b831d28479e7886f00b9ab3adff175785e8c5b47d8b16f7a7897acafa3474428f48cec02fd852b3e DIST apache-tomcat-9.0.82-src.tar.gz.asc 833 BLAKE2B 9874c7ee35d5d4d3ec352799bfc7cfb4b866d3f7da4e2619ac48c212de46dd90510ec36b44409602967bff1c863b60428ec8ca60689814adbb12e83f7ecba695 SHA512 fdb9c5f0004bbf3192cafd4b66bb479de251934a0b82eaaac9bb77894abad3269b383032220ef076f4327e6ddd5b1e76a78917b6b46f467a030351eb5fd5f749 DIST biz.aQute.bnd-6.4.1.jar 16296222 BLAKE2B d2229eb221dcd87ddadccc48d83f1d86c95f7fd2e551b0523d58d1e14dcf0899201f96cb09c60ada9cd9cb3b6fe5201a68e8a9bb93258d06ed29baebb4fd9260 SHA512 a9b53265fffe48934666b26e5075cb96fac4c3d4cf7273358e551e741adbb58b469eb718022e9b31088d80961c649fb23027a3fde50db1ee0a72ada55df0e96c -EBUILD tomcat-10.1.14.ebuild 5432 BLAKE2B b444613867e4c16731e5633e4d73cf0db8f64a88d264f441388a73d928e5511e709d61a9a8ff6f2b7a1571207f29d9b46b93a8817f622a222f884a0ab725402e SHA512 c05d3f8d76837be7f57b2299e668cf6920a4c734019cebdb707a42a8e923480ace314b16e49e9bc2bd5ffe380eb05733ce875f53706db76d08a39c1ba77ce0e2 -EBUILD tomcat-10.1.15.ebuild 5433 BLAKE2B 6d43df7d6d6519ce89d2383c643dc935efd2db35facc51dc41f673640ffd64be4314cb2cf70051903d58084333b9cc50f1e7e15ec9d2e5cb114faf8eb45a5475 SHA512 613b490af2000e0dce9dc4f2534f7d27efcaede09bea397d76e2c33cf61cb754f187565827369ec0d14a701af21923c0eb5b7fcda68bc116a5fac2fc882f2bee -EBUILD tomcat-8.5.94.ebuild 4636 BLAKE2B 16d14d1b7ad61614010e6d3eb5cbf25f9545b8737d30422ad3ba140e40a686ae31ae091fc481f4d8835fd1cd71f44b9930c6cf41a561ba5121156088d6693f69 SHA512 9729f7813e53c57908b37d71d113df349880f1993ba6814f7470599960cfda8188d662d532c000338ed091ec3bf6bee7f5a4ae267cc7cd1cd232e800a0ff4bdb -EBUILD tomcat-8.5.95.ebuild 4637 BLAKE2B 91241d2fb01b2f5b91d859870f86732b1793568278551f52311179ee553ac46eb5adf67ab3ac04badc3b8315129da77e1e64145cf888a8f98e7223ae11334e29 SHA512 dc0c128616263c1d2066053cac073c92db1573a093e6585b0b42c580a7768c670df07b03a9da1b01bf6fd76e1b1d24af981e586aece6a7e966f019d0fa9cf570 +EBUILD tomcat-10.1.15.ebuild 5432 BLAKE2B b444613867e4c16731e5633e4d73cf0db8f64a88d264f441388a73d928e5511e709d61a9a8ff6f2b7a1571207f29d9b46b93a8817f622a222f884a0ab725402e SHA512 c05d3f8d76837be7f57b2299e668cf6920a4c734019cebdb707a42a8e923480ace314b16e49e9bc2bd5ffe380eb05733ce875f53706db76d08a39c1ba77ce0e2 +EBUILD tomcat-8.5.95.ebuild 4636 BLAKE2B 16d14d1b7ad61614010e6d3eb5cbf25f9545b8737d30422ad3ba140e40a686ae31ae091fc481f4d8835fd1cd71f44b9930c6cf41a561ba5121156088d6693f69 SHA512 9729f7813e53c57908b37d71d113df349880f1993ba6814f7470599960cfda8188d662d532c000338ed091ec3bf6bee7f5a4ae267cc7cd1cd232e800a0ff4bdb EBUILD tomcat-9.0.82.ebuild 5281 BLAKE2B cd971449b5aca9d9901e658c6779727c1b2d1fe26ca518112bfa6efe965f0186f15a608bfebd270aa4b9978ebeac7232f423d7c9647051bb1274a01dcfd6d55c SHA512 7ff66e617afb64716d6eb7c1139eddebee65381f944f181995f9915388f94d568e51762ea2c7ae250dd4949b4041019bf057e4e3001af5dd70754aaec980f021 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9 diff --git a/www-servers/tomcat/tomcat-10.1.14.ebuild b/www-servers/tomcat/tomcat-10.1.14.ebuild deleted file mode 100644 index 99574ed56bf4..000000000000 --- a/www-servers/tomcat/tomcat-10.1.14.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 prefix verify-sig - -MY_P="apache-${PN}-${PV}-src" - -# Currently we bundle binary versions of bnd.jar -# See bugs #203080 and #676116 -BND_VERSION="6.4.1" -BND="biz.aQute.bnd-${BND_VERSION}.jar" - -DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND} - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="10.1" -KEYWORDS="amd64 ~arm ~arm64 ~amd64-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.26" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - dev-java/jax-rpc-api:0 - >=dev-java/jakartaee-migration-1.0.5:0 - dev-java/wsdl4j:0" -RDEPEND="${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-11:*" -DEPEND="${COMMON_DEP} - app-admin/pwgen - dev-java/ant-core - >=virtual/jdk-11:* - test? ( - dev-java/ant-junit:0 - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" ) - -S=${WORKDIR}/${MY_P} - -BND_HOME="${S}/tomcat-build-libs/bnd" -BND_JAR="${BND_HOME}/${BND}" - -src_unpack() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc} - fi - - unpack ${MY_P}.tar.gz - - mkdir -p "${BND_HOME}" || die "Failed to create dir" - ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" -} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - local vm_version="$(java-config -g PROVIDES_VERSION)" - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --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},jakartaee-migration,wsdl4j" -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 -Dbnd.jar=${BND_JAR}" - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_configure() { - java-ant-2_src_configure - - eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch" -} - -src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)" - LC_ALL=C 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() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "Please note that since version 10 the primary package for all implemented APIs" - ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code" - ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later." - - 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-10.1.15.ebuild b/www-servers/tomcat/tomcat-10.1.15.ebuild index adac67e121d7..99574ed56bf4 100644 --- a/www-servers/tomcat/tomcat-10.1.15.ebuild +++ b/www-servers/tomcat/tomcat-10.1.15.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz LICENSE="Apache-2.0" SLOT="10.1" -KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux" +KEYWORDS="amd64 ~arm ~arm64 ~amd64-linux" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? diff --git a/www-servers/tomcat/tomcat-8.5.94.ebuild b/www-servers/tomcat/tomcat-8.5.94.ebuild deleted file mode 100644 index 265c9e364fe1..000000000000 --- a/www-servers/tomcat/tomcat-8.5.94.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 prefix verify-sig - -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 - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="8.5" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.15" - -# we don't use ~ for el and jsp because the same implementation -# is also present in tomcat 9 and it would be impossible to install -# both tomcat 8.5 and 9 at the same time -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}" -RDEPEND="${COMMON_DEP} - acct-group/tomcat - acct-user/tomcat - >=virtual/jre-1.8:*" -DEPEND="${COMMON_DEP} - app-admin/pwgen - dev-java/ant-core - >=virtual/jdk-1.8:* - doc? ( - dev-java/jax-rpc-api:0 - dev-java/wsdl4j:0 - ) - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -PATCHES=( "${FILESDIR}/${PN}-8.5.86-build.xml.patch" ) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --with-dependencies --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}" -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)" - use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)" - LC_ALL=C 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() { - einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:" - einfo " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - 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.95.ebuild b/www-servers/tomcat/tomcat-8.5.95.ebuild index ec49ff58bef9..265c9e364fe1 100644 --- a/www-servers/tomcat/tomcat-8.5.95.ebuild +++ b/www-servers/tomcat/tomcat-8.5.95.ebuild @@ -16,7 +16,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 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="extra-webapps" RESTRICT="test" # can we run them on a production system? |