gentoo resync : 05.12.2021

3 files changed, 78 insertions, 9 deletions

diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index 275bb1fb8298..681525e15bdb 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1,5 +1,7 @@
 AUX jnr-ffi-2.0.2-junit48.patch 467 BLAKE2B 1f1e76e18f425e1a38dfc0b1788239329a58fb9944958045877115d375c65437660a2fa114cec2bbc3ad3b74b94d38a6b34d6ea142ec0aa12f9ba88638d14894 SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884
 AUX jnr-ffi_maven-build.xml 11211 BLAKE2B 94c92f033d7cb90db11123846cffb1e7532d197eaa739cac6da256159fe030c1d90d57e991a292d9f1511e57800a37d6791037afd72349529e045a6db6572c1b SHA512 612b793b664b71e1a1b924aabe2da16c6b0b70947640b3d5b6d6994ffecfd7c0b30991b3a2bb711130052870dd63b9d41f43a54221e52017510119c5d3e4f359
 DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0
-EBUILD jnr-ffi-2.0.2.ebuild 1388 BLAKE2B 7fb54bdd6719f9d8af1cefa11c6560a438367855f8f6a4d28213156ef2a77808b15d77c951e7e93709931c083db4e3630f0d06ea31bc15323a052800235df847 SHA512 6a3d4b402eb4b8e6ad0e80509e510414c3936bcd7f176e2f17179d117aabcf6adf50d53cc28c2744a21eec0c5606494c8501060c6ef88b3bb1265ec408604c25
+DIST jnr-ffi-2.2.8-sources.tar.gz 261959 BLAKE2B 16f7b89c88a61fa07da65d4e5287258f96550b93898bb7313ddd62d1f002276da86aca2c79874eccb466eaebcad5181ff33539996a6558b6d79ce9280cf9c0a9 SHA512 15187d90f15ad82cb6cac0617806ab7d0322bfcb4f44523f2272f93f19ec115625806c9d450bffaa57db32c70906328c8edc905046465b0ec3eb6ff52e500b42
+EBUILD jnr-ffi-2.0.2-r1.ebuild 1474 BLAKE2B 2df6d1c2082afe9b6dd735fe01c790e7be24c5a787d8355a08c0d4667675b7d724c5b8511ac56090e5c3db1c2737c9926958924739e195bcbcb08e4ea7c1209e SHA512 bc809a4120a681aa6cc7bfb40378e2560df71f411c22ca14bad1a07998eaae286d8d3fe8b697354f71652c0497347903e7bd0d0ec783bb7788c57f01caad9fa2
+EBUILD jnr-ffi-2.2.8.ebuild 2061 BLAKE2B dfe1bbdfe2a63a55194bb6352c7de05806ce619ea534d5df55a2bdad30a671a15d366937805f02d4c45a488415621d56276381cd6e6a21173ab0b020a2b288e2 SHA512 ad64a7f90f45a157c9e42eeb6ce4d27a58570354cd1b7dcf92cb4e510390911f67b0014ac0af3ee7653e584ef9b64bbdf265d5cd64ab3f45c54b47305739285d
 MISC metadata.xml 323 BLAKE2B 377b6cae0335bb1d1160c22d684541576023a02984183c468689418ea3a1b2c6520a95ec7d18e86ea1b6c426d44d40bf6debea926c03c9c321d82dfc8874ee6e SHA512 f7503b3bbfc40eeda0e00cacd5a84723f17fdae5657594b8f44c9b7e7e059b6eeb23d034baab20aaeb554e35721a73ad1c0cac30aa67845a4e842f30348b79d6
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
index c5807844d596..20c56e8735fd 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
@@ -13,26 +13,30 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="ppc64"
+
+# Fixing https://bugs.gentoo.org/736830 would cost too much time.
+RESTRICT="test"
 
 COMMON_DEP="
-	dev-java/jffi:1.2
+	~dev-java/jffi-1.2.9:1.2
 	dev-java/jnr-x86asm:1.0
 	dev-java/asm:4"
 
 RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 
 DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
+	>=virtual/jdk-1.8:*
 	test? (
 		dev-java/ant-junit:0
 		>=dev-java/junit-4.8:4
 	)"
 
-java_prepare() {
+src_prepare() {
+	default
 	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-	epatch "${FILESDIR}"/${P}-junit48.patch
+	eapply "${FILESDIR}"/${P}-junit48.patch
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
new file mode 100644
index 000000000000..e577aeebbf63
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jnr-ffi/archive/refs/tags/jnr-ffi-2.2.8.tar.gz --slot 2 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jnr-ffi-2.2.8.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="com.github.jnr:jnr-ffi:2.2.8"
+# no junit-jupiter in ::gentoo
+# JAVA_TESTING_FRAMEWORKS="junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library for invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+
+# Common dependencies
+# POM: pom.xml
+# com.github.jnr:jffi:1.3.6 -> >=dev-java/jffi-1.3.6:1.2
+# com.github.jnr:jnr-a64asm:1.0.0 -> >=dev-java/jnr-a64asm-1.0.0:2
+# com.github.jnr:jnr-x86asm:1.0.2 -> >=dev-java/jnr-x86asm-1.0.2:1.0
+# org.ow2.asm:asm:9.2 -> >=dev-java/asm-9.2:9
+# org.ow2.asm:asm-analysis:9.2 -> >=dev-java/asm-analysis-9.2:`ver_cut 1`
+# org.ow2.asm:asm-commons:9.2 -> >=dev-java/asm-commons-9.2:`ver_cut 1`
+# org.ow2.asm:asm-tree:9.2 -> >=dev-java/asm-tree-9.2:`ver_cut 1`
+# org.ow2.asm:asm-util:9.2 -> >=dev-java/asm-util-9.2:`ver_cut 1`
+
+CDEPEND="
+	dev-java/asm:9
+	dev-java/asm-analysis:9
+	dev-java/asm-commons:9
+	dev-java/asm-tree:9
+	dev-java/asm-util:9
+	>=dev-java/jffi-1.3.6:1.2
+	dev-java/jnr-a64asm:2
+	dev-java/jnr-x86asm:1.0
+"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+# Runtime dependencies
+# POM: pom.xml
+# com.github.jnr:jffi:1.3.6 -> >=dev-java/jffi-1.3.6:1.2
+
+RDEPEND="
+	${CDEPEND}>=virtual/jre-1.8:*
+	>=dev-java/jffi-1.3.6:1.2"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_GENTOO_CLASSPATH="jffi-1.2,jnr-a64asm-2,jnr-x86asm-1.0,asm-9,asm-analysis-9,asm-commons-9,asm-tree-9,asm-util-9,jffi-1.2"
+# no junit-jupiter in ::gentoo
+JAVA_SRC_DIR="src/main/java"
+
+# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!"
+# JAVA_TEST_SRC_DIR="src/test/java"