4 files changed, 104 insertions, 32 deletions
diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 33869d85aea9..64a099a6d195 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,9 +1,10 @@
 AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb56868dce428da1347ab91f7fc8e1230b6aca3e82806c80b23a038966f690a16f99b43b5b2594bca543cb606 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e
 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.10.0-tests-exclude.patch 910 BLAKE2B a9d6c8d5a84e3fd456887d001a0c3d737039f3a1c6dcc54d4d91fc08ad130d0a8bc03ad327539aa6cd629bd1393b5d711da290b28f4a29f3e929b127880739db SHA512 222ce31b49eff19e4f5158d0c80dda2ed518817d2d681ee0f983cdd870c80fe030e65c5d008900184aa5f48f3980428f16fdefce59fea543a4aa5bfaf5bdc3a5
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
 DIST jna-5.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
+DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d
 EBUILD jna-4.2.2-r3.ebuild 2140 BLAKE2B 02bf4fa0fddb60ea509a042244e6d450e0827b5002a01d55438028c3e9b67bde5be21bfd3ed11b0ce90faf7f19397bf6f1f6b890ac5a70d2dcc06e59ba63ba98 SHA512 e9b8ba2522bcd0582f8c29eaf7b8b66a687ddf3c28c07d13b8b2e0a9d666efeb7e51d399f57c26e6f178fcf0ae279e272455083663ecc729ef3b0ba4e8c2c885
-EBUILD jna-5.10.0.ebuild 2499 BLAKE2B 5592719659b88ffbd692db79e4144024a2d3eebfd19d76c7910b11a204d1900deb3a9d24f2eb0e51b472c2788672a355ee7be5313c569c467e21d223c351c79d SHA512 6a79910d2b189397d826e021d39a449dc445690e1e2c6d51472ce91cf86a9106a2e447aba7f6e8a2e271478ab2f4ed7c6c8624dc337d70d049f56d396ada78b5
+EBUILD jna-5.10.0.ebuild 2463 BLAKE2B e7d4f12b13feb036bc0b17613e74a87273c1872f9690e0aa8420e9f622e4153f920760d7a4257e11d6426d49717e4e72ba09a9c4af3b9ff5bc4bdaa14b394da1 SHA512 6d6288af5598eae79640ee0c2872f876046ca180fb24878898663b1f58619c609fc28fa93c3032fe30646b9739c666c5c0cbe9881326cfc0c95c016929da45e9
+EBUILD jna-5.11.0.ebuild 2464 BLAKE2B cafa1c0301a3c5e0135ae0b521f7e762547d2152ef28cac0573e2d66216893839402cc2bba2a8805ecaa75a12682ff2f83f7407f70ff7147e62ead149d36962b SHA512 33f2bcced4969921bf9d02df5d02412376678ec2a49c21379fc9cc48aca8f768b5d0ff4f4ae2a1cd57cf42a8335f5825c4e98edaebd962bd71e8527e9f75e16e
 MISC metadata.xml 463 BLAKE2B 9ead7422212fdd6bebd8ec6aabafcdedf0d32420d312a8a0f2cd701dc7eeb940a30e91d1dc0449899a6134e1cb96d47cf95cea5dc20b4974b3d8714c6c00f93b SHA512 1365756d0d98cd7e7bcee2a608a77f1ca95c9546567a0bb37ba0033eb997ef6ae37d86e79c7c7fdc0916cb515658f9a37924181efc3215d00c825b10f9f99b45
diff --git a/dev-java/jna/files/5.10.0-tests-exclude.patch b/dev-java/jna/files/5.10.0-tests-exclude.patch
deleted file mode 100644
index e608e2087f44..000000000000
--- a/dev-java/jna/files/5.10.0-tests-exclude.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Thu, 6 Jan 2022 12:21:22 -0800
-Subject: [PATCH] Skip execution of test classes without any tests
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/build.xml b/build.xml
-index ed104c2..9fb15ae 100644
---- a/build.xml
-+++ b/build.xml
-@@ -1388,6 +1388,9 @@ cd ..
-         <fileset dir="${test.src}" excludes="${tests.exclude-patterns}">
-           <patternset includes="${tests.include}"/>
-           <include name="${tests.platform}"/>
-+          <exclude name="com/sun/jna/DefaultMethodInvocationTest.java"/>
-+          <exclude name="com/sun/jna/ELFAnalyserTest.java"/>
-+          <exclude name="com/sun/jna/PrematureGCTest.java"/>
-           <exclude name="${tests.exclude}"/>
-         </fileset>
-       </batchtest>
--- 
-2.34.1
-
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 3f90c302433e..1d15c940f056 100644
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	dev-java/ant-core:0
 	dev-java/asm:9
 	test? (
-		dev-java/ant-junit:0
+		dev-java/ant-junit4:0
 		dev-java/junit:4
 		dev-java/reflections:0
 	)
@@ -46,7 +46,6 @@ RDEPEND="
 DOCS=( README.md CHANGES.md OTHERS TODO )
 PATCHES=(
 	"${FILESDIR}/${PV}-build.xml.patch"
-	"${FILESDIR}/${PV}-tests-exclude.patch"
 	"${FILESDIR}/4.2.2-makefile-flags.patch"
 )
 
@@ -54,7 +53,7 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml"
 EANT_BUILD_TARGET="jar contrib-jars"
 EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true"
-EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=${T}"
+EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
 EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
 
 pkg_setup() {
diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
new file mode 100644
index 000000000000..be8f367f117d
--- /dev/null
+++ b/dev-java/jna/jna-5.11.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.java.dev.jna:jna:5.11.0"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="Java Native Access"
+HOMEPAGE="https://github.com/java-native-access/jna"
+SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+CDEPEND="
+	>=dev-libs/libffi-3.4:=
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/animal-sniffer-annotations:0
+	dev-java/ant-core:0
+	dev-java/asm:9
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+		dev-java/reflections:0
+	)
+	${CDEPEND}
+	x11-libs/libXt
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+DOCS=( README.md CHANGES.md OTHERS TODO )
+PATCHES=(
+	"${FILESDIR}/5.10.0-build.xml.patch"
+	"${FILESDIR}/4.2.2-makefile-flags.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml"
+EANT_BUILD_TARGET="jar contrib-jars"
+EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true"
+EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
+EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \
+		animal-sniffer-annotations,ant-core,asm-9)"
+
+	# Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS
+	# could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the
+	# variable's value, so define them in ANT_OPTS instead
+	ANT_OPTS="-DCC='$(tc-getCC)'"
+	# Parallel build does not respect dependency relationships between objects
+	ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
+}
+
+src_prepare() {
+	default
+
+	# Eliminate build.xml's dependency on bundled native JARs
+	sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml ||
+		die "Failed to delete lines referencing bundled JARs in build.xml"
+
+	# Clean up bundled JARs and libffi
+	java-pkg_clean
+	rm -r native/libffi || die "Failed to remove bundled libffi"
+
+	java-pkg-2_src_prepare
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar "build/${PN}-min.jar"
+	java-pkg_dojar "contrib/platform/dist/${PN}-platform.jar"
+	java-pkg_doso build/native-*/libjnidispatch.so
+	einstalldocs
+
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc doc/javadoc
+}