[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/files/, dev-java/jffi/
commit: 1dadcd01829b64f07b6edbb4a1c38cba700f482f
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Sep 5 04:59:56 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Mon Sep 5 08:00:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dadcd01
dev-java/jffi: drop 1.2.9-r1, 1.3.6
Closes: https://bugs.gentoo.org/736838
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27148
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jffi/Manifest | 2 -
dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch | 14 ---
dev-java/jffi/files/jffi-1.2.8-makefile.patch| 52 -
dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch | 26 -
dev-java/jffi/jffi-1.2.9-r1.ebuild | 131 ---
dev-java/jffi/jffi-1.3.6.ebuild | 98 -
6 files changed, 323 deletions(-)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 46f96ebc4d8b..1417241bf1c7 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,3 +1 @@
-DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B
320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96
SHA512
2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
-DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B
87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9
SHA512
0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f
DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B
bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc
SHA512
21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
diff --git a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
b/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
deleted file mode 100644
index ac3843a0053a..
--- a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
a/src/test/java/com/kenai/jffi/NumberTest.java
-+++ b/src/test/java/com/kenai/jffi/NumberTest.java
-@@ -234,9 +234,8 @@
- private void returnF32(InvokerType type) {
- LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class,
type);
- float[] values = { 0f, 1.0f, -2.0f };
--for (int i = 0; i < values.length; ++i) {
--assertEquals("Value not returned correctly", values[i],
lib.ret_float(values[i]), 0.1f);
--}
-+float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f),
lib.ret_float(-2.0f) };
-+assertArrayEquals("Value not returned correctly", values, lib_values,
0.1f);
- }
-
- @Test public void returnDefaultF64() {
diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch
b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
deleted file mode 100644
index cdc28a662b51..
--- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -41,6 +41,7 @@
- JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
-
- ifeq ($(USE_SYSTEM_LIBFFI),1)
-+ LIBFFI =
- LIBFFI_LIBS ?= $(shell pkg-config --libs libffi)
- LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi)
- else
-@@ -64,9 +65,8 @@
- OFLAGS = -O2 $(JFLAGS)
-
- # MacOS headers aren't completely warning free, so turn them off
--WERROR = -Werror
- ifneq ($(OS),darwin)
-- WFLAGS += -Wundef $(WERROR)
-+ WFLAGS += -Wundef
- endif
- WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
- PICFLAGS = -fPIC
-@@ -279,7 +279,7 @@
- @echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
- @echo "OBJS=$(OBJS)"
-
--$(LIBJFFI): $(OBJS) $(LIBFFI_LIBS)
-+$(LIBJFFI): $(OBJS) $(LIBFFI)
- $(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
- $(STRIP) $@
-
-@@ -291,7 +291,7 @@
- @mkdir -p $(@D)
- @$(CC) $(CFLAGS) -o $@ -c $<
-
--$(OBJS) : $(LIBFFI_LIBS)
-+$(OBJS) : $(LIBFFI)
-
- ifeq ($(OS), darwin)
- build_ffi = \
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
- JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
--OFLAGS = -O2 $(JFLAGS)
--WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
-+OFLAGS = $(JFLAGS)
-+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
- PICFLAGS = -fPIC
- SOFLAGS = -shared -Wl,-O1
- LDFLAGS += $(SOFLAGS)
diff --git a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch
b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch
deleted file mode 100644
index 2dd5e9d8791a..
---
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/files/, dev-java/jffi/
commit: aab81bcdbf942f37f06c0f03fefde6a717d51d3e
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Jan 2 16:28:31 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Jun 8 08:12:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aab81bcd
dev-java/jffi: add 1.3.9
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jffi/Manifest | 1 +
dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch | 28 +++
dev-java/jffi/jffi-1.3.9.ebuild | 97
3 files changed, 126 insertions(+)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index bf473974afc2..46f96ebc4d8b 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,2 +1,3 @@
DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B
320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96
SHA512
2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B
87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9
SHA512
0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f
+DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B
bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc
SHA512
21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
diff --git a/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
new file mode 100644
index ..0e42b385e7b7
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch
@@ -0,0 +1,28 @@
+diff --git a/jni/GNUmakefile b/jni/GNUmakefile
+index cfe570a..c8bbb51 100755
+--- a/jni/GNUmakefile
b/jni/GNUmakefile
+@@ -278,7 +278,7 @@ 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) $@
+ ifeq ($(OS), darwin)
+ codesign -s - $@
+@@ -287,10 +287,14 @@ endif
+ $(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.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
new file mode 100644
index ..f946f5fb5408
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.9.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 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/jffi-1.3.9.tar.gz --slot 1.3 --keywords
"~amd64 ~arm64 ~ppc64 ~x86" --ebuild jffi-1.3.9.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jffi:1.3.9"
+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.3"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=( "${FILESDIR}"/jffi-1.3.8-GNUmakefile.patch )
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+
+#
https://github.com/jnr/jffi/blob/b6ad5c066a6346072ea04f8ffa8177204aadcb13/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
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/files/, dev-java/jffi/
commit: 5848c1320fa3ab46b06f3b987c9250c6368f5d54
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Nov 12 10:34:49 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Nov 20 19:18:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5848c132
dev-java/jffi: bump to 1.3.6
Closes: https://bugs.gentoo.org/559298
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/jffi/Manifest | 1 +
dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch | 26 +++
dev-java/jffi/jffi-1.3.6.ebuild | 96
3 files changed, 123 insertions(+)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 7e1b652c69c9..bf473974afc2 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1 +1,2 @@
DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B
320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96
SHA512
2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
+DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B
87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9
SHA512
0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f
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 ..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 ..99abfcf99b76
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.6.ebuild
@@ -0,0 +1,96 @@
+# 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=(
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/files/, dev-java/jffi/
commit: 0cb01dda01fd39f8a62415b2636c78861509dcec
Author: Miroslav Šulc gentoo org>
AuthorDate: Thu May 6 17:47:19 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu May 6 18:03:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb01dda
dev-java/jffi: eapi7, java 1.8, fixed javah issue
Closes: https://bugs.gentoo.org/788352
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/jffi/files/jffi-1.2.8-makefile.patch | 8 +++---
.../{jffi-1.2.9.ebuild => jffi-1.2.9-r1.ebuild}| 30 --
2 files changed, 20 insertions(+), 18 deletions(-)
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 7f9f07a500c..cdc28a662b5 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
similarity index 82%
rename from dev-java/jffi/jffi-1.2.9.ebuild
rename to dev-java/jffi/jffi-1.2.9-r1.ebuild
index 4eff1caf02b..6c6b7d259e4 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/files/, dev-java/jffi/
commit: 4a3119ad9ddedaad622f73cb8c4566f564f3e466
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Oct 30 20:28:05 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Oct 30 20:29:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3119ad
dev-java/jffi: Remove old, closes bug #597550
Package-Manager: portage-2.3.2
dev-java/jffi/Manifest | 1 -
dev-java/jffi/files/jffi-1.0.11_no-werror.patch | 13 ---
dev-java/jffi/jffi-1.0.11-r1.ebuild | 116
3 files changed, 130 deletions(-)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 9430782..9df14b4 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,2 +1 @@
-DIST jffi-1.0.11.tar.gz 1899655 SHA256
b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512
0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa
WHIRLPOOL
aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
DIST jffi-1.2.9.tar.gz 1952668 SHA256
1cb854a913d295cb9a41cdb1349f68efe3c5d750b3135a1fa07a365d6806f5ef SHA512
2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
WHIRLPOOL
79ed9433b2b475fd9f5ae228e54bef1d637c9cdac97e63bb16f5510933707c968a0989e6eb7f09a9a79f06bb725ab5267c2373657da1daddbbbe3b093479de3b
diff --git a/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
b/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
deleted file mode 100644
index 25b7e4f..
--- a/dev-java/jffi/files/jffi-1.0.11_no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/jni/GNUmakefile b/jni/GNUmakefile
-index efe6230..25053c7 100755
a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
-DNDEBUG
- OFLAGS = -O2 $(JFLAGS)
-
- # MacOS headers aren't completely warning free, so turn them off
--WERROR = -Werror
-+WERROR =
- ifneq ($(OS),darwin)
- WFLAGS += -Wundef $(WERROR)
- endif
diff --git a/dev-java/jffi/jffi-1.0.11-r1.ebuild
b/dev-java/jffi/jffi-1.0.11-r1.ebuild
deleted file mode 100644
index c09f166..
--- a/dev-java/jffi/jffi-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 versionator
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="https://github.com/jnr;
-SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="1.0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-CDEPEND="
- virtual/libffi"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- virtual/pkgconfig
- test? (
- dev-java/ant-junit:0
- dev-java/junit:4
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}_no-werror.patch
-)
-
-src_unpack() {
- unpack ${A}
- mv jnr-jffi-* "${P}" || die
-}
-
-java_prepare() {
- java-pkg_clean
-
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-
- epatch "${PATCHES[@]}"
-
- sed -i -e 's/-Werror //' libtest/GNUmakefile || die
-
- # Fix build with GCC 4.7 #421501
- sed -i -e "s|-mimpure-text||g" jni/GNUmakefile libtest/GNUmakefile ||
die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-src_compile() {
- # generate Version.java
- cat <<-EOF > src/main/java/com/kenai/jffi/Version.java
- 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);
- }
- EOF
-
- java-pkg-2_src_compile
-
- # generate headers
- mkdir -p build/jni || die
- javah -d build/jni -classpath target/classes \
- com.kenai.jffi.Foreign \
- com.kenai.jffi.ObjectBuffer \
- com.kenai.jffi.Version \
- || die
-
- #build native library.
- local args=(
- SRC_DIR=jni
- JNI_DIR=jni
- BUILD_DIR=build/jni
- VERSION=$(get_version_component_range 1-2)
- USE_SYSTEM_LIBFFI=1
- -f jni/GNUmakefile
- )
- emake "${args[@]}"
-}
-
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-src_test() {
- # build native test library
- emake BUILD_DIR=build -f libtest/GNUmakefile
-
-
