commit: 35f8723f1b475763cb74852285d255d5a30c8fd0
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 09:11:41 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 09:11:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f8723f
www-servers/tomcat: updated to dev-java/ant + cleanup
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../tomcat/{tomcat-10.1.19.ebuild => tomcat-10.1.19-r1.ebuild} | 9 ++++-----
.../tomcat/{tomcat-8.5.99.ebuild => tomcat-8.5.99-r1.ebuild} | 9 ++++-----
.../tomcat/{tomcat-9.0.86.ebuild => tomcat-9.0.86-r1.ebuild} | 9 ++++-----
.../tomcat/{tomcat-9.0.87.ebuild => tomcat-9.0.87-r1.ebuild} | 9 ++++-----
4 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/www-servers/tomcat/tomcat-10.1.19.ebuild
b/www-servers/tomcat/tomcat-10.1.19-r1.ebuild
similarity index 97%
rename from www-servers/tomcat/tomcat-10.1.19.ebuild
rename to www-servers/tomcat/tomcat-10.1.19-r1.ebuild
index 28598e1cd7ef..43158b18dfb1 100644
--- a/www-servers/tomcat/tomcat-10.1.19.ebuild
+++ b/www-servers/tomcat/tomcat-10.1.19-r1.ebuild
@@ -19,6 +19,7 @@ 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 )"
+S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="10.1"
@@ -39,10 +40,10 @@ RDEPEND="${COMMON_DEP}
>=virtual/jre-11:*"
DEPEND="${COMMON_DEP}
app-admin/pwgen
- dev-java/ant-core
+ >=dev-java/ant-1.10.14-r3:0
>=virtual/jdk-17:*
test? (
- dev-java/ant-junit:0
+ >=dev-java/ant-1.10.14-r3:0[junit]
dev-java/easymock:3.2
)"
@@ -51,8 +52,6 @@
VERIFY_SIG_OPENPGP_KEY_PATH="/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}"
@@ -102,7 +101,7 @@ src_configure() {
}
src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant
ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
LC_ALL=C java-pkg-2_src_compile
}
diff --git a/www-servers/tomcat/tomcat-8.5.99.ebuild
b/www-servers/tomcat/tomcat-8.5.99-r1.ebuild
similarity index 98%
rename from www-servers/tomcat/tomcat-8.5.99.ebuild
rename to www-servers/tomcat/tomcat-8.5.99-r1.ebuild
index 73bd9ff31cc1..8f3129ef2d1b 100644
--- a/www-servers/tomcat/tomcat-8.5.99.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.99-r1.ebuild
@@ -13,6 +13,7 @@ DESCRIPTION="Tomcat
Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Containe
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 )"
+S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="8.5"
@@ -33,14 +34,14 @@ RDEPEND="${COMMON_DEP}
>=virtual/jre-1.8:*"
DEPEND="${COMMON_DEP}
app-admin/pwgen
- dev-java/ant-core
+ >=dev-java/ant-1.10.14-r3:0
>=virtual/jdk-11:*
doc? (
dev-java/jax-rpc-api:0
dev-java/wsdl4j:0
)
test? (
- >=dev-java/ant-junit-1.9:0
+ >=dev-java/ant-1.10.14-r3:0[junit]
dev-java/easymock:3.2
)"
@@ -52,8 +53,6 @@ PATCHES=(
"${FILESDIR}/${PN}-8.5.95-min.java.patch"
)
-S=${WORKDIR}/${MY_P}
-
src_prepare() {
default
@@ -81,7 +80,7 @@ IM_REV="-r2"
INIT_REV="-r1"
src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar)"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant
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
}
diff --git a/www-servers/tomcat/tomcat-9.0.86.ebuild
b/www-servers/tomcat/tomcat-9.0.86-r1.ebuild
similarity index 97%
rename from www-servers/tomcat/tomcat-9.0.86.ebuild
rename to www-servers/tomcat/tomcat-9.0.86-r1.ebuild
index 182ffc6d3773..d6183d244461 100644
--- a/www-servers/tomcat/tomcat-9.0.86.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.86-r1.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://tomcat.apache.org/";
SRC_URI="mirror://apache/${PN}/tomcat-9/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 )"
+S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="9"
@@ -41,18 +42,16 @@ RDEPEND="${COMMON_DEP}
>=virtual/jre-1.8:*"
DEPEND="${COMMON_DEP}
app-admin/pwgen
- dev-java/ant-core
+ >=dev-java/ant-1.10.14-r3:0
>=virtual/jdk-17:*
test? (
- dev-java/ant-junit
+ >=dev-java/ant-1.10.14-r3:0[junit]
dev-java/easymock:3.2
)"
BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-S=${WORKDIR}/${MY_P}
-
PATCHES=(
"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
@@ -105,7 +104,7 @@ src_configure() {
}
src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant
ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
LC_ALL=C java-pkg-2_src_compile
}
diff --git a/www-servers/tomcat/tomcat-9.0.87.ebuild
b/www-servers/tomcat/tomcat-9.0.87-r1.ebuild
similarity index 97%
rename from www-servers/tomcat/tomcat-9.0.87.ebuild
rename to www-servers/tomcat/tomcat-9.0.87-r1.ebuild
index 182ffc6d3773..d6183d244461 100644
--- a/www-servers/tomcat/tomcat-9.0.87.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.87-r1.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://tomcat.apache.org/";
SRC_URI="mirror://apache/${PN}/tomcat-9/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 )"
+S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="9"
@@ -41,18 +42,16 @@ RDEPEND="${COMMON_DEP}
>=virtual/jre-1.8:*"
DEPEND="${COMMON_DEP}
app-admin/pwgen
- dev-java/ant-core
+ >=dev-java/ant-1.10.14-r3:0
>=virtual/jdk-17:*
test? (
- dev-java/ant-junit
+ >=dev-java/ant-1.10.14-r3:0[junit]
dev-java/easymock:3.2
)"
BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
-S=${WORKDIR}/${MY_P}
-
PATCHES=(
"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
@@ -105,7 +104,7 @@ src_configure() {
}
src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant
ant.jar):$(java-pkg_getjars --build-only jax-rpc-api)"
LC_ALL=C java-pkg-2_src_compile
}
