gentoo resync : 05.12.2021

3 files changed, 127 insertions, 0 deletions

diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 14ca66ed12f3..e684c13a99c3 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,6 +1,9 @@
 AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d08a3d0ce2494ed22e5af753f0cbfbc5fa064f19877816e2cc44c666c48aa5a1f8be44fe8dcc7a9368f033acf8828 SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9
 AUX jffi-1.2.8-makefile.patch 1451 BLAKE2B bd6ae6ba8f509880e33e603eb98d8a8dca2786c2440bea6cc27c736caaf26170cfb4cd17af83d72d2c09c8ec70e65ef820bc990e9617c14fa5979e9e571e7d19 SHA512 b31031f4039cbd5ff7083321c17e8d5459c56b01c6cc2be3a45b81b2a3ee8f40b1ac0a2bd5df390887fae2026b4c87c1be060d0b01a3b2acf28950f1a06cd253
+AUX jffi-1.3.6-GNUmakefile.patch 740 BLAKE2B baeea64e4fadd0d76aa9d4a38fe48115365a3dd1bb9aecbf4e5c9f676de2e8928896e6423437190ccd01e38fd1a32c254ebd1f6a8965215e957b3b8f973628fb SHA512 315272b6a4762d5df76f5dbaef1a542c6a1808166883b245b85c9813ad665d9e30298693ddf079c10770f7757c75bb7ecd7c6ca73c3bb6444d2597a8a06124e3
 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
 DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
+DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9 SHA512 0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f
 EBUILD jffi-1.2.9-r1.ebuild 3003 BLAKE2B cc6f67a1b539172dd951f084571cc5f308429e1189e613e3700875817556f384d1bd3d27d17c8c66e97ad98c6dc2fe0889358ba8a0201bcb4e327a1f6545a5bc SHA512 a94628868e81d3c1ad2ebea77b9ee4b462d9851d9852f80faaa4ef11030696a95ba1fc9b26f53716dd877213a623bd461415588f56ac1709f63da3e7cd000f47
+EBUILD jffi-1.3.6.ebuild 2454 BLAKE2B 0e988a67b31d18e96b6c0d8f550770c14bcefe22732ad989e567fa39bfc96e06f07d00771fc6228f3d3f0e122c1c06a4ea3d2a5ec45b74ab0b79ba3800ea24f0 SHA512 5314575e00a311389ccd290b20fe73852dd46769777de3278c748d2ec39c79ded428f157b36339273220d503e7ca810c15dfa3661b9ef778550c747a549847fb
 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9
diff --git a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch
new file mode 100644
index 000000000000..2dd5e9d8791a
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch
@@ -0,0 +1,26 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index c0f298c..457626f 100755
+--- a/jni/GNUmakefile
++++ b/jni/GNUmakefile
+@@ -278,16 +278,16 @@ debug:
+ 	@echo "OBJS=$(OBJS)"
+ 
+ $(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
+-	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS)
++	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) $(LIBFFI_LIBS)
+ 	$(STRIP) $@
+ 
+ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h)
+-	@mkdir -p $(@D)
+-	@$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
++	mkdir -p $(@D)
++	$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
+ 
+ $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
+-	@mkdir -p $(@D)
+-	@$(CC) $(CFLAGS) -o $@ -c $<
++	mkdir -p $(@D)
++	$(CC) $(CFLAGS) -o $@ -c $<
+ 
+ $(OBJS) : $(LIBFFI)
+ 
diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild
new file mode 100644
index 000000000000..f34b51d92cc2
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.6.ebuild
@@ -0,0 +1,98 @@
+# 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/jffi/archive/refs/tags/jffi-1.3.6.tar.gz --slot 1.3 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jffi-1.3.6.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jffi:1.3.6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Foreign Function Interface"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.2"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}"/jffi-1.3.6-GNUmakefile.patch )
+DOCS=( LICENSE README.md )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# https://github.com/jnr/jffi/blob/eabdf09c3ec4fc8a54b684ff326e36b36b74e0da/build.xml#L26
+JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	default
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
+		package com.kenai.jffi;
+		import java.lang.annotation.Native;
+		public final class Version {
+			private Version() {}
+			@Native
+			public static final int MAJOR = $(ver_cut 1);
+			@Native
+			public static final int MINOR = $(ver_cut 2);
+			@Native
+			public static final int MICRO = $(ver_cut 3);
+		}
+	EOF
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javac -h build/jni -classpath target/classes \
+		${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(ver_cut 1-2)
+		USE_SYSTEM_LIBFFI=1
+		CCACHE=
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	# https://github.com/jnr/jffi/issues/60
+	LC_ALL=C java-pkg-simple_src_test
+}
+
+src_install() {
+	default
+
+	local libname=".so"
+	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
+
+	# must be after _doso to have JAVA_PKG_LIBDEST set
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf ${PN}.jar boot.properties || die
+
+	java-pkg-simple_src_install
+}