gentoo resync : 28.04.2021

3 files changed, 3 insertions, 93 deletions

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 618ed87d6a09..c5c525091195 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,7 +1,5 @@
 AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb56868dce428da1347ab91f7fc8e1230b6aca3e82806c80b23a038966f690a16f99b43b5b2594bca543cb606 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e
 AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54
-DIST jna-3.4.1.tar.gz 35285043 BLAKE2B 192f893f25c692a80d8b3ea0b469e951ef45ea561a02f1ec2ac8292f37ac32df468c7bb04211f1009314da4d7acba8ab9220114980b3f30b56af5f2310d5a18a SHA512 8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
-EBUILD jna-3.4.1.ebuild 2264 BLAKE2B f187ffe9f1bb1040a145d08d453491ae715d2bd65a87968594e8e7789368bc65410ac564e998f05376099d22e5a912f7208b9d2a2204a88a7855f702dbb27a4e SHA512 a0a991c9ac5eb44d5084bc6b9914ae806504cbc59f75b41c9dd5cf9a1b975da4266e03479f4cd3dfac1f9905298352acb0b35ca5a722476bf2278fe5f8b348b1
-EBUILD jna-4.2.2-r1.ebuild 2074 BLAKE2B 369a4568ef98b6d6f5a343f51c8ed1f9dee9d8187e86f9390a55abd79341d9ba83ce7e2876683362e5ed7abd1caa174625ba533ab76ea21b6195e2617a6acdf4 SHA512 a4fb2be3fc96748dee4a18d87d201651cc5c22effb4014882e6836cae5a18ae866f2e5ea8d18973bccea51650a0964b9bef4da745a5f24555a0e2178dfef38ec
+EBUILD jna-4.2.2-r1.ebuild 2067 BLAKE2B 52a6ea3ab351e026ab5fe519abdb6f78cf8a2cef57e02c64334e3ff3223b41321a4d5dc48fa2c5d5886b1e42925300e11f8d9860116217ae6b1fd1f0e20d09cd SHA512 e740f2c8c89c1c573e98a76dec234c54e3b68f8c7537ee18d695f803ef2fad3a341a887e93dc2ddfec89367405076f582e823ae2af2bdcc8d827a0ca698ba41e
 MISC metadata.xml 462 BLAKE2B 7ad9e0cb48ce7fdfae4bdc10bf3cb6d6c25a7f86d62dbb9041d0ad2fe04409477eb27754b5f53218fba657f7ed77b423b34bea92bffb61c37ee2eefdcccc3a3b SHA512 88a027ef32c55e551625950ecb2efffc75a7611568f11a4abdcddd4fe24b894eb7d8fb805cba3fc0f79ddf6fae6116804790fc24b3d5b6097ade9ad92ed4c118
diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
deleted file mode 100644
index 48d35ff519be..000000000000
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="test doc source"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic vcs-snapshot
-
-DESCRIPTION="Java Native Access (JNA)"
-HOMEPAGE="https://github.com/twall/jna#readme"
-SRC_URI="https://github.com/twall/jna/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+awt +nio-buffers"
-REQUIRED_USE="test? ( awt nio-buffers )"
-
-CDEPEND="
-	dev-libs/libffi"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	virtual/pkgconfig
-	test? (
-		dev-java/junit:0
-		dev-java/ant-core:0
-		dev-java/ant-junit:0
-	)"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jar contrib-jars"
-
-java_prepare() {
-	# This jar is needed for some tests.
-	# So let's make a copy of it.
-	cp lib/clover.jar "${T}" || die
-
-	find -name "*.jar" -exec rm -v {} + || die
-	rm -r native/libffi || die
-	mkdir -p doc/javadoc || die
-
-	# and restore it.
-	cp "${T}"/clover.jar lib || die
-
-	# Build to same directory on 64-bit archs.
-	mkdir build || die
-	ln -snf build build-d64 || die
-
-	if ! use awt ; then
-		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
-	fi
-
-	if ! use nio-buffers ; then
-		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die
-	fi
-}
-
-EANT_EXTRA_ARGS="-Ddynlink.native=true"
-
-EANT_TEST_ANT_TASKS="ant-junit ant-core"
-src_test() {
-	local sysprops=""
-
-	# crashes vm (segfault)
-	sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java || die
-
-	# crashes vm, java 7 only (icedtea-7,  oracle-jdk-bin-1.7)
-	sed -i -e 's|testGCCallbackOnFinalize|no&|' test/com/sun/jna/CallbacksTest.java || die
-
-	sysprops+=" -Djava.awt.headless=true"
-	sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount
-
-	mkdir -p lib || die
-	java-pkg_jar-from --into lib --build-only junit
-
-	# need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
-	# survive the junit task.
-	_JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-	java-pkg_dojar contrib/platform/dist/platform.jar
-	java-pkg_doso build/native/libjnidispatch.so
-	use source && java-pkg_dosrc src/com
-	use doc && java-pkg_dojavadoc doc/javadoc
-}
diff --git a/dev-java/jna/jna-4.2.2-r1.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild
index 469cd1d2666e..6ae5356a0b03 100644
--- a/dev-java/jna/jna-4.2.2-r1.ebuild
+++ b/dev-java/jna/jna-4.2.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+inherit java-pkg-2 java-ant-2 toolchain-funcs
 
 DESCRIPTION="Java Native Access (JNA)"
 HOMEPAGE="https://github.com/twall/jna"