summaryrefslogtreecommitdiff
path: root/www-servers/tomcat
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-04-22 12:05:36 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-04-22 12:05:36 +0100
commit02eb6576978c38afed5787f6f2dbab8353379d66 (patch)
tree0b82220aae58c1307bef3aff0f342f4cdf858161 /www-servers/tomcat
parent490ef2c2dc8b4e808f37add1adee21a754efd9a9 (diff)
gentoo auto-resync : 22:04:2024 - 12:05:36
Diffstat (limited to 'www-servers/tomcat')
-rw-r--r--www-servers/tomcat/Manifest2
-rw-r--r--www-servers/tomcat/tomcat-10.1.20-r2.ebuild (renamed from www-servers/tomcat/tomcat-10.1.20-r1.ebuild)8
2 files changed, 5 insertions, 5 deletions
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 4dc84f51d306..aed5aab42139 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -25,7 +25,7 @@ DIST apache-tomcat-9.0.88-src.tar.gz 6327717 BLAKE2B e79db61e3a8e368124ff151de2d
DIST apache-tomcat-9.0.88-src.tar.gz.asc 833 BLAKE2B 034081347d89b4e10b6296e0fbe8a17189ee27a71593848fdb70cc29a41291ca1edf21d4cc11d674c710505ae93d43a2f5dd08695d6dcfb4776843cc9970edf8 SHA512 608835f309d98099b0c852c553b9116611b44f389efbee85aaac27598546e584daab180acff3b05c00623456354e2719715d9ae24bd3940de39e7bbb48d3e018
DIST biz.aQute.bnd-7.0.0.jar 16567341 BLAKE2B 329b3b750e917ad513a1f767f63b96b1d0b10177a0f3c079bbf07e02aff77607e1f869bae09d09709d8cfef27cd802585e7f332e2a3e3f0ee1c31a4890e53fce SHA512 42b2e43f3e437c7b06f0d168eaf5ee499a4c517b1a01bec67fd6df92d01d037dd9088e0d5b013dfa1839f9dee35bf74903c1af7204712bf4aa72412e071ac503
EBUILD tomcat-10.1.19-r1.ebuild 5442 BLAKE2B 0f5cbc25167222f86fe5c8af93d5a9a04986d58f29a2c054f12d95d9f731bf7fe404851967aa54eb08c2fbe0becee1831dfd0801dd2b8950f67bdaf4e565ac97 SHA512 79d4196d097315ef04cbd31d9f1152171fb7315f8c6d9a9cb4d3b20aa148a9612416cd501e517e65d9fb94625cd909149be9895d80218ed3750c20986faabe84
-EBUILD tomcat-10.1.20-r1.ebuild 5572 BLAKE2B c46800aa4523de3a45762e3477aff91958ce9caf11ad36f22678dfc5238056ffaad27055b9287663d2480894f4bd317d4a032946c4d04884fc0ef045eb38adbc SHA512 dbbdb16d07bafa857aef8de54f195b0a59fd98febadf463a8c3422f8e62d3fd010d4c2f6d1c9ab40173c1216066c7456aae82696b16ff32bdcd9df560bf8d242
+EBUILD tomcat-10.1.20-r2.ebuild 5525 BLAKE2B c83cf5bb12e2d1f5996c02ae64927656515f44bb99d071bae085cef18c911c4c93992b5c7bde88ff3d4d3d9d58bbf8218c3f5d9c330147637f21e81f59b3b777 SHA512 08300b72a6afd783185464141bc3a95157ad7ced08ddff1ebd4424f8def822393dd08f1e266ee50717516dc87f46c3eff50ccc784791d7e85845f97a87c7d3b9
EBUILD tomcat-8.5.100.ebuild 4684 BLAKE2B f0d08a35d90ae9043022eb03375a5fc6b76a63835806287832f1393c4e173a6a8888bbd35e7acfae83d31b1ffa5f0250bd1960608f3221d94cc5ed2ec4b273a9 SHA512 ece6ea745ebc5c0231f3a4f8ed5cdd349a622fd627a98c7e5a34d98e872841b965f85d73e512d9dc863acf3bca61bb847773b0fc4bae72960e63bbc9726f72e4
EBUILD tomcat-8.5.99-r1.ebuild 4683 BLAKE2B 901e81fe850c4de79952df2625f28a778daa39c7881e361094b96962eec729ba20e9bafe7ba0f44f5f1750a1321a9f2431949da8f2d31495a547be5bba18d521 SHA512 202cf2951bcbcfa31025006b93f09e611e5c1f0693db5268d2b1eea3d3ac4ef2f25629d43fb40fa9752d1bba2d0773c85418365b38d84d8451cc2e64333ecc49
EBUILD tomcat-9.0.87-r1.ebuild 5292 BLAKE2B 995366efd1c1da549e10f80bcd231daa152c8bd75a6558e603154657964b7c0cd384bbe988b325df510a2c5978927119664b14479843369997b9c4c3f090e392 SHA512 ab71f681c9d62736a72a38443561dffd06e26eb89e1720fe6cf6da39926c476f57e23c843714d5c2341a3fd5ddb9c87c6496a88077c1350566bb3a1f739bbc68
diff --git a/www-servers/tomcat/tomcat-10.1.20-r1.ebuild b/www-servers/tomcat/tomcat-10.1.20-r2.ebuild
index fd4d47830b18..d046512b71c9 100644
--- a/www-servers/tomcat/tomcat-10.1.20-r1.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.20-r2.ebuild
@@ -24,7 +24,8 @@ RESTRICT="test" # can we run them on a production system?
ECJ_SLOT="4.27"
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+COMMON_DEP="dev-java/bnd-annotation:0
+ dev-java/eclipse-ecj:${ECJ_SLOT}
dev-java/jax-rpc-api:0
>=dev-java/jakartaee-migration-1.0.7-r2:0
dev-java/wsdl4j:0"
@@ -35,7 +36,6 @@ RDEPEND="${COMMON_DEP}
DEPEND="${COMMON_DEP}
app-admin/pwgen
>=dev-java/ant-1.10.14-r3:0
- dev-java/bnd-annotation:0
dev-java/bnd-ant:0
dev-java/bnd-util:0
dev-java/bndlib:0
@@ -61,13 +61,13 @@ PATCHES=(
src_prepare() {
default #780585
java-pkg-2_src_prepare
- find -name '*.jar' -type f -delete -print || die
+ java-pkg_clean
cat > build.properties <<-EOF || die
execute.download=false
exist=true # skip target="downloadfile-2"
ant.jar=$(java-pkg_getjar --build-only ant ant.jar)
- bnd-annotation.jar=$(java-pkg_getjars --build-only bnd-annotation)
+ bnd-annotation.jar=$(java-pkg_getjars bnd-annotation)
bnd-ant.jar=$(java-pkg_getjars --build-only bnd-ant)
bnd-util.jar=$(java-pkg_getjars --build-only bnd-util)
bnd.jar=$(java-pkg_getjars --build-only bnd)