gentoo auto-resync : 26:08:2024 - 12:00:09

5 files changed, 4 insertions, 175 deletions

diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index cd934d8818aa..e80a62be1455 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,14 +1,8 @@
 AUX tomcat-native-1.2.39-slibtool.patch 829 BLAKE2B 2af44125d0ac68f8fa23c4a48456646401608980775d2631f9b82c16b0596222b04ecafd2914d95fa01c6fc460de602a0028ef2d58f0a0d77c95d2c81a0145db SHA512 89bdb82f5cca2a32be8cfa4c72122d0e713eea099d081faa8ac5b4af8127a4d36913ec6a2c172511024b223f34fdfcc6c1d1550859a0e96d71820a6997efc078
-DIST tomcat-native-1.3.0-src.tar.gz 345276 BLAKE2B 73e8433e12bdd88036509f4ffbd2c0ed25b367567728829a56918d082627d43643865c492f4bc8eac4551e2ed82648ada71e6decfb45c173a856ab2fda6e01a5 SHA512 5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433
-DIST tomcat-native-1.3.0-src.tar.gz.asc 833 BLAKE2B b7e05447643000ffda0d66143c199192b41843f10ae89874c353d613f612a6d481be3081aa971b640a3bedc6c903be7d052c418e2abc2d7d6db42924c7b3cf91 SHA512 9cfc137cd13086ccf421376a006164e6e6e14844636457db0cf7c0f699a1b1ceab28a52bd80da71dc9e190bdf84676abfdbe07a0cabecfc59b7845ac82a171e5
 DIST tomcat-native-1.3.1-src.tar.gz 346588 BLAKE2B 3b979845dd10a0c74c7ed2e6404b217c7bdebf2d432ac904b50f8288cd3cf3b1489b4e5111ce02eca442c45deb805523062862225130386a6d47853cd972d788 SHA512 06951c67d2739ab9205a537d24345e13e4472f192602fc52015ea84612c6e2c9334404b30a82be7d1e7d4ce470ea9df8b1b8ca1a3b8674d82706ff432280724f
 DIST tomcat-native-1.3.1-src.tar.gz.asc 833 BLAKE2B d7483efea5dc4d9cc069a667896950526e22a6b4b0ee1fd6739754196d1b9e84a2b16f766f68419faf2c3fcc87d1fa83c9985de7149849d4f761d2c5b7e45af7 SHA512 3550e38556dab5594aea469cd8ae43505deceeab25bf60ecd61c26ed1106ce88e35634f936cb36e7fc766f30b5c5f0f19dd01a1513ed219ae7f68c8c10e960f1
-DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85
-DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605
 DIST tomcat-native-2.0.8-src.tar.gz 471386 BLAKE2B 7fb5e3c4671e4b56bfa5eb546ac1f87fdf1e33b350533ffcadb9005c1f3054013d61d15f4212923d9ec9370d15fd2717e2b446c80818c82d83cd9f1497e321c4 SHA512 fd45533b9c34b008717d18ed49334c7286b93c849c487c1c42746f2998cc4a6ff0362e536a8b5124c6539847a92a9f7631c7638a21cd5d22134fe1a9bb0f0702
 DIST tomcat-native-2.0.8-src.tar.gz.asc 833 BLAKE2B b438034baf5191ce2af55087d1fcd55f196c3cfa75dc2c7fc9d1bfa8fa5b5289181dad6a02e55674e7d685482228df603478ba1f73a9b67169f50390cdd198a7 SHA512 64879cd6f02a6213a2b6cd102dc175d968a7c20bc821877e9f6f5bbaa11069e5cb672b584c47e3a7563a6c872d56646535a59e42331a2ad524c7f85e628085df
-EBUILD tomcat-native-1.3.0.ebuild 2210 BLAKE2B 34fe48c4c0fca3aa6c7db823ca2fe2957bf6f664af78ed0107164bfae6eefb2db4697817cb8dc3d7c695573535d905362e32b858715041c0910c0b38db14846a SHA512 f26273200fc7b14db5c71fdf6ff20f19ed802355736bfbba067ab5a02247de93617a67ceed14350ddc62b43a84407144e8194aad7a464dd4cdae7c7e55a6c4e2
-EBUILD tomcat-native-1.3.1.ebuild 2211 BLAKE2B 532b7197fc277f5abee07feb68546fcf288029788cbb0a0d226fd526cec4d8ca99867e06099a2e16f2ce6c70e8f5f56a4430c865ff43bbfd0ac73973b7a2992b SHA512 5175785147aa997299eb5bb07de853ecce0b5524bc9bb06bf18df8c4c26e9449dfceff2ce83874cc185bcd09f88774a9740929b30aa5939a6915987cd307c92c
-EBUILD tomcat-native-2.0.7.ebuild 1964 BLAKE2B 20268866489e1a85e741358b2fea72449b1acb35a00cfaccb8483d8025579450c61762ca4547616148dbdad89a14cfaf7c8457342f4748619cb7a07cb7670170 SHA512 dcca9bd56e243dd7c6d619b0dc2659ffe6d4a2a808e02af06799f5640e6a0fb54d16b01d7744b4d382659c67731dd8db7c7bdca849a1ee643fa19ad9235c8d73
-EBUILD tomcat-native-2.0.8.ebuild 1965 BLAKE2B 5c52f6a9f0720061cd6678980a0f7ea9a1488d2438694261cdb38afb9c20fd86535cd5b088cb49b6744a7a16da0d35671d279cef7a1adab131c5d7b919f0a8da SHA512 af02bfe3059d88f2e2ae6e24bae5a58022abb10423f7f58f6d30f752ed58677509dbc6c96cc0e170d1e96c8ec6a6d6ea38aacc8478a8956caad2e5ae5bbabab6
+EBUILD tomcat-native-1.3.1.ebuild 2210 BLAKE2B 1a5ff679d8c8dabe6332beec707c6c72676181a95e38204fa2ec63b7dbd2f8616e75e106ae615845de7772aeed742bb903a4a5af93e851d3ef59cfcf503807ef SHA512 1824f6c125e2a2c824ef24e3d233ec1b97a149b73f1ab97bc8c90c3606406067f7458ea8aa4a8983c14d9efa69067f7761092249a2c45a856d3beeaa52e56181
+EBUILD tomcat-native-2.0.8.ebuild 1964 BLAKE2B 447f048bba12b519107abf43163b7a03b55a4d978617e50bf50cd17e4dfc2e7a6ccb8f892804cab3e6c261e8bb5a5be8cd7cad12da0c43547c2717bfa33960ec SHA512 87faf87a03882e7dcc302e2e448493357b317ff5d81405f5369bbc9aa9f30c80ae63da37c6494c33dbbb90194660f8cbc5f089c15f7f4a6631fd5452b6745c92
 MISC metadata.xml 1096 BLAKE2B cc5973c26004db986d1cd7020212163380883cb3b01ed08b518d87abaf43a1e875de226064a123b9a5792e0e2285e70eeb50234654049ad22d906c4c5c454928 SHA512 f19053a4c75f84fa8491aee4f74d7334e369bb38125c69f6c839d37cc3b6c90ce348039845a3635d0b637b50c379efaee22dd811c46c49645fc6f8192e7a01cc
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
deleted file mode 100644
index d560c27c933d..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 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 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/${P}-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} )
-PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" )
-
-src_prepare() {
-	default #780585
-	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.3.1.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
index f3d7eb0760fe..f4e9d9bd6779 100644
--- a/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P}-src/native
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild
deleted file mode 100644
index 9507ee4750e0..000000000000
--- a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 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 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.8.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
index 8bddbdc05820..7dbe994033c0 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P}-src/native
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="static-libs"
 
 DEPEND="