diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2023-05-24 08:19:58 +0200 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2023-05-24 08:20:26 +0200 |
| commit | b90523d874a4d3844bc6308cfe59c3708b2adb35 (patch) | |
| tree | e485304e6e10078ba28ee9b7a4218830d46508b3 /www-servers/tomcat | |
| parent | dev-python/tox: Stabilize 4.5.1 ALLARCHES, #907027 (diff) | |
| download | gentoo-b90523d874a4d3844bc6308cfe59c3708b2adb35.tar.gz gentoo-b90523d874a4d3844bc6308cfe59c3708b2adb35.tar.bz2 gentoo-b90523d874a4d3844bc6308cfe59c3708b2adb35.zip | |
www-servers/tomcat: removed redundant bndlib from the latest tomcat versions
Closes: https://bugs.gentoo.org/907032
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'www-servers/tomcat')
| -rw-r--r-- | www-servers/tomcat/tomcat-10.1.9.ebuild | 11 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-9.0.75.ebuild | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/www-servers/tomcat/tomcat-10.1.9.ebuild b/www-servers/tomcat/tomcat-10.1.9.ebuild index a2d0614c3733..c8f14587bf71 100644 --- a/www-servers/tomcat/tomcat-10.1.9.ebuild +++ b/www-servers/tomcat/tomcat-10.1.9.ebuild @@ -9,17 +9,15 @@ inherit java-pkg-2 java-ant-2 prefix verify-sig MY_P="apache-${PN}-${PV}-src" -# Currently we bundle binary versions of bnd.jar and bndlib.jar +# Currently we bundle binary versions of bnd.jar # See bugs #203080 and #676116 BND_VERSION="6.4.0" BND="biz.aQute.bnd-${BND_VERSION}.jar" -BNDLIB="biz.aQute.bndlib-${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} - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB} 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" @@ -56,9 +54,7 @@ PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" ) S=${WORKDIR}/${MY_P} BND_HOME="${S}/tomcat-build-libs/bnd" -BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" BND_JAR="${BND_HOME}/${BND}" -BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" src_unpack() { if use verify-sig; then @@ -67,9 +63,8 @@ src_unpack() { unpack ${MY_P}.tar.gz - mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" + mkdir -p "${BND_HOME}" || die "Failed to create dir" ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" - ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" } src_prepare() { @@ -94,7 +89,7 @@ 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} -Dbndlib.jar=${BNDLIB_JAR}" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR}" # revisions of the scripts IM_REV="-r2" diff --git a/www-servers/tomcat/tomcat-9.0.75.ebuild b/www-servers/tomcat/tomcat-9.0.75.ebuild index adb21d22de91..0f810b30d6fd 100644 --- a/www-servers/tomcat/tomcat-9.0.75.ebuild +++ b/www-servers/tomcat/tomcat-9.0.75.ebuild @@ -9,17 +9,15 @@ inherit java-pkg-2 java-ant-2 prefix verify-sig MY_P="apache-${PN}-${PV}-src" -# Currently we bundle binary versions of bnd.jar and bndlib.jar +# Currently we bundle binary versions of bnd.jar # See bugs #203080 and #676116 BND_VERSION="6.4.0" BND="biz.aQute.bnd-${BND_VERSION}.jar" -BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar" DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" 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} - https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB} 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" @@ -61,9 +59,7 @@ PATCHES=( ) BND_HOME="${S}/tomcat-build-libs/bnd" -BNDLIB_HOME="${S}/tomcat-build-libs/bndlib" BND_JAR="${BND_HOME}/${BND}" -BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}" src_unpack() { if use verify-sig; then @@ -72,9 +68,8 @@ src_unpack() { unpack ${MY_P}.tar.gz - mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir" + mkdir -p "${BND_HOME}" || die "Failed to create dir" ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar" - ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar" } src_prepare() { @@ -97,7 +92,7 @@ EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},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} -Dbndlib.jar=${BNDLIB_JAR}" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR}" # revisions of the scripts IM_REV="-r2" |