gentoo resync : 09.07.2022

3 files changed, 2 insertions, 103 deletions

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 1f968935aea8..643e687367c1 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,8 +1,6 @@
 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.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
 DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d
-EBUILD jna-5.10.0.ebuild 2459 BLAKE2B 86b61d92ab01caeb641565650fff5e9024ef39f163fccbcbdf2f167b6bb198e952ab21f2650031f85c9ca7436f7a3690a28d28957c58547c080eac12fd235d64 SHA512 408ef249df31976f88baf7ff7222796a402c0ed94154b280eb3c5333b8deee30fe4c22709e2bdbffa3b40e3196ea8b6c39c547fc76ae16c489caefcc2734766f
-EBUILD jna-5.11.0.ebuild 2490 BLAKE2B c97633d35bcaa3de72948587a4b56fea5a92a691428f20ba52da2a5111f36f4788e3a55c96b7b06df0c2445e0e34b005505229bfddfdf5d1ef02ccbb8e8b6a31 SHA512 2ed6e9dfeb73b9acc059597a28f59f03c3a93d70a35ee206c5a57c7c987c26c7d1889ea112b6c5d4bc7a0017e2ac6d145abb785aef98825b1b40f184a69ebc0d
+EBUILD jna-5.11.0.ebuild 2486 BLAKE2B bcc2fa0cb0fcf7d3d13c675e6589d68f89a83edcd7ef9e825f775935bc75a64adf984dddbc00ca0bda061d32f8cffe4f52c3163c46d84b8eec9d15866a8e0ac1 SHA512 d17b7bedc6bcff581f5af6147c7e819d9457771250b07366ebb98bfb02d37fe8a2a2db2573bbcb9bbc2e3f1d14e4d299a770f659fe9b1b04ab799735fe60c126
 MISC metadata.xml 321 BLAKE2B c39a2036ee429d7d2dd70a9481ae84e86dd94d428be06668800b57a32910af90019d644276fb3466ab7ae5ec5a53ab6599ba8e16770ffad5d10730df6926f326 SHA512 aa6b45e487d69fda26d85ad22900da9085aaa3c1fac1b7c2b0ce22199f35d833640a3d9513dc8efc6ae49b6c00f42a3581ca325e67b3e14e8a72742799addece
diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
deleted file mode 100644
index 4e08475cbb53..000000000000
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.10.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}/${PV}-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
-}
diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
index 44173ced3c04..0d53024ae379 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.g
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1+ )"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 BDEPEND="
 	virtual/pkgconfig