Adding metadata

5 files changed, 97 insertions, 10 deletions

diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
index 127f5e0a4b61..22b271671b8d 100644
--- a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch
+++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
@@ -6,7 +6,7 @@ there are different space characters used in java 21 (narrow space)
          String expecting = "datetime: 7/5/05, 12:00 AM";
          if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
              expecting = "datetime: 7/5/05 12:00 AM";
-+        } else if ( javaVersion.startsWith("21") ) {
++        } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
 +            expecting = "datetime: 7/5/05, 12:00 AM";
          }
          String result = st.render();
@@ -15,7 +15,7 @@ there are different space characters used in java 21 (narrow space)
          String expecting = " datetime: 7/5/05, 12:00 AM ";
          if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
              expecting = " datetime: 7/5/05 12:00 AM ";
-+        } else if ( javaVersion.startsWith("21") ) {
++        } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
 +            expecting = " datetime: 7/5/05, 12:00 AM ";
          }
          String result = st.render();
@@ -24,7 +24,7 @@ there are different space characters used in java 21 (narrow space)
              String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
              if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
                  expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
-+            } else if ( javaVersion.startsWith("21") ) {
++            } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
 +                expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time ";
              }
              String result = st.render();
@@ -33,7 +33,7 @@ there are different space characters used in java 21 (narrow space)
          ST st = group.getInstanceOf("dateThing");
          st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
          String expecting = " time: 12:00:00 AM ";
-+        if ( javaVersion.startsWith("21") ) {
++        if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
 +            expecting = " time: 12:00:00 AM ";
 +        }
          String result = st.render();
diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
index dd01fef37fd3..0ed931834169 100644
--- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild
@@ -53,7 +53,10 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test"
 JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" )
 
 DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} )
-PATCHES=( "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" )
+PATCHES=(
+	"${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch"
+	"${FILESDIR}/stringtemplate-4.3.4-Java21+-TestRenderers.patch"
+)
 
 src_prepare() {
 	default #780585
@@ -65,10 +68,6 @@ src_prepare() {
 }
 
 src_test() {
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge 21; then
-		eapply "${FILESDIR}/stringtemplate-4.3.4-Java21-TestRenderers.patch"
-	fi
 	# Make sure no older versions of this slot are present in the classpath
 	# https://bugs.gentoo.org/834138#c4
 	local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 68125b9bbf5d..4b202bf1b541 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,7 @@
 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
diff --git a/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
new file mode 100644
index 000000000000..f3d7eb0760fe
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.3.1.ebuild
@@ -0,0 +1,86 @@
+# 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
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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-2.0.8.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
index 03965f330c13..8bddbdc05820 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.8.ebuild
@@ -16,9 +16,9 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
 	)"
 S=${WORKDIR}/${P}-src/native
 
-KEYWORDS="~amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="2"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
 DEPEND="