gentoo auto-resync : 01:12:2023 - 11:06:48

5 files changed, 4 insertions, 173 deletions

diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 48466daaf17f..a68e2529f034 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,13 +1,7 @@
-DIST tomcat-native-1.2.38-src.tar.gz 439234 BLAKE2B 603a905db25b86792717023707598abb4da125ad16b7e69e4a48ec0eb9056bc0b566520d4df004566bbc15c8bcfe843992baebb6bd1c86b210ce9f0fc0733ca0 SHA512 973c0dc8d241827aa98f72026d4de67928344c221570abbb7f97380fe56a9ad602b159a5448c6048d88d73fa0ade8c1ab12df293fee513d0e4896847b16206e6
-DIST tomcat-native-1.2.38-src.tar.gz.asc 873 BLAKE2B 6b7ccf31b7b0b7ac9493c4751309c6b62c269332f5fd49a9df391846a140f2797e1587e3c644b4aa65fa6eef8dfea8fe19b7f5714ffb5ddcf836c601f281bc5b SHA512 b6a7c12ac7387c4ee17e5b5d50d588b16470874f70bcb49b96a25159bab8b51ff5a5dc7d33fa73c8eb33e673e2b947aad4b603b1e8755f7e186052763c2575f5
 DIST tomcat-native-1.2.39-src.tar.gz 438209 BLAKE2B 499e2221be7a3aac47950530b044242dd308e943cdffd4af29d35121b60bd9b7040a404e8a70320cc853d41e4a06b41cad66a87d665e3692791299a0f16658f4 SHA512 b90c72255406f48552025a2e78dbd8c30a3492be2c283875c86a0b4a0f1f71b0420d4f91fb5ba181ef29d528824b2d5dfc63f51ee68e8d04fe6e67bd89e397f7
 DIST tomcat-native-1.2.39-src.tar.gz.asc 873 BLAKE2B 59976744119c03771b597d3d4f5d84a5a9e5feb81c0efe351e827b5e06e84c8adde8407ef4d27ec3b201763806e74804a51e9a209641c127328d44b79e22351e SHA512 78144c9ce5d5acc9d051b6d41fff2016d37062a11011ecad8ba52569c910efe5bcd5f177e576601ab4e7f7e53ce9dfe54f6a2c42cb87651ca5c2fedcf284eb21
-DIST tomcat-native-2.0.5-src.tar.gz 539017 BLAKE2B 405a4064bcf49ee04a7670c516adc64b19ebebbbfdc50735952c057d36b475c785bd9976778f491796b3fce5bd5aa158199ec624f20e8adbc65f920974543533 SHA512 03ed1951597bb6a6ade8d715546a0d635d261381737abd27b63aa552c69f9ca49405d0252b6bc2d878bfd64e87439f146ecd84ccbfc82661ba16379c493615a4
-DIST tomcat-native-2.0.5-src.tar.gz.asc 873 BLAKE2B 2e043d011f482ab963088441a37d2cfddec973253f7c909a747afac71393b76bc2e33ff37e9a18e8f9b6caac8ba86ab3a076ea722577416e4b409d8e44d56e24 SHA512 22a87c14c31bc62383cfb227e8dbd106fe017f84d802ec0e4d22d48af6ad4dd0d020bc59bed3a8335e2b4b15e0fd44ec3a4062bf86c73bbf00151c4ff0d12d7c
 DIST tomcat-native-2.0.6-src.tar.gz 539277 BLAKE2B 4a1ee7a87ff72b449a3638d38cdd40185e02ee09aa8ee9ea26ff6cfdc3f54b1e8aec6fb0296b51f8a72a72de7a9c504410d1df4d3547b709deebfb005ebbdd01 SHA512 d714fb96f880d0d565c58d25bb803fa9a144a6d87e825ad8d00aeac833b40a5512f888b94b3109853f8ee28b176b24fde95fb2d2a70ce65181a51ca7fc60cdab
 DIST tomcat-native-2.0.6-src.tar.gz.asc 873 BLAKE2B f78fb9c67632fc6fd6768fb699fa4c875db0364537ef41f6aa8c099eb05260a43ed7e2dd7b0f501c6814aff3b7d0928f318473ba78bfac7bcac3092952c08edc SHA512 6601bb1f731ad3b8ef1dbd6d2522952223d794568d42cce363ed95e05e641b2c742ed696ce65d546fcb3d0f80b362befc9cdaa060d1bd77beb90749c3a417a08
-EBUILD tomcat-native-1.2.38.ebuild 2156 BLAKE2B 13a0d01f3fa040843ddee2a13d865120559ef59bcbd42f221aacd7a572548ebac6be88241be14817add076107d167a90bac66aac8a5c49f67eb76e03e67a2451 SHA512 6ac5f17387791e2f4150ffb4692dddfaa6305744f9ab8579b4af29545da1132d4870aa1d3336988dea7465b6e487439044c9aa7463c672f878559eee5c5be8ac
-EBUILD tomcat-native-1.2.39.ebuild 2147 BLAKE2B 1247c16427ff7aa6b16914b9d29a8579d693fc909b93c6b8491cd7a13b9fcfb11258cb3a2e4cbfb34e793bc4ba7da915bc843c780e46778b786d4af442c9df50 SHA512 88595f1df6f611ca67000677a1f2d3b6acaafb241af3a91efecc8ba1068f7dcb3f92eabf691451fc816bf9815c5b2dcbdd7faa71d08264df72363bf4096b20d8
-EBUILD tomcat-native-2.0.5.ebuild 1974 BLAKE2B 3f2a64806adebb45a3c3530e418ad2bbb92a86ce1c934f5fcd1dd410249fcd01a3c68c3ea9f1194859fcd266c2d74bb6db995efc277aeea890948e66043918fd SHA512 5bf5a104946943de138ff278fac400d636f57571aafd7e8bc9fee240a12d6d83c4c2ee7382a356f4b2b973ef9e8574d443ad28df04c80957e9e05f95f1d79407
-EBUILD tomcat-native-2.0.6.ebuild 1965 BLAKE2B a90285b95c944ac9457dbaeec82c795905e23eb4230a0388fd369a9b589443a91f64a7c78c2366e2fe858f7b7c5a1d4b6801d4091d537f65a11672fbd1efd9a4 SHA512 5db45f7674cf991ac925c0d80f579d2253a090631ea15b8142261851f74f4fd2e3569f68343718f67627d4e69f84fec128499d309f01b0443a324f34d8aade9b
+EBUILD tomcat-native-1.2.39.ebuild 2146 BLAKE2B 9c99bb18856dbd741b1caae954437dcc49e288194fed98af8ac820f862a8ecabd7928222a5447299a9cc18ac2bc1c09ea6fd68345aa4de7427163c1912d97192 SHA512 d19631cd46ded750fce4d76193021408082556feb350e9d79ae4a70f10d4ea5bab33971d5459797d893b107f85ec535196bcc65109a74d8fee9009c6928f6455
+EBUILD tomcat-native-2.0.6.ebuild 1964 BLAKE2B 99aadb668c45fd8d805d32c86f607178ebd05364034e23c88cad331f5f5c7398eb47e7680754d39ca80f1bdc1ad131a52029cdcf77918c506708cd73b4947265 SHA512 4c2bc42abec62e65c67572d4564f2318e4d16b76cfbe4604a5f2d41b5dbc38196d596efcdebb6652de16497d1b81c115afa52ad487405e20922f5acd7649aff6
 MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild
deleted file mode 100644
index 13489020d644..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild
+++ /dev/null
@@ -1,84 +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"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit autotools java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? (
-		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
-	)"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="
-	dev-libs/apr:1=
-	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
-		../build.xml \
-		| sed "s:\${version}:${PV}:" \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	default
-}
-
-src_test() {
-	# Adjusting "String testFile =" path in TestFile.java:29 to match ${S}
-	sed \
-		-e '/String testFile =/s&test/&../test/&' \
-		-i ../test/org/apache/tomcat/jni/TestFile.java || die
-
-	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso .libs/*.so*
-	dodoc -r ../docs
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
index 171f99f2468b..5d246c6ecdab 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
 	)"
 S=${WORKDIR}/${P}-src/native
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs"
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild
deleted file mode 100644
index 31e7d134cca8..000000000000
--- a/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild
+++ /dev/null
@@ -1,79 +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"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit autotools java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? (
-		https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
-	)"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="2"
-IUSE="static-libs"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="
-	dev-libs/apr:1=
-	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
-		../build.xml \
-		| sed "s:\${version}:${PV}:" \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	default
-}
-
-src_test() {
-	JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso .libs/*.so*
-	dodoc -r ../docs
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild
index cdae6f3d9fd3..be927b30c60d 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
 	)"
 S=${WORKDIR}/${P}-src/native
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="2"
 IUSE="static-libs"