From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A5F915ACFB for ; Mon, 10 Apr 2023 06:53:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE619E0848; Mon, 10 Apr 2023 06:53:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ACFEBE0848 for ; Mon, 10 Apr 2023 06:53:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02B91340E04 for ; Mon, 10 Apr 2023 06:53:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95393920 for ; Mon, 10 Apr 2023 06:53:08 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1681109585.cc6b3e0000ab10392e40c276a8cf28e3a418321b.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jffi/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jffi/Manifest dev-java/jffi/jffi-1.3.9-r1.ebuild X-VCS-Directories: dev-java/jffi/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: cc6b3e0000ab10392e40c276a8cf28e3a418321b X-VCS-Branch: master Date: Mon, 10 Apr 2023 06:53:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b4b27e1-301c-4996-a4f6-54bc13fbfef7 X-Archives-Hash: 492cf5b9ffc3074f72cb6e4bc04ed220 commit: cc6b3e0000ab10392e40c276a8cf28e3a418321b Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Apr 9 19:35:11 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Apr 10 06:53:05 2023 +0000 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..000000000000 --- 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 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 -}