gentoo auto-resync : 24:05:2023 - 09:01:50

3 files changed, 8 insertions, 18 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 509db5f5368a..51d8f89cb614 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -21,9 +21,9 @@ DIST apache-tomcat-9.0.75-src.tar.gz.asc 833 BLAKE2B bc590f3d5697da75a095be4e677
 DIST biz.aQute.bnd-6.4.0.jar 16303123 BLAKE2B 73cdeb9e63c04b41db26f91efc3b01fdfd7c8796d6b1f556c77f90bcdbe048f374b5164b885689f3e62ca45b8ca8b97fce70e1fa13d807d2f76869155c8ba7f5 SHA512 b113177f97894b0ed5cfbc38f96c995d6425e981ec8c7b27d99044793ff77dd2450367ad9ee977f443fba349fe1d68fc26f3aaa737eba0a402abcf29716b2e85
 DIST biz.aQute.bndlib-6.4.0.jar 3200265 BLAKE2B c8b8c1d0ff398e2a701edc4431cd8d65671a5e5daa0ef04be6b02eabb570768e0202640c15ce1290a5ae21bb31700a89f2822826851d7dc026267cb31da9f1ef SHA512 15a20751d879291c31b6530cb0d51652bf5bb33bf944ed703369eada439df6464190c01e2872ea6e7535209abd0b4692ea8980499d4b43edfffcc5729633c85d
 EBUILD tomcat-10.1.8.ebuild 5786 BLAKE2B 0dde89723c9e9ea059f846e184bfe502014a828e921a8b2d2df2204939aa53b9be4602c2b757cfc93fb36dc8e9ba18612a38a49bb527758bfb92737661ea182d SHA512 a5327a33f611f68e5582a22026452f8a89eff27abcf267e75c928aea078737ac5b44f179bf5dc6ef0436243f16b5226431d0ef03c6b8a157f835d5afc8f08503
-EBUILD tomcat-10.1.9.ebuild 5787 BLAKE2B c75a963504b636477be460f2fb1938b5ebd2aa757c563a2dab47c075b86ce9dbae54ac17f01fb88c4b53daf3a6b04b15567e6c6e3f06bc2dee5657683bf94f1c SHA512 1d3f73161a73c3a5513bc78b391eec20a4a332529fc9f2370581015a83404edd7e01f767c3126b4cd25392985d0b84a05f1825c70ed431af4c5056ee9734e92f
+EBUILD tomcat-10.1.9.ebuild 5421 BLAKE2B 2d1074057601778824ecfe8649fdfa07baaad33b411cc4b1185bf6ee00bcc8ab6c0b0def501b6ee451becd2c08e11363f8af205d68977d2a84b2ccd8ce1e1613 SHA512 37a01ca859b4f09ea4473d6b125bbca2351d5761e7b4bd61d458012ae3dcb9f7da52414363e7a34207c8aa6ddb46de0ff67af13d84e31daef88814b184538b91
 EBUILD tomcat-8.5.88.ebuild 4649 BLAKE2B 1e4b40f696dff7f9e3f8eceba242cf13059f90904a16fca5334e7705b5905f2ce14175eba2f9a8c4e6c88aec0668a96a90057ade846ce3bfa0d5c671efdf3169 SHA512 e531dd28399421d9cc78237cd36c70bcb21aa0d760d3e9375f5b2a20a08a640dba2854af9a67eff2501efc8f917fce7ef9b13d9f553902af7b47d81f675349aa
 EBUILD tomcat-8.5.89.ebuild 4650 BLAKE2B c16f87d43ded61e661d3ac4031e2372cbcdf6fca64afb0f7a76d1ab71bcf2fd73096b8afe5239b6efb103c2763b52805d52571ff3f9f133e6a8ffc1dc2e011e5 SHA512 7e213a31359181a6f2cae5e6c9836b0825fd2fd51a130daf83cd44b74f48374fea451bc48822da85128173e336438b6f0b1145aec9fd0606f6d03b0ea6515f0e
 EBUILD tomcat-9.0.74.ebuild 5648 BLAKE2B a2fec52af2982e3db8311388d8d46691aafa6c98da71683f4ab97d174bca7dd0c546975b8b02b02f1890020b75d92c231aa90539d7bf81e7e6a44a38dc1328b8 SHA512 6f7ad632749477699cea962d7672433209aaaa9bc6503de50aba362e1b5fe554e4478f9a6538712ecce035431d3edf5f3ddd9f927362abc3bec6cfe093bfd88b
-EBUILD tomcat-9.0.75.ebuild 5649 BLAKE2B c7bc422d705e483556207f7676b7ac172e98dca481c1dbc27c3abec0d7162d26df3ab3daad7a1ab3b696aeddfdce6f3f4b80b6e87affc16e5c82748ce13fb89e SHA512 de832d9cf3484e4912e0afc6898d7a19c0451adf5fb3c981651ec0c5b4a4f658759f62583e5af57d6cc3d41bcd57e71ba066a7749989b9144fc09c789d3b6c30
+EBUILD tomcat-9.0.75.ebuild 5283 BLAKE2B 0a40fb3e074ba2a56eb04acb84d22611133df96a664bc327daf06e74b307f5b04aede6de03b9649f35a6e2fbed9807616aeb769dd396c527e274b31e54c3d12d SHA512 ac201a39b93945b34e028d09b464baeda3898704dc1b8cfdb37e1206e88abd6f401b978b71a9e4e461d78cd032a7c797ed9ec9a6962908c4c8311623307dcfc8
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
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"