[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: cc6b3eab10392e40c276a8cf28e3a418321b
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Apr 9 19:35:11 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Apr 10 06:53:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc6b3e00
dev-java/jffi: drop 1.3.9-r1
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/jffi/Manifest | 1 -
dev-java/jffi/jffi-1.3.9-r1.ebuild | 122 -
2 files changed, 123 deletions(-)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 6dfe7544ed64..8a641aa1521d 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,2 +1 @@
DIST jffi-1.3.10.tar.gz 3304571 BLAKE2B
a2ce4901d05b31cffcbe750e9a9294413057ae26426ae381f08ab07a085507afe38d447a60d4698d0878760ba1fe18bfdc31ce9b737676a70c93689d2e4533a7
SHA512
9e7d9aa1c16d7fa2486c75b71fd23465a3069ea3f314bc1b536115c982333d7cffa93f75a06ec86b740b83f4fca3be0c32cf99222d90bf1e6b45a9744ead1268
-DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B
bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc
SHA512
21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild
b/dev-java/jffi/jffi-1.3.9-r1.ebuild
deleted file mode 100644
index ee8168740ba4..
--- a/dev-java/jffi/jffi-1.3.9-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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 ~arm arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*
- >=dev-libs/libffi-3.4.2-r2:="
-RDEPEND=">=virtual/jre-1.8:*
- >=dev-libs/libffi-3.4.2-r2:="
-
-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
-
- # https://bugs.gentoo.org/829820
- if use arm; then
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/invokeHeapDO()/i @Ignore' \
- -e '/invokeHeapNO()/i @Ignore' \
- -e '/invokeHeapOD()/i @Ignore' \
- -e '/invokeHeapON()/i @Ignore' \
- -e '/invokeHeapOO()/i @Ignore' \
- -e '/invokeHeapO()/i @Ignore' \
- -e '/invokeNativeDO()/i @Ignore' \
- -e '/invokeNativeNO()/i @Ignore' \
- -e '/invokeNativeOD()/i @Ignore' \
- -e '/invokeNativeON()/i @Ignore' \
- -e '/invokeNativeOO()/i @Ignore' \
- -e '/invokeNativeO()/i @Ignore' \
- -i src/test/java/com/kenai/jffi/InvokerTest.java || die
- sed \
- -e '/import org.junit.Test/a import org.junit.Ignore;' \
- -e '/returnDefaultF128HighPrecision/i @Ignore' \
- -i src/test/java/com/kenai/jffi/NumberTest.java || die
- fi
-}
-
-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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: b7a1ab0b98f8c15c8c0ad31aabfbaae8afcf8a52
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 19:24:31 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 19:24:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a1ab0b
dev-java/jffi: Stabilize 1.3.10 amd64, #903523
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jffi/jffi-1.3.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10.ebuild
index 2e70f60e3b34..6f5d7fa61f9e 100644
--- a/dev-java/jffi/jffi-1.3.10.ebuild
+++ b/dev-java/jffi/jffi-1.3.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="1.3"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 0760939ab0b29ec6899b50381ab933d9acf5e5be
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 19:09:00 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 19:09:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0760939a
dev-java/jffi: Stabilize 1.3.10 ppc64, #903523
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jffi/jffi-1.3.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10.ebuild
index 43ad1d462682..2e70f60e3b34 100644
--- a/dev-java/jffi/jffi-1.3.10.ebuild
+++ b/dev-java/jffi/jffi-1.3.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="1.3"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 52599096900fea75e6391c85434ebd77c21f8a93
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 19:08:57 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 19:08:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52599096
dev-java/jffi: Stabilize 1.3.10 x86, #903523
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jffi/jffi-1.3.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10.ebuild
index 058a42c3d656..43ad1d462682 100644
--- a/dev-java/jffi/jffi-1.3.10.ebuild
+++ b/dev-java/jffi/jffi-1.3.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="1.3"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 45c90a4d685cab1de34bd8604e3494e9f58fd2ff
Author: Sam James gentoo org>
AuthorDate: Wed Mar 29 11:33:09 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 29 11:33:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c90a4d
dev-java/jffi: Stabilize 1.3.10 arm64, #903523
Signed-off-by: Sam James gentoo.org>
dev-java/jffi/jffi-1.3.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10.ebuild
index 38a54daf093d..058a42c3d656 100644
--- a/dev-java/jffi/jffi-1.3.10.ebuild
+++ b/dev-java/jffi/jffi-1.3.10.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="1.3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/files/
commit: d9e0fbfe50821c810cad6f7a374d95d8baef1117 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Mar 1 11:05:09 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Mar 4 07:22:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e0fbfe dev-java/jffi: suppress -Werror flag Closes: https://bugs.gentoo.org/898142 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29870 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch | 19 +++ 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch index 0e42b385e7b7..3153ff08d307 100644 --- a/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch +++ b/dev-java/jffi/files/jffi-1.3.8-GNUmakefile.patch @@ -1,8 +1,19 @@ -diff --git a/jni/GNUmakefile b/jni/GNUmakefile -index cfe570a..c8bbb51 100755 +Bug: #898142 --- a/jni/GNUmakefile +++ b/jni/GNUmakefile -@@ -278,7 +278,7 @@ debug: +@@ -67,9 +67,11 @@ OFLAGS = -O2 $(JFLAGS) + WERROR = -Werror + ifneq ($(OS),darwin) + ifneq ($(OS),aix) ++ifneq ($(OS),linux) + WFLAGS += -Wundef $(WERROR) + endif + endif ++endif + WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter + PICFLAGS = -fPIC + SOFLAGS = # Filled in for each OS specifically +@@ -278,7 +280,7 @@ debug: @echo "OBJS=$(OBJS)" $(LIBJFFI): $(OBJS) $(LIBFFI_LIBS) @@ -11,7 +22,7 @@ index cfe570a..c8bbb51 100755 $(STRIP) $@ ifeq ($(OS), darwin) codesign -s - $@ -@@ -287,10 +287,14 @@ endif +@@ -287,10 +289,14 @@ endif $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h) @mkdir -p $(@D) @$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: ba4b499ebfd082c8022b05b828261dcde4d4800f
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Jan 28 11:01:14 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Mon Feb 27 08:57:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4b499e
dev-java/jffi: add 1.3.10
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Florian Schmaus gentoo.org>
dev-java/jffi/Manifest | 1 +
dev-java/jffi/jffi-1.3.10.ebuild | 118 +++
2 files changed, 119 insertions(+)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 1417241bf1c7..6dfe7544ed64 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1 +1,2 @@
+DIST jffi-1.3.10.tar.gz 3304571 BLAKE2B
a2ce4901d05b31cffcbe750e9a9294413057ae26426ae381f08ab07a085507afe38d447a60d4698d0878760ba1fe18bfdc31ce9b737676a70c93689d2e4533a7
SHA512
9e7d9aa1c16d7fa2486c75b71fd23465a3069ea3f314bc1b536115c982333d7cffa93f75a06ec86b740b83f4fca3be0c32cf99222d90bf1e6b45a9744ead1268
DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B
bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc
SHA512
21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
diff --git a/dev-java/jffi/jffi-1.3.10.ebuild b/dev-java/jffi/jffi-1.3.10.ebuild
new file mode 100644
index ..38a54daf093d
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.10.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.jnr:jffi:1.3.10"
+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/${P}.tar.gz;
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="1.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*
+ >=dev-libs/libffi-3.4.2-r2:="
+RDEPEND=">=virtual/jre-1.8:*
+ >=dev-libs/libffi-3.4.2-r2:="
+
+PATCHES=( "${FILESDIR}"/jffi-1.3.8-GNUmakefile.patch )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jnrproject.jffi"
+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() {
+ java-pkg-2_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
+
+ # https://bugs.gentoo.org/829820
+ if use arm; then
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/invokeHeapDO()/i @Ignore' \
+ -e '/invokeHeapNO()/i @Ignore' \
+ -e '/invokeHeapOD()/i @Ignore' \
+ -e '/invokeHeapON()/i @Ignore' \
+ -e '/invokeHeapOO()/i @Ignore' \
+ -e '/invokeHeapO()/i @Ignore' \
+ -e '/invokeNativeDO()/i @Ignore' \
+ -e '/invokeNativeNO()/i @Ignore' \
+ -e '/invokeNativeOD()/i @Ignore' \
+ -e '/invokeNativeON()/i @Ignore' \
+ -e '/invokeNativeOO()/i @Ignore' \
+ -e '/invokeNativeO()/i @Ignore' \
+ -i src/test/java/com/kenai/jffi/InvokerTest.java || die
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/returnDefaultF128HighPrecision/i @Ignore' \
+ -i src/test/java/com/kenai/jffi/NumberTest.java || die
+ fi
+}
+
+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)
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/files/
commit: 2346c7fcee399397d3c934cd547b03a69c104dfb
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Tue Sep 6 16:30:22 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Sep 7 03:34:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2346c7fc
dev-java/jffi: remove unused file
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27166
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/jffi/files/jffi_maven-build.xml | 259 ---
1 file changed, 259 deletions(-)
diff --git a/dev-java/jffi/files/jffi_maven-build.xml
b/dev-java/jffi/files/jffi_maven-build.xml
deleted file mode 100644
index d8114185ee41..
--- a/dev-java/jffi/files/jffi_maven-build.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=== WARNING
===
- JUnit is not present in your $ANT_HOME/lib directory. Tests not
executed.
-
===
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar;
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
-http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar;
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
-http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar;
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
-https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar;
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
-https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar;
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
-http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar;
- dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
- usetimestamp="false"
- ignoreerrors="true"/>
-
-
-
[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/
commit: ac7d859938db4e321fac0158a15cd08b6cf3ca99
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Sep 2 17:24:02 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Sep 2 17:24:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7d8599
dev-java/jffi: Keyword 1.3.9-r1 arm, #866201
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jffi/jffi-1.3.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild
b/dev-java/jffi/jffi-1.3.9-r1.ebuild
index 04acfb709255..ee8168740ba4 100644
--- a/dev-java/jffi/jffi-1.3.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: edc771213fe3b15c5b85857bb9877e79cd52671a
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Aug 27 15:56:04 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Sep 2 17:23:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc77121
dev-java/jffi: exclude failing tests on arm
Closes: https://bugs.gentoo.org/829820
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jffi/jffi-1.3.9-r1.ebuild | 23 +++
1 file changed, 23 insertions(+)
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild
b/dev-java/jffi/jffi-1.3.9-r1.ebuild
index e5267de9cd58..04acfb709255 100644
--- a/dev-java/jffi/jffi-1.3.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -51,6 +51,29 @@ src_prepare() {
public static final int MICRO = $(ver_cut 3);
}
EOF
+
+ # https://bugs.gentoo.org/829820
+ if use arm; then
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/invokeHeapDO()/i @Ignore' \
+ -e '/invokeHeapNO()/i @Ignore' \
+ -e '/invokeHeapOD()/i @Ignore' \
+ -e '/invokeHeapON()/i @Ignore' \
+ -e '/invokeHeapOO()/i @Ignore' \
+ -e '/invokeHeapO()/i @Ignore' \
+ -e '/invokeNativeDO()/i @Ignore' \
+ -e '/invokeNativeNO()/i @Ignore' \
+ -e '/invokeNativeOD()/i @Ignore' \
+ -e '/invokeNativeON()/i @Ignore' \
+ -e '/invokeNativeOO()/i @Ignore' \
+ -e '/invokeNativeO()/i @Ignore' \
+ -i src/test/java/com/kenai/jffi/InvokerTest.java || die
+ sed \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/returnDefaultF128HighPrecision/i @Ignore' \
+ -i src/test/java/com/kenai/jffi/NumberTest.java || die
+ fi
}
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 4c37294de4ddb2980476127d37bef5eb4d279608
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Aug 25 05:12:27 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Aug 25 18:52:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c37294d
dev-java/jffi: drop 1.3.9
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27009
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jffi/jffi-1.3.9.ebuild | 97 -
1 file changed, 97 deletions(-)
diff --git a/dev-java/jffi/jffi-1.3.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
deleted file mode 100644
index d74a2940741e..
--- a/dev-java/jffi/jffi-1.3.9.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 8f9913dc52985c29fc9cbe2eea8336cce2b93ef9
Author: Sam James gentoo org>
AuthorDate: Thu Aug 25 03:32:18 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Aug 25 03:32:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f9913dc
dev-java/jffi: Stabilize 1.3.9-r1 x86, #866203
Signed-off-by: Sam James gentoo.org>
dev-java/jffi/jffi-1.3.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild
b/dev-java/jffi/jffi-1.3.9-r1.ebuild
index 69872443c1ad..e5267de9cd58 100644
--- a/dev-java/jffi/jffi-1.3.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: b6d3727c7bcd24745a0ccbe20a55d208c1814cde
Author: Sam James gentoo org>
AuthorDate: Wed Aug 24 07:03:24 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 24 07:03:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6d3727c
dev-java/jffi: Stabilize 1.3.9-r1 arm64, #866203
Signed-off-by: Sam James gentoo.org>
dev-java/jffi/jffi-1.3.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild
b/dev-java/jffi/jffi-1.3.9-r1.ebuild
index cd12fc2ac4ce..69872443c1ad 100644
--- a/dev-java/jffi/jffi-1.3.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 arm64 ppc64 ~x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 418b875eac20ea37a54d940cf85cc8c16268cb14
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Aug 24 05:24:58 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Aug 24 05:24:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418b875e
dev-java/jffi: amd64 stable wrt bug #866203
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/jffi/jffi-1.3.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild
b/dev-java/jffi/jffi-1.3.9-r1.ebuild
index 2909d6af8cd8..cd12fc2ac4ce 100644
--- a/dev-java/jffi/jffi-1.3.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 ~arm64 ppc64 ~x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 8857773cb392c49503f5c18c7053496486a611c2
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Aug 23 17:03:14 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Aug 23 17:03:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8857773c
dev-java/jffi: Stabilize 1.3.9-r1 ppc64, #825494
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jffi/jffi-1.3.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild
b/dev-java/jffi/jffi-1.3.9-r1.ebuild
index 0655be95b313..2909d6af8cd8 100644
--- a/dev-java/jffi/jffi-1.3.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
DEPEND=">=virtual/jdk-1.8:*
>=dev-libs/libffi-3.4.2-r2:="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 32a4721f0f3891663540ad831c3c6923cafed8c4
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Jul 24 15:46:36 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 25 00:27:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a4721f
dev-java/jffi: depend on >=dev-libs/libffi-3.4.2-r2
3.4.2-r1 was causing issues on PPC64.
Bug: https://bugs.gentoo.org/827215
Bug: https://github.com/jnr/jffi/issues/107
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26568
Signed-off-by: Sam James gentoo.org>
dev-java/jffi/jffi-1.3.9-r1.ebuild | 99 ++
1 file changed, 99 insertions(+)
diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild
b/dev-java/jffi/jffi-1.3.9-r1.ebuild
new file mode 100644
index ..0655be95b313
--- /dev/null
+++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild
@@ -0,0 +1,99 @@
+# 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:*
+ >=dev-libs/libffi-3.4.2-r2:="
+RDEPEND=">=virtual/jre-1.8:*
+ >=dev-libs/libffi-3.4.2-r2:="
+
+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
+ 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
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/, dev-java/jffi/files/
commit: e1fc551759d6b83c9c22e9898c420aa1bb2aedec
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Jul 9 11:38:43 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jul 9 11:40:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1fc5517
dev-java/jffi: Revert drop 1.3.6
Reverts: d4842e912cca55b92e24188983878aff444a0820
Signed-off-by: Arthur Zamarin 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 | 98
3 files changed, 125 insertions(+)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 40f970c22ac6..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.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 ..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
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/, dev-java/jffi/files/
commit: d4842e912cca55b92e24188983878aff444a0820
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Jul 9 09:47:37 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jul 9 11:15:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4842e91
dev-java/jffi: drop 1.3.6
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Arthur Zamarin 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 | 98
3 files changed, 125 deletions(-)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 46f96ebc4d8b..40f970c22ac6 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,3 +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
DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B
bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc
SHA512
21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
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..
--- a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index f34b51d92cc2..
--- a/dev-java/jffi/jffi-1.3.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 40886ddd7e91143af0496a688799dc8b5690fdf8
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Jul 9 09:37:09 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jul 9 09:37:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40886ddd
dev-java/jffi: Stabilize 1.3.9 arm64, #856901
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jffi/jffi-1.3.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
index 938783d2c89c..d74a2940741e 100644
--- a/dev-java/jffi/jffi-1.3.9.ebuild
+++ b/dev-java/jffi/jffi-1.3.9.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: b1549f9eaa5245af19027581c3135e8e1a6a28a2
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jul 8 06:44:49 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jul 8 06:44:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1549f9e
dev-java/jffi: x86 stable wrt bug #856901
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/jffi/jffi-1.3.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
index 9da5c461473c..938783d2c89c 100644
--- a/dev-java/jffi/jffi-1.3.9.ebuild
+++ b/dev-java/jffi/jffi-1.3.9.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 4e6f2fdebbdcb445fd694e994042740a68dee70d
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jul 8 06:43:29 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jul 8 06:43:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6f2fde
dev-java/jffi: amd64 stable wrt bug #856901
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/jffi/jffi-1.3.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.9.ebuild b/dev-java/jffi/jffi-1.3.9.ebuild
index f946f5fb5408..9da5c461473c 100644
--- a/dev-java/jffi/jffi-1.3.9.ebuild
+++ b/dev-java/jffi/jffi-1.3.9.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[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/
commit: f1d7825a5a2bbe79f99fc2da4867459295ea2b10
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Dec 27 16:31:54 2021 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Dec 27 16:31:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1d7825a
dev-java/jffi: Keyword 1.2.9-r1 arm, #830048
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/jffi/jffi-1.2.9-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.2.9-r1.ebuild
b/dev-java/jffi/jffi-1.2.9-r1.ebuild
index 6c6b7d259e42..ef103551c7d9 100644
--- a/dev-java/jffi/jffi-1.2.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
CDEPEND="dev-libs/libffi:0="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 31d1f16e5f7a010d55a16cb85bd005e9d9477065
Author: Sam James gentoo org>
AuthorDate: Tue Nov 23 17:02:05 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Nov 23 17:02:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d1f16e
dev-java/jffi: Stabilize 1.3.6 arm64, #825494
Signed-off-by: Sam James gentoo.org>
dev-java/jffi/jffi-1.3.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild
index 566dc754a0e1..f34b51d92cc2 100644
--- a/dev-java/jffi/jffi-1.3.6.ebuild
+++ b/dev-java/jffi/jffi-1.3.6.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 57e19fd99c9a526b8acbcac579b2f88a83476317
Author: Sam James gentoo org>
AuthorDate: Tue Nov 23 10:47:02 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Nov 23 10:47:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57e19fd9
dev-java/jffi: Stabilize 1.3.6 x86, #825494
Signed-off-by: Sam James gentoo.org>
dev-java/jffi/jffi-1.3.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild
index bc93b1620aa6..566dc754a0e1 100644
--- a/dev-java/jffi/jffi-1.3.6.ebuild
+++ b/dev-java/jffi/jffi-1.3.6.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 1336bbfe69797ba4add15cffc306c4b082f0e87a
Author: Sam James gentoo org>
AuthorDate: Mon Nov 22 13:44:01 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Nov 22 13:44:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1336bbfe
dev-java/jffi: Stabilize 1.3.6 amd64, #825494
Signed-off-by: Sam James gentoo.org>
dev-java/jffi/jffi-1.3.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild
index 000f9908913b..bc93b1620aa6 100644
--- a/dev-java/jffi/jffi-1.3.6.ebuild
+++ b/dev-java/jffi/jffi-1.3.6.ebuild
@@ -18,7 +18,7 @@
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"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: c297ea37887f0695d7e85458689d6833d7c48d78
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Nov 20 16:42:54 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Nov 20 19:18:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c297ea37
dev-java/jffi: LC_ALL=C to avoid test failure
Avoid https://github.com/jnr/jffi/issues/60
1) returnDefaultF128HighPrecision(com.kenai.jffi.NumberTest)
java.lang.AssertionError
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/22916
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/jffi/jffi-1.3.6.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild
index 99abfcf99b76..000f9908913b 100644
--- a/dev-java/jffi/jffi-1.3.6.ebuild
+++ b/dev-java/jffi/jffi-1.3.6.ebuild
@@ -77,7 +77,9 @@ src_compile() {
src_test() {
# build native test library
emake BUILD_DIR=build -f libtest/GNUmakefile
- java-pkg-simple_src_test
+
+ # https://github.com/jnr/jffi/issues/60
+ LC_ALL=C java-pkg-simple_src_test
}
src_install() {
[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/
commit: 016d72f37194dbe2be4460d6302189a6f226973f
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 7 08:13:57 2021 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 7 08:13:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016d72f3
dev-java/jffi: drop handling for x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
dev-java/jffi/jffi-1.2.9.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index acddf996628..7f8b0a351a9 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -49,7 +49,6 @@ java_prepare() {
# don't mess with deployment target
# set install_name
use x64-macos && uarch=x86_64
- use x86-macos && uarch=i386
use ppc-macos && uarch=ppc
sed -i \
-e "/ARCHES +=/s/=.*$/= ${uarch}/" \
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 50d0b61e55d4bcf948b6a5abcb06cecec67cfdf0
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Nov 16 22:46:35 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Nov 16 22:53:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d0b61e
dev-java/jffi: use dev-libs/libffi instead of virtual/libffi
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-java/jffi/jffi-1.2.9.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index 51bc215bdac..27466b724b6 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -15,7 +15,7 @@ LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.2"
KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
-CDEPEND="virtual/libffi:0"
+CDEPEND="dev-libs/libffi:0="
RDEPEND="${CDEPEND}
>=virtual/jre-1.6"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: fdfc4d310fdd4ce59912de53f225a3805748a92c
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jul 13 17:26:05 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jul 13 17:27:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfc4d31
dev-java/jffi: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-java/jffi/jffi-1.2.9.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index a0c68d324f6..51bc215bdac 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.2"
-KEYWORDS="amd64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
CDEPEND="virtual/libffi:0"
[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
-
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/files/
commit: 7c319a20d2d3eae01499dc75b696ecffa5ae2566 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Tue Aug 2 16:25:18 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Aug 5 16:37:04 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c319a20 dev-java/jffi: remove unused patches dev-java/jffi/files/1.0.0-gcc-3.4.patch | 14 - dev-java/jffi/files/jffi-1.0.0-makefile.patch | 82 - dev-java/jffi/files/jffi-1.2.5_no-werror.patch | 13 dev-java/jffi/files/jffi-1.2.6_no-werror.patch | 13 dev-java/jffi/files/jffi-1.2.7-junit-4.11.patch | 14 - dev-java/jffi/files/jffi-1.2.7-makefile.patch | 62 --- dev-java/jffi/files/jffi-1.2.7_no-werror.patch | 31 -- 7 files changed, 229 deletions(-) diff --git a/dev-java/jffi/files/1.0.0-gcc-3.4.patch b/dev-java/jffi/files/1.0.0-gcc-3.4.patch deleted file mode 100644 index fc2bd5c..000 --- a/dev-java/jffi/files/1.0.0-gcc-3.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/jni/GNUmakefile b/jni/GNUmakefile -index 7a027af..eaba319 100755 a/jni/GNUmakefile -+++ b/jni/GNUmakefile -@@ -188,9 +188,6 @@ endif - - ifeq ($(CPU), i386) - MODEL = 32 -- ifeq ($(findstring $(OS), openbsd darwin mingw32 win32),) --CFLAGS += -march=i586 -mtune=generic -- endif - endif - - ifeq ($(CPU), amd64) diff --git a/dev-java/jffi/files/jffi-1.0.0-makefile.patch b/dev-java/jffi/files/jffi-1.0.0-makefile.patch deleted file mode 100644 index 11ca2ed..000 --- a/dev-java/jffi/files/jffi-1.0.0-makefile.patch +++ /dev/null @@ -1,82 +0,0 @@ jni/GNUmakefile2010-03-12 12:06:39.0 +1300 -+++ jni/GNUmakefile2010-03-12 12:13:44.0 +1300 -@@ -65,7 +65,7 @@ - - # MacOS headers aren't completely warning free, so turn them off - ifneq ($(OS),darwin) -- WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef -+ WFLAGS = -W -Wall -Wno-unused -Wno-parentheses -Wundef - endif - PICFLAGS = -fPIC - SOFLAGS = # Filled in for each OS specifically -@@ -78,9 +78,9 @@ - - JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)" - IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)" --CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) -+CFLAGS += $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) - CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE --CXXFLAGS = $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) -+CXXFLAGS += $(OFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) - - ifeq ($(OS), win64) - override CPU = x86_64 -@@ -258,58 +258,6 @@ - @mkdir -p $(@D) - $(CCACHE) $(CXX) $(CXXFLAGS) -c $< -o $@ - -- --ifeq ($(OS), darwin) --build_ffi = \ -- mkdir -p $(BUILD_DIR)/libffi-darwin-$(1); \ -- (if [ ! -f $(BUILD_DIR)/libffi-darwin-$(1)/Makefile ]; then \ -- echo "Configuring libffi for $(1)"; \ -- cd $(BUILD_DIR)/libffi-darwin-$(1) && \ --env CC="$(CCACHE) $(CC)" CFLAGS="-arch $(1) $(FFI_CFLAGS)" LDFLAGS="-arch $(1)" \ -- $(LIBFFI_CONFIGURE) --host=$(1)-apple-darwin > /dev/null; \ -- fi); \ -- env MACOSX_DEPLOYMENT_TARGET=10.5 $(MAKE) -C $(BUILD_DIR)/libffi-darwin-$(1) -- --$(LIBFFI): -- @mkdir -p $(@D) -- @for arch in $(ARCHES); do $(call build_ffi,$$arch);done -- -- # Assemble into a FAT (i386, x86_64, ppc) library -- @mkdir -p $(BUILD_DIR)/libffi/.libs -- @env MACOSX_DEPLOYMENT_TARGET=10.5 /usr/bin/libtool -static -o $@ \ -- $(foreach arch, $(ARCHES),$(BUILD_DIR)/libffi-darwin-$(arch)/.libs/libffi_convenience.a) -- @mkdir -p $(LIBFFI_BUILD_DIR)/include -- $(RM) $(LIBFFI_BUILD_DIR)/include/ffi.h -- @( \ -- printf "#if defined(__i386__)\n"; \ -- printf "#include \"libffi-darwin-i386/include/ffi.h\"\n"; \ -- printf "#elif defined(__x86_64__)\n"; \ -- printf "#include \"libffi-darwin-x86_64/include/ffi.h\"\n";\ -- printf "#elif defined(__ppc__)\n"; \ -- printf "#include \"libffi-darwin-ppc/include/ffi.h\"\n";\ -- printf "#endif\n";\ -- ) > $(LIBFFI_BUILD_DIR)/include/ffi.h -- @( \ -- printf "#if defined(__i386__)\n"; \ -- printf "#include \"libffi-darwin-i386/include/ffitarget.h\"\n"; \ -- printf "#elif defined(__x86_64__)\n"; \ -- printf "#include \"libffi-darwin-x86_64/include/ffitarget.h\"\n";\ -- printf "#elif defined(__ppc__)\n"; \ -- printf "#include \"libffi-darwin-ppc/include/ffitarget.h\"\n";\ -- printf "#endif\n";\ -- ) > $(LIBFFI_BUILD_DIR)/include/ffitarget.h --else --$(LIBFFI): -- @mkdir -p $(LIBFFI_BUILD_DIR) -- @if [ ! -f $(LIBFFI_BUILD_DIR)/Makefile ]; then \ -- echo "Configuring libffi for
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: e855a441c79db564315a6ccfe4e5cdbb7e76c9c7
Author: Patrice Clement gentoo org>
AuthorDate: Sat Dec 5 19:11:55 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Dec 5 19:48:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e855a441
dev-java/jffi: Keyword for ppc64.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jffi/jffi-1.0.11-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.0.11-r1.ebuild
b/dev-java/jffi/jffi-1.0.11-r1.ebuild
index 271b085..1526686 100644
--- a/dev-java/jffi/jffi-1.0.11-r1.ebuild
+++ b/dev-java/jffi/jffi-1.0.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/jffi/tarball/${PV} ->
${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE=""
CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: b38360ca60ee6c12f505cc62da14422ef6b69638
Author: Patrice Clement gentoo org>
AuthorDate: Sat Dec 5 19:10:34 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Dec 5 19:48:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38360ca
dev-java/jffi: Stable for amd64. Retroactively mark stable for the remaining
arches using the ALLARCHES policy.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jffi/jffi-1.0.11-r1.ebuild | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
diff --git a/dev-java/jffi/jffi-1.0.11-r1.ebuild
b/dev-java/jffi/jffi-1.0.11-r1.ebuild
index 7af0347..271b085 100644
--- a/dev-java/jffi/jffi-1.0.11-r1.ebuild
+++ b/dev-java/jffi/jffi-1.0.11-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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
@@ -14,32 +13,42 @@ SRC_URI="https://github.com/jnr/jffi/tarball/${PV} ->
${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
-COMMON_DEP="
+CDEPEND="
virtual/libffi"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
+
+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 "${FILESDIR}"/${P}_no-werror.patch
- sed -i -e 's/-Werror //' libtest/GNUmakefile || die
- find "${WORKDIR}" -iname '*.jar' -delete || 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 5a496254a57dae1df0bc58211a9746a0c4cb3522
Author: Patrice Clement gentoo org>
AuthorDate: Sat Dec 5 19:11:01 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Dec 5 19:48:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a496254
dev-java/jffi: Clean up old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jffi/jffi-1.0.11.ebuild | 105 ---
1 file changed, 105 deletions(-)
diff --git a/dev-java/jffi/jffi-1.0.11.ebuild b/dev-java/jffi/jffi-1.0.11.ebuild
deleted file mode 100644
index 4dd786b..000
--- a/dev-java/jffi/jffi-1.0.11.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-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 ~ppc x86"
-IUSE=""
-
-COMMON_DEP="
- virtual/libffi"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- virtual/pkgconfig
- test? (
- dev-java/ant-junit:0
- dev-java/junit:4
- )"
-
-src_unpack() {
- unpack ${A}
- mv jnr-jffi-* "${P}" || die
-}
-
-java_prepare() {
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
- epatch "${FILESDIR}"/${P}_no-werror.patch
- sed -i -e 's/-Werror //' libtest/GNUmakefile || die
-
- find "${WORKDIR}" -iname '*.jar' -delete
-
- # 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
- 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
-
- _JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
- java-pkg-2_src_test
-}
-
-src_install() {
- cat <<-EOF > boot.properties
- jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
- EOF
- jar -uf target/${PN}.jar boot.properties || die
-
- java-pkg_dojar target/${PN}.jar
- java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2).so
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/*
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 63e373d36cadad022b274cb4ea33c5e5dfc0e58d
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Sep 1 07:27:52 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Sep 1 07:27:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e373d3
dev-java/jffi: x86 stable wrt bug #535080
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
dev-java/jffi/jffi-1.2.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index edd12c9..d61c300 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
CDEPEND="virtual/libffi:0"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: 1a16f8de5d9bc1e309f03c47fc237cf61d37df0b
Author: Patrice Clement gentoo org>
AuthorDate: Tue Sep 1 07:48:49 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Sep 1 07:48:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a16f8de
dev-java/jffi: Stable for ppc+ppc64. Fixes bug 535080.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jffi/jffi-1.2.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index d61c300..393637b 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
CDEPEND="virtual/libffi:0"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: d3710560c2a286cb0e2b0931b4e299f86b10f8bd
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Sep 1 07:27:14 2015 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Sep 1 07:27:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3710560
dev-java/jffi: amd64 stable wrt bug #535080
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
dev-java/jffi/jffi-1.2.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
index 1503a45..edd12c9 100644
--- a/dev-java/jffi/jffi-1.2.9.ebuild
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="|| ( Apache-2.0 LGPL-3 )"
SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
CDEPEND="virtual/libffi:0"
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: dcc021917090e32e0ab054dd18d019c71a84c95a
Author: Patrice Clement gentoo org>
AuthorDate: Tue Sep 1 08:05:54 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Sep 1 08:05:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcc02191
dev-java/jffi: Clean up old ebuilds.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jffi/Manifest | 4 --
dev-java/jffi/jffi-1.2.5.ebuild| 96
dev-java/jffi/jffi-1.2.6.ebuild| 120 ---
dev-java/jffi/jffi-1.2.7-r2.ebuild | 123
dev-java/jffi/jffi-1.2.7.ebuild| 122
dev-java/jffi/jffi-1.2.8.ebuild| 124 -
6 files changed, 589 deletions(-)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index e29364c..9430782 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,6 +1,2 @@
DIST jffi-1.0.11.tar.gz 1899655 SHA256
b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512
0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa
WHIRLPOOL
aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
-DIST jffi-1.2.5.tar.gz 1798081 SHA256
2101c4888902f2e21baacd0b2c8b7098feb3ca1487a195c2bc3d9116ebd4 SHA512
2613a1874899e1a734ad54d68f7d969fe3bc12bd1ae1aaf5a63a17d63ac6ac6b9812740b7c7a771e66ba0e4ff02105c6a2427771d4571be40ae869f3d6f077e3
WHIRLPOOL
174303fc9f10cf295e009ef2320f9b13295f5e96187ab2ae4599de891b27e1279645ea47409eb8aec9a8b247a5568cddd6f8566950b64be37e399cb0eda0219f
-DIST jffi-1.2.6.tar.gz 1850410 SHA256
b568d832828bf0cb980c545e8fd16147034048ca2d3ffc62cae4f844c8cc6cec SHA512
df178691e6894599f2a45146950cca7e4c81e92c38fc751c40b39e660970c19d0dce41c9192053dddf07f42317d28033f59b7140c904784c477526e7471b6938
WHIRLPOOL
adb57b9ac981177ae7d697aae41bbaaff3a38dab4c4364258b13272023076dacdd93a751eb24a339ae17a4162d4511685a4aa67afd5d8fab2f852e0403ee73f1
-DIST jffi-1.2.7.tar.gz 1908203 SHA256
25f1930f294cec9651447edd08a51a990b7c92c69eca87257233e86e4dd5f979 SHA512
837ebb0085ec2acc5dc688c3e1883a7c986df62a32a41887196b88f5b5714ee667f918f2bdf005f019faae02df2f7903f291fa32c5ec3cabc360d9b1d8e4548d
WHIRLPOOL
0e9824d54b21eb61142f4a868cd10122d9837c34732fc4ff9ba3093c0d4c11ee25dc0e045a40a4157faed201de9498e7cea28df85e7f14d07b58d2f4d1fb26e1
-DIST jffi-1.2.8.tar.gz 1988785 SHA256
445263cd24dccc34e2bd7fb3c488aa182697b1bc3f86d3343e07183161e2986c SHA512
c6622a2cc0cd040d871417d66a074aeaad57f266559c8135692e2b76bb00f05287a4e4c4f17e8e4225c4d5e7e8941d9c883fbb4cfe5db920a79dd9a29ffea105
WHIRLPOOL
165f44b195310cf2826359d00ba74bb0eac66a47c566ec1a522df50627721c6564bd1730459098a8aa973433978fa815b3a418bbcf787b75ebf1cc3cd585909d
DIST jffi-1.2.9.tar.gz 1952668 SHA256
1cb854a913d295cb9a41cdb1349f68efe3c5d750b3135a1fa07a365d6806f5ef SHA512
2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
WHIRLPOOL
79ed9433b2b475fd9f5ae228e54bef1d637c9cdac97e63bb16f5510933707c968a0989e6eb7f09a9a79f06bb725ab5267c2373657da1daddbbbe3b093479de3b
diff --git a/dev-java/jffi/jffi-1.2.5.ebuild b/dev-java/jffi/jffi-1.2.5.ebuild
deleted file mode 100644
index d7b2899..000
--- a/dev-java/jffi/jffi-1.2.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="https://github.com/jnr/jffi;
-SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="1.2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEP="
- virtual/libffi"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- virtual/pkgconfig
- test? (
- dev-java/ant-junit:0
- dev-java/junit:4
- )"
-
-java_prepare() {
- cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
- epatch "${FILESDIR}"/${P}_no-werror.patch
-
- find "${WORKDIR}" -iname '*.jar' -delete
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-src_compile() {
- # generate Version.java
- cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
- 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);
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/
commit: ffd50ae2fc7ecadbf5905cbfd64cd5d009a57dbe
Author: Patrice Clement gentoo org>
AuthorDate: Mon Aug 31 22:26:46 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Aug 31 22:29:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd50ae2
dev-java/jffi: Version bump. Restrict tests for now. Keyword for ppc64.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/jffi/Manifest | 1 +
dev-java/jffi/jffi-1.2.9.ebuild | 131
2 files changed, 132 insertions(+)
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index e641906..e29364c 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -3,3 +3,4 @@ DIST jffi-1.2.5.tar.gz 1798081 SHA256
2101c4888902f2e21baacd0b2c8b7098feb3ca
DIST jffi-1.2.6.tar.gz 1850410 SHA256
b568d832828bf0cb980c545e8fd16147034048ca2d3ffc62cae4f844c8cc6cec SHA512
df178691e6894599f2a45146950cca7e4c81e92c38fc751c40b39e660970c19d0dce41c9192053dddf07f42317d28033f59b7140c904784c477526e7471b6938
WHIRLPOOL
adb57b9ac981177ae7d697aae41bbaaff3a38dab4c4364258b13272023076dacdd93a751eb24a339ae17a4162d4511685a4aa67afd5d8fab2f852e0403ee73f1
DIST jffi-1.2.7.tar.gz 1908203 SHA256
25f1930f294cec9651447edd08a51a990b7c92c69eca87257233e86e4dd5f979 SHA512
837ebb0085ec2acc5dc688c3e1883a7c986df62a32a41887196b88f5b5714ee667f918f2bdf005f019faae02df2f7903f291fa32c5ec3cabc360d9b1d8e4548d
WHIRLPOOL
0e9824d54b21eb61142f4a868cd10122d9837c34732fc4ff9ba3093c0d4c11ee25dc0e045a40a4157faed201de9498e7cea28df85e7f14d07b58d2f4d1fb26e1
DIST jffi-1.2.8.tar.gz 1988785 SHA256
445263cd24dccc34e2bd7fb3c488aa182697b1bc3f86d3343e07183161e2986c SHA512
c6622a2cc0cd040d871417d66a074aeaad57f266559c8135692e2b76bb00f05287a4e4c4f17e8e4225c4d5e7e8941d9c883fbb4cfe5db920a79dd9a29ffea105
WHIRLPOOL
165f44b195310cf2826359d00ba74bb0eac66a47c566ec1a522df50627721c6564bd1730459098a8aa973433978fa815b3a418bbcf787b75ebf1cc3cd585909d
+DIST jffi-1.2.9.tar.gz 1952668 SHA256
1cb854a913d295cb9a41cdb1349f68efe3c5d750b3135a1fa07a365d6806f5ef SHA512
2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
WHIRLPOOL
79ed9433b2b475fd9f5ae228e54bef1d637c9cdac97e63bb16f5510933707c968a0989e6eb7f09a9a79f06bb725ab5267c2373657da1daddbbbe3b093479de3b
diff --git a/dev-java/jffi/jffi-1.2.9.ebuild b/dev-java/jffi/jffi-1.2.9.ebuild
new file mode 100644
index 000..1503a45
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.9.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 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/jffi;
+SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="virtual/libffi:0"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.6
+ virtual/pkgconfig
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/junit:4
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.8-makefile.patch
+ "${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch
+)
+
+RESTRICT="test"
+
+java_prepare() {
+ cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+
+ epatch "${PATCHES[@]}"
+
+ # misc fixes for Darwin
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ local uarch
+ # don't do multiarch
+ # avoid using Xcode stuff
+ # use Prefix' headers
+ # don't mess with deployment target
+ # set install_name
+ use x64-macos && uarch=x86_64
+ use x86-macos && uarch=i386
+ use ppc-macos && uarch=ppc
+ sed -i \
+ -e "/ARCHES +=/s/=.*$/= ${uarch}/" \
+ -e "/XCODE=/s:=.*$:=${EPREFIX}:" \
+ -e "/MACSDK/s/^/#/" \
+ -e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \
+ -e "/SOFLAGS =/s:=.*:= -install_name
${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \
+ jni/GNUmakefile || die
+ fi
+
+ find "${WORKDIR}" -iname '*.jar' -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+src_compile() {
+ # generate Version.java
+ cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
+ package com.kenai.jffi;
+ public final class Version {
+ private Version() {}
+ public static final int MAJOR =
$(get_version_component_range 1);
+ public static
