6 files changed, 71 insertions, 27 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 8d664861cff4..35180a9a161e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 643e687367c1..3a4a7fc8d937 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,4 +1,3 @@
-AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
 AUX 5.10.0-build.xml.patch 3325 BLAKE2B 9beb22ee4976bbac29e9ff79f5efedbe21e8a7ef93a83a37320fe327574844efa8d1a5ec1c9948df4dc7934d2be9b5635c4ce2b639b2af12f1eb7fc9100beef6 SHA512 4d22a080f85f7cc533db62c66ae77b3b56062624361f40e71dc7e41a57ddaaded05ca30e85b670805165347aa42e179c76f7d5ec0b558ab07b7dadaef0cfa64f
 AUX 5.11.0-makefile-flags.patch 1183 BLAKE2B 81c465ed4929586787bfa68016a8fe61cf082a8a5e59f5905b3bfae4900f68246cf3ad9c023ba7390c4bed4e38b109d4664e6a4f9759c8247714a65c72a0b357 SHA512 cb71b1af9af8b34d2ec8253ee7543614474527b0bc69ce9ee70e89a8738d423e45928f477de659bf141aad8b0401067fbbc58b50b580077afca40b32e0aa8db4
 DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d
diff --git a/dev-java/jna/files/4.2.2-makefile-flags.patch b/dev-java/jna/files/4.2.2-makefile-flags.patch
deleted file mode 100644
index 3e290ece4e78..000000000000
--- a/dev-java/jna/files/4.2.2-makefile-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/native/Makefile	2016-03-16 14:37:28.000000000 +0000
-+++ b/native/Makefile	2016-04-16 22:27:06.426345376 +0100
-@@ -81,7 +81,7 @@
- LIBSFX=.so
- ARSFX=.a
- JNISFX=$(LIBSFX)
--CC=gcc
-+CC?=gcc
- LD=$(CC)
- LIBS=
- # Default to Sun recommendations for JNI compilation
-@@ -94,10 +94,10 @@
- COUT=-o $@
- CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
- CDEFINES=-D_REENTRANT
--PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
--CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
-+PCFLAGS=-Wall -Wno-unused -Wno-parentheses
-+CFLAGS+= $(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
-        -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
--LDFLAGS=-o $@ -shared
-+LDFLAGS+= -o $@ -shared
- ifeq ($(DYNAMIC_LIBFFI),true)
- CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
- LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index e9cb1edab379..27c51e0397d1 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,7 @@
 DIST tomcat-native-1.2.33-src.tar.gz 430359 BLAKE2B 2253907b5e3e0121ad520e1a5938cd8ceea55bd1403d320d382b959a0885c7e9374afb2b1828714d2f028dc0bfe6b6010d493e1e1b6d45942b4d27321d79614b SHA512 b9ffe0ecfd14482ed8c752caf2c28d880ab5fca1f5ea1d5b2a8330d26a14266406bdecda714644603ba2d4ca78c22ec5fc2341afd09172d073f21cf5a1099a0f
 DIST tomcat-native-1.2.34-src.tar.gz 435320 BLAKE2B 7b4f3feb36c1e4db36a67db835ab70169e64173674b0089fe844cd40b99b1a3a87c8b9f774b0df55689f1ad1e30b5606e8056a3e1707c929dcdbb8f25cc9e47e SHA512 03b167fdfaa16db6a0f3acd849b9dfed33aedad2316de6a2aba57b6b11ef4055790e8d96a66f14e6d5ce2200fafdf80b3e8ca0e8f206e4f28de841d8b217787f
+DIST tomcat-native-1.2.35-src.tar.gz 436593 BLAKE2B 808ed0396e421609092f9e59676a55501e67fef7b0ca466ad15e4fe11cc88abb8b07043364c63a53760052a6258585aa13a53378c3fb8823bc8349371ad12245 SHA512 a290eb0cd940e1f8de0caba72517d9999d4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d
 EBUILD tomcat-native-1.2.33.ebuild 1182 BLAKE2B ae624184e321f4eae4a1c26f028e230af06bd37f12a26bf86a3b143f29869408c7371b3f296ddbece209c968de2fef24b416ad71cd22c36d499493400ed1df08 SHA512 91222f3794cda0de3532af0f9e5d564e53662de5c73537a3b8e787e09dde61d43f6c03bf516d389789a01c2396d9607c85e44255017af74a85af0d0abcee68c4
 EBUILD tomcat-native-1.2.34.ebuild 1183 BLAKE2B 72151cd98fadc6c5b01b6d41335aa922546a866e67959b85429941a3f14279a7008251b60e511d69a01d71cd0936366b247cd826d3a457176d5461a7afb97541 SHA512 372060e6f4641fe0886a9f1a43788722c12d49c6497d52c277f1edab3b31e59b1cefa38873dc77c60f03b81bfde5d3ca201b50c2e8f5696f0bd79dc2b216b306
-MISC metadata.xml 807 BLAKE2B 38715d09df2df7390b4f1bb3179d2d5cb65874f438ea434cc30e52aa8068ae9d9fb60f147f69cda6300cef97aeaa8eb950c55027f5cc3ca67f9afdaf0457b21a SHA512 fc6ae086e1855089491a9ba0b1abb007005a15eb85b5b213d8d36451ff10968dbd810f229795dc384e0e48ab1b9dabffacac333397c4b526c5490de5f99d7d5d
+EBUILD tomcat-native-1.2.35.ebuild 1194 BLAKE2B 720b2088fa3f5c9deded920fe39b1677d3182b7c725e86ff7156b1ad0dc4462b3e1afa50a4e6fd8877fad48e10f37e6c76817ff9f719fb824e670e076c5a307a SHA512 6cfe786a3d574f87b6210b219fe6fe857deb3d6777ec642e196be7e7538332051ef19f79ab847ed37a3c3efc793f1e598b3c2f737127c45a7fbba4afeafc5c4f
+MISC metadata.xml 1104 BLAKE2B 5bce2696664ff1e64ce88f36ef119c11f9b9aa4ce3996c9da8161e5752734efe1e3e6164b0ca80a529b285add041ee361ac343644cc267b543303c2cada33f3d SHA512 aecd35036f1f9b6f48477031e743971c5e2a8018a42d2075666399e4c31c3c58e22886150f49468502dc3024dbeb6aaa8f64de7827dc54611f7b2603832fb667
diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml
index 869bfa356ca5..4b8ef469c364 100644
--- a/dev-java/tomcat-native/metadata.xml
+++ b/dev-java/tomcat-native/metadata.xml
@@ -15,4 +15,10 @@
 		generation, system status, etc), and native process handling (shared
 		memory, NT pipes and Unix sockets).
 	</longdescription>
+	<upstream>
+		<remote-id type="github">apache/tomcat-native</remote-id>
+		<bugs-to>https://tomcat.apache.org/bugreport.html</bugs-to>
+		<doc>https://tomcat.apache.org/native-1.2-doc/</doc>
+		<changelog>https://tomcat.apache.org/native-1.2-doc/miscellaneous/changelog.html</changelog>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.35.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.35.ebuild
new file mode 100644
index 000000000000..c55972724571
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.35.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2
+
+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"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}