gentoo resync : 07.05.2021

3 files changed, 22 insertions, 20 deletions

diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 1dfef32ec829..f3f87fa7bc68 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,6 +1,6 @@
 AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d08a3d0ce2494ed22e5af753f0cbfbc5fa064f19877816e2cc44c666c48aa5a1f8be44fe8dcc7a9368f033acf8828 SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9
-AUX jffi-1.2.8-makefile.patch 1443 BLAKE2B 9accbdcd70c1c76e3f94a2131728fa83f7c988b5ce52aa7874d012700cfa4ed1cf3c3c2a281ce18c74776639e653f5a18e9c4b1d86baeaa9d10e577ca067e8eb SHA512 02f28b00e1ca6d16046c5f25c38268f78a41b5b202c4f284e8dac10dc245ad150f4639849c0af8c20f50dc3e7cf715bee6dfd2f1edc48496f822d78aaef01b39
+AUX jffi-1.2.8-makefile.patch 1451 BLAKE2B bd6ae6ba8f509880e33e603eb98d8a8dca2786c2440bea6cc27c736caaf26170cfb4cd17af83d72d2c09c8ec70e65ef820bc990e9617c14fa5979e9e571e7d19 SHA512 b31031f4039cbd5ff7083321c17e8d5459c56b01c6cc2be3a45b81b2a3ee8f40b1ac0a2bd5df390887fae2026b4c87c1be060d0b01a3b2acf28950f1a06cd253
 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
 DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
-EBUILD jffi-1.2.9.ebuild 3091 BLAKE2B f671ee59386574ed2077375d717b95afa54919e36b8455c3f825b5d02bb647cd7fb291fc54043f545389cfa03ea74f5a1d53f7e2946df3f25dd241670670757d SHA512 67cb052c57447ed866a85299a7ecd6a59d894bf1b4a8e26947699d4aacc8fe88492431c60db9d82cb1fde33db57779933c0dc7c3ed2a2fef63adad8805995927
+EBUILD jffi-1.2.9-r1.ebuild 3003 BLAKE2B cc6f67a1b539172dd951f084571cc5f308429e1189e613e3700875817556f384d1bd3d27d17c8c66e97ad98c6dc2fe0889358ba8a0201bcb4e327a1f6545a5bc SHA512 a94628868e81d3c1ad2ebea77b9ee4b462d9851d9852f80faaa4ef11030696a95ba1fc9b26f53716dd877213a623bd461415588f56ac1709f63da3e7cd000f47
 MISC metadata.xml 319 BLAKE2B 999865e43b7f7ecf6784131fc903f80f208bf39dc54e96f6f80bd991998ab9694fb92ce8cd5e998a2e0800b64e47068859a7c63d46ea74294f1da77f1a18c46a SHA512 ed411e700c518b64ce76a437771c3a4779ebf47207d839924220ae6174ab7fd9cde92cd347c93b1916849cc2fb7fd4a5e5c29911420bc3485cb2916034d3f71b
diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
index 7f9f07a500c5..cdc28a662b51 100644
--- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch
+++ b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
@@ -1,5 +1,5 @@
---- jni/GNUmakefile
-+++ jni/GNUmakefile
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
 @@ -41,6 +41,7 @@
  JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
  
@@ -37,8 +37,8 @@
  
  ifeq ($(OS), darwin)
  build_ffi = \
---- libtest/GNUmakefile
-+++ libtest/GNUmakefile
+--- a/libtest/GNUmakefile
++++ b/libtest/GNUmakefile
 @@ -44,8 +44,8 @@
  # Compiler/linker flags from:
  #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild
index 4eff1caf02bb..6c6b7d259e42 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9-r1.ebuild
@@ -1,11 +1,11 @@
 # 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"
 
-inherit epatch java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="An optimized Java interface to libffi"
 HOMEPAGE="https://github.com/jnr/jffi"
@@ -18,16 +18,18 @@ KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 CDEPEND="dev-libs/libffi:0="
 
 RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
+	>=virtual/jre-1.8:*"
 
+# java 1.8 is needed because javah is called which is not in newer jdks
 DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	virtual/pkgconfig
+	virtual/jdk:1.8
 	test? (
 		dev-java/ant-junit4:0
 		dev-java/junit:4
 	)"
 
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.8-makefile.patch
 	"${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch
@@ -35,10 +37,10 @@ PATCHES=(
 
 RESTRICT="test"
 
-java_prepare() {
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+src_prepare() {
+	default
 
-	epatch "${PATCHES[@]}"
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
 
 	# misc fixes for Darwin
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -59,7 +61,7 @@ java_prepare() {
 			jni/GNUmakefile || die
 	fi
 
-	find "${WORKDIR}" -iname '*.jar' -delete || die
+	java-pkg_clean
 }
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
@@ -71,9 +73,9 @@ src_compile() {
 		package com.kenai.jffi;
 		public final class Version {
 			private Version() {}
-			public static final int MAJOR = $(get_version_component_range 1);
-			public static final int MINOR = $(get_version_component_range 2);
-			public static final int MICRO = $(get_version_component_range 3);
+			public static final int MAJOR = $(ver_cut 1);
+			public static final int MINOR = $(ver_cut 2);
+			public static final int MICRO = $(ver_cut 3);
 		}
 	EOF
 
@@ -92,7 +94,7 @@ src_compile() {
 		SRC_DIR=jni
 		JNI_DIR=jni
 		BUILD_DIR=build/jni
-		VERSION=$(get_version_component_range 1-2)
+		VERSION=$(ver_cut 1-2)
 		USE_SYSTEM_LIBFFI=1
 		CCACHE=
 		-f jni/GNUmakefile
@@ -114,7 +116,7 @@ src_install() {
 	local libname=".so"
 
 	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
-	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname}
+	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
 
 	# must by after _doso to have JAVA_PKG_LIBDEST set
 	cat > boot.properties <<-EOF