commit: 1dadcd01829b64f07b6edbb4a1c38cba700f482f Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Sep 5 04:59:56 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Mon Sep 5 08:00:30 2022 +0000 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 <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/27148 Signed-off-by: Florian Schmaus <flow <AT> 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..000000000000 --- 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..000000000000 --- 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..000000000000 --- 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.2.9-r1.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild deleted file mode 100644 index ef103551c7d9..000000000000 --- a/dev-java/jffi/jffi-1.2.9-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -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 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos" - -CDEPEND="dev-libs/libffi:0=" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -# java 1.8 is needed because javah is called which is not in newer jdks -DEPEND="${CDEPEND} - 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 -) - -RESTRICT="test" - -src_prepare() { - default - - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die - - # 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 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 - - java-pkg_clean -} - -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 = $(ver_cut 1); - public static final int MINOR = $(ver_cut 2); - public static final int MICRO = $(ver_cut 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=$(ver_cut 1-2) - USE_SYSTEM_LIBFFI=1 - CCACHE= - -f jni/GNUmakefile - ) - emake "${args[@]}" -} - -EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4" - -src_test() { - # build native test library - emake BUILD_DIR=build -f libtest/GNUmakefile - - _JAVA_OPTIONS="-Djffi.boot.library.path=${S}/build/jni" \ - java-pkg-2_src_test -} - -src_install() { - local libname=".so" - - [[ ${CHOST} == *-darwin* ]] && libname=.jnilib - 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 - jffi.boot.library.path = ${JAVA_PKG_LIBDEST} - EOF - jar -uf target/${PN}.jar boot.properties || die - - java-pkg_dojar target/${PN}.jar - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} 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..000000000000 --- 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 - 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 -}
