Adding metadata

3 files changed, 86 insertions, 22 deletions

diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 79a8b0e07f00..b2544e5d7fb0 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -3,3 +3,5 @@ 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
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"
+}