gentoo auto-resync : 15:08:2023 - 12:15:20

3 files changed, 88 insertions, 23 deletions

diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index ee1cfb0c8d44..60847eca80bc 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -4,7 +4,10 @@ DIST tomcat-native-1.2.38-src.tar.gz 439234 BLAKE2B 603a905db25b8679271702370759
 DIST tomcat-native-1.2.38-src.tar.gz.asc 873 BLAKE2B 6b7ccf31b7b0b7ac9493c4751309c6b62c269332f5fd49a9df391846a140f2797e1587e3c644b4aa65fa6eef8dfea8fe19b7f5714ffb5ddcf836c601f281bc5b SHA512 b6a7c12ac7387c4ee17e5b5d50d588b16470874f70bcb49b96a25159bab8b51ff5a5dc7d33fa73c8eb33e673e2b947aad4b603b1e8755f7e186052763c2575f5
 DIST tomcat-native-2.0.4-src.tar.gz 318845 BLAKE2B 44cd99ff52d5b402c2d8caa6819e2e420c84399f7f3cc0be38cd2a40985ddaaf89093005454527976ad2cf083c90d39c9c4d600671a8e5c7c07d0834b23d93e0 SHA512 276133e44ae9f9d3e853b66120937865c675eed6dd6b5b7d8a94ef741f037c0b3d99a6c065a1303c0ca42b65c109aef35b6bd370a2af0b7b2752eadf85b1d880
 DIST tomcat-native-2.0.4-src.tar.gz.asc 873 BLAKE2B 509c63dce69c767d3dd694d7994c8b2cbb4f84d40095ff89373a165d592449fc028402b17bf0e25c9ffe40d5ca8383cda50703054fcdfb2fd4cb36bdcecdff0c SHA512 80768307fd1d46ca822151977b3d9fecdb3121929e97338a78c39bc439f914694dedbfff087cd512f986532567734f04422b4764ea215ad5dbb0319380fa05d2
+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
 EBUILD tomcat-native-1.2.37.ebuild 1193 BLAKE2B 4dc4ce63f539bb24d6750adfc1fe24b2f3f64470c5b0d16eb2faf69bd9a9d17692b86d23dc643004b4d7a6dacaf22405fe9f10e9a2e46a107875bbfbc53bff17 SHA512 77aaec34bcd9172b57289f8b0a02e82bf29ed385e21be352b959162241944593a15efa103c4a7704019e71be2fd9c24d3e95ec78198d489705de78046d0ddc4d
-EBUILD tomcat-native-1.2.38.ebuild 2734 BLAKE2B 2d09b093c165e8ebd86d3fec46d09dd2b532317523d44ffb0521f814d42bf64a11e0010a132897b62ca45caf8423a001c456c5afa9788659385ee6db950342c7 SHA512 f56c99281c55366752b2243f2a6332192346bacbb6ace6ba96c49ca8ccd6449e6cc09830d6975c1f71f782cf7136a22af054641e57de22bdfc92a066733c992d
+EBUILD tomcat-native-1.2.38.ebuild 2165 BLAKE2B 48b5662cdb530a4fd7733f8e38af9aa71f445abb69af2ae516517206a45e36e1e5705fef654c06e92fe6849ff42b5842de3e2ea4bbef61d2c01cb2a268ef1bbd SHA512 8c5ce9e4151c1f7ef9b0c80bb707950506568aa75fba40aad23ad5d1263706cd648b986056e9b6d73019b1687a7cbf99d77dcc2509533136823d53c8bec6c0b9
 EBUILD tomcat-native-2.0.4.ebuild 2168 BLAKE2B ecba20a3e0a5c3472c93a639019a810f99660e6b0bcc6280d0c712f99dee71ba53e913145680000e3a59394c636f7c83444dbfc45eb19913d3491236e20d1232 SHA512 bdabcb7c4fe756a4ed6d051bfcd1ed8409f147c1ba5aa5b2e0d90f19083b1ee2c7c1cfb982879f31ef4c57e98b6a014ff8ff2c4bad3f5d4b0bbc65bf7df4acdb
+EBUILD tomcat-native-2.0.5.ebuild 1983 BLAKE2B 2411e33b77ed7e0a99df81438af4cc8eedabe60f6c734691ee3724534eda7e4bf7dc7acec6b963977f752f683f29c36c70c0e5ce72b8dc36eb9cc22c6d92efbb SHA512 c0ced4237ce01a13db2ddd8d690c1cb9aaccc70d2b30b093f3e5f51d7b8ba8282d32b1021a71e6b21b87270bab3c8f5648aeb48a075e2ba404d172facd3cab67
 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
index ad19397c09bf..ffaded131e6c 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.38.ebuild
@@ -37,10 +37,6 @@ JAVA_SRC_DIR="../java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 JAVA_TEST_SRC_DIR="../test"
 
-PATCHES=(
-	"${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914
-)
-
 DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
 
 src_prepare() {
@@ -50,22 +46,6 @@ src_prepare() {
 		../build.xml \
 		| sed "s:\${version}:${PV}:" \
 		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-	default
-
-	# Needed for the slibtool patch
-	sed -i 's/configure.in/configure.ac/' configure.in || die
-	eautoreconf
-
-	# There was 1 failure:
-	# 1) testInfoGet(org.apache.tomcat.jni.TestFile)
-	# java.lang.AssertionError: File test/org/apache/tomcat/jni/TestFile.java does not exist!
-	#         at org.junit.Assert.fail(Assert.java:89)
-	#         at org.junit.Assert.assertTrue(Assert.java:42)
-	#         at org.apache.tomcat.jni.TestFile.testInfoGet(TestFile.java:29)
-	# 
-	# FAILURES!!!
-	# Tests run: 1,  Failures: 1
-	rm ../test/org/apache/tomcat/jni/TestFile.java || die
 }
 
 src_configure() {
@@ -82,9 +62,12 @@ src_compile() {
 }
 
 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" )
-#	jar cf test.jar ../test/org/apache/tomcat/jni/TestFile.java || die
-#	JAVA_GENTOO_CLASSPATH_EXTRA="test.jar"
 	java-pkg-simple_src_test
 }
 
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild
new file mode 100644
index 000000000000..23a2dec7f5aa
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-2.0.5.ebuild
@@ -0,0 +1,79 @@
+# 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="${BROOT}/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"
+}