From 2ffbfc63824a9e437090fb3c744670dd45369ae0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 May 2023 16:18:45 +0100 Subject: gentoo auto-resync : 20:05:2023 - 16:18:45 --- dev-java/jna/Manifest | 2 +- dev-java/jna/jna-5.13.0-r1.ebuild | 192 ++++++++++++++++++++++++++++++++++++++ dev-java/jna/jna-5.13.0.ebuild | 191 ------------------------------------- 3 files changed, 193 insertions(+), 192 deletions(-) create mode 100644 dev-java/jna/jna-5.13.0-r1.ebuild delete mode 100644 dev-java/jna/jna-5.13.0.ebuild (limited to 'dev-java/jna') diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest index 71f135e1b78b..8e2554967c6d 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -5,5 +5,5 @@ AUX jna-5.13.0-testpath.patch 5567 BLAKE2B 0c76e603af9ae2a1f3cacde220ec4451d5973 DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d DIST jna-5.13.0.tar.gz 116027625 BLAKE2B 1f2bc7ab28adefa0bbad122957ed2c6ef55ab88e79b30c05f0d2d88e0e05152f7bb5e28097906a7e24f78304dfa2b225587adb0ada205ca3c2ceac1cdbab3f04 SHA512 aefd0becc03bb7fd753e8c5cdcbcb20f6d590125a5fb03048bef0024e826ab0254b750e22a8bb26bea38cc89262ad45e5030b666cb2c857b01b15a6a55379a0f EBUILD jna-5.11.0-r1.ebuild 2489 BLAKE2B 5cb9506b96fae4ba7e28b587e0dcfc47adac54c8792c8f10b55ac457cba79dd338747ed082bb27c459f14246deab0b2b1f4b92fb52b7bb0cafe22807205819f2 SHA512 3b5e4f9e1dde929febe4614d39c1437af998ae3886d44ce61fbc4520720945fe7b24865ec4cb5caece0b49b15e8b2572657f661263f661622f5ce4599b9d95e6 -EBUILD jna-5.13.0.ebuild 5195 BLAKE2B 1a59927c689eba24ec77bc0e4bde5ffa4585d7f994932aab7b111689fee1cdfefd3ba211588f5ea1649189bb0abaf115130b843040c93b9c9cc70f53be3d4717 SHA512 af859ddd04763f816ed1456c5004b51fc8e9069536d6239575ad3741305b32b12b4a8a65d9ac799b78715e08b162f87a77af35b8ecb8dfa103c2445bb85d09b9 +EBUILD jna-5.13.0-r1.ebuild 5208 BLAKE2B fabe924b2d21899ff7688e6afd4d7c29c6f1f822b2b30a5838978a5901cfeee7ea87b3b914e5417a6119ce2d4b4ae637a7237a131aee363adbe250b66c05a3a6 SHA512 5e35dc50a07e36793d879407db9c0b53c2438b303a46482e5e5bac2c9a1954a7e58d0ddff073f08e82346439a6f980a5b4668de5610b52a7afeb039070f18ca0 MISC metadata.xml 334 BLAKE2B 9e55710ddf27995f7f0ea6480a4b2ff6ed38424e5a8de87614715defa4ae9f788932d270df48e78fdadb27851f06f2651d94c0b043816151aea55c08f083c4ee SHA512 b8b0cc53cc447f2811b3e94638de0799efaf99a05f29a0341d3a261b1f0f996ca308a007221f165031e56e60339d8d616ca366f25eda7f7f5d55acfc60a9d695 diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild b/dev-java/jna/jna-5.13.0-r1.ebuild new file mode 100644 index 000000000000..ab5471ed4157 --- /dev/null +++ b/dev-java/jna/jna-5.13.0-r1.ebuild @@ -0,0 +1,192 @@ +# 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_PROVIDES=" + net.java.dev.jna:jna:${PV} + net.java.dev.jna:jna-platform:${PV} +" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs + +DESCRIPTION="Java Native Access" +HOMEPAGE="https://github.com/java-native-access/jna" +SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" +SLOT="4" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +BDEPEND=" + virtual/pkgconfig +" + +CDEPEND=" + >=dev-libs/libffi-3.4:= +" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/reflections:0 + ) + ${CDEPEND} + x11-libs/libXt +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CDEPEND} +" + +DOCS=( README.md CHANGES.md OTHERS TODO ) +PATCHES=( + "${FILESDIR}/5.11.0-makefile-flags.patch" + "${FILESDIR}/jna-5.11.0-no-Werror.patch" + "${FILESDIR}/jna-5.13.0-testpath.patch" +) + +src_prepare() { + default + java-pkg-2_src_prepare + java-pkg_clean + mkdir -p "res/META-INF" || die + echo "Main-Class: com.sun.jna.Native" > "res/META-INF/MANIFEST.MF" || die + + # https://github.com/java-native-access/jna/blob/5.13.0/build.xml#L402-L407 + sed \ + -e "/VERSION =/s:TEMPLATE:${PV}:" \ + -e '/VERSION_NATIVE =/s:TEMPLATE:5.1.0:' \ + -i src/com/sun/jna/Version.java || die +} + +src_compile() { + einfo "Compiling jna.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna" + JAVA_JAR_FILENAME="jna.jar" + JAVA_RESOURCE_DIRS="res" + JAVA_SRC_DIR="src" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":jna.jar" + rm -r target || die + + einfo "Compiling jna-platform.jar" + JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna.platform" + JAVA_JAR_FILENAME="jna-platform.jar" + JAVA_RESOURCE_DIRS="" + JAVA_SRC_DIR="contrib/platform/src" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA+=":jna-platform.jar" + rm -r target || die + + if use doc; then + einfo "Compiling javadocs" + JAVA_SRC_DIR=( + "src" + "contrib/platform/src" + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi + + einfo "Generating headers com_sun_jna_Native.h com_sun_jna_Function.h" + ejavac -h native -classpath "src" \ + "src/com/sun/jna/Function.java" \ + "src/com/sun/jna/Native.java" || die + + einfo "Building native library" + cd native || die + local args=( + CC="$(tc-getCC)" + STRIP=true + DYNAMIC_LIBFFI=true + ) + # Using -j1 since otherwise fails to build: + # cannot find ../build/native/libtestlib.so: No such file or directory + # [Makefile:505: ../build/native/libtestlib2.so] Error 1 + emake -j1 "${args[@]}" +} + +src_test() { + JAVA_TEST_EXTRA_ARGS=( + -Djna.nosys=true + -Djna.boot.library.path=build/native + -Djna.library.path=build/native + ) + JAVA_TEST_GENTOO_CLASSPATH=" + junit-4 + reflections + " + + JAVA_TEST_SRC_DIR="contrib/platform/test" + rm -r contrib/platform/test/com/sun/jna/platform/{mac,unix,win32} || die + JAVA_TEST_EXCLUDES=( + # 1) testGetXAttr(com.sun.jna.platform.linux.XAttrUtilTest) + # java.io.IOException: errno: 95 + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85) + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70) + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56) + # at com.sun.jna.platform.linux.XAttrUtilTest.testGetXAttr(XAttrUtilTest.java:83) + # 2) setXAttr(com.sun.jna.platform.linux.XAttrUtilTest) + # java.io.IOException: errno: 95 + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85) + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70) + # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56) + # at com.sun.jna.platform.linux.XAttrUtilTest.setXAttr(XAttrUtilTest.java:53) + com.sun.jna.platform.linux.XAttrUtilTest + ) + java-pkg-simple_src_test + + JAVA_TEST_SRC_DIR="test" + rm -r test/com/sun/jna/wince || die + rm -r test/com/sun/jna/win32 || die + + # 1) testLoadFromJarAbsolute(com.sun.jna.LibraryLoadTest) + # java.lang.UnsatisfiedLinkError: Unable to load library '/libtestlib-jar.so': + # /libtestlib-jar.so: cannot open shared object file: No such file or directory + jar cvf build/jna-test.jar \ + -C build/native libtestlib-jar.so || die + JAVA_GENTOO_CLASSPATH_EXTRA+=":build/jna-test.jar" + + JAVA_TEST_EXCLUDES=( + com.sun.jna.CallbacksTest # Needs to run separately + com.sun.jna.DirectTest # Needs to run separately + com.sun.jna.ELFAnalyserTest # NPE + com.sun.jna.NativeTest # Needs to run separately + com.sun.jna.UnionTest # Needs to run separately + com.sun.jna.VMCrashProtectionTest # Needs to run separately + ) + java-pkg-simple_src_test + + JAVA_TEST_RUN_ONLY=( + com.sun.jna.CallbacksTest + com.sun.jna.DirectTest + com.sun.jna.UnionTest + ) + java-pkg-simple_src_test + + JAVA_TEST_RUN_ONLY=( com.sun.jna.NativeTest ) + java-pkg-simple_src_test + + JAVA_TEST_RUN_ONLY=( com.sun.jna.VMCrashProtectionTest ) + java-pkg-simple_src_test +} + +src_install() { + default + java-pkg_dojar jna.jar jna-platform.jar + java-pkg_doso build/native/libjnidispatch.so + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc "src/*" + java-pkg_dosrc "contrib/platform/src/*" + fi +} diff --git a/dev-java/jna/jna-5.13.0.ebuild b/dev-java/jna/jna-5.13.0.ebuild deleted file mode 100644 index 88dde9319e6d..000000000000 --- a/dev-java/jna/jna-5.13.0.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# 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_PROVIDES=" - net.java.dev.jna:jna:${PV} - net.java.dev.jna:jna-platform:${PV} -" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple toolchain-funcs - -DESCRIPTION="Java Native Access" -HOMEPAGE="https://github.com/java-native-access/jna" -SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}" - -LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" -SLOT="4" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -BDEPEND=" - virtual/pkgconfig -" - -CDEPEND=" - >=dev-libs/libffi-3.4:= -" - -DEPEND=" - >=virtual/jdk-1.8:* - test? ( - dev-java/reflections:0 - ) - ${CDEPEND} - x11-libs/libXt -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND} -" - -DOCS=( README.md CHANGES.md OTHERS TODO ) -PATCHES=( - "${FILESDIR}/5.11.0-makefile-flags.patch" - "${FILESDIR}/jna-5.11.0-no-Werror.patch" - "${FILESDIR}/jna-5.13.0-testpath.patch" -) - -src_prepare() { - default - java-pkg-2_src_prepare - java-pkg_clean - mkdir -p "res/META-INF" || die - echo "Main-Class: com.sun.jna.Native" > "res/META-INF/MANIFEST.MF" || die - - # https://github.com/java-native-access/jna/blob/5.13.0/build.xml#L402-L407 - sed \ - -e "/VERSION =/s:TEMPLATE:${PV}:" \ - -e '/VERSION_NATIVE =/s:TEMPLATE:5.1.0:' \ - -i src/com/sun/jna/Version.java || die -} - -src_compile() { - einfo "Compiling jna.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna" - JAVA_JAR_FILENAME="jna.jar" - JAVA_RESOURCE_DIRS="res" - JAVA_SRC_DIR="src" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":jna.jar" - rm -r target || die - - einfo "Compiling jna-platform.jar" - JAVA_AUTOMATIC_MODULE_NAME="com.sun.jna.platform" - JAVA_JAR_FILENAME="jna-platform.jar" - JAVA_RESOURCE_DIRS="" - JAVA_SRC_DIR="contrib/platform/src" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA+=":jna-platform.jar" - rm -r target || die - - if use doc; then - einfo "Compiling javadocs" - JAVA_SRC_DIR=( - "src" - "contrib/platform/src" - ) - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile - fi - - einfo "Generating headers com_sun_jna_Native.h com_sun_jna_Function.h" - ejavac -h native -classpath "src" \ - "src/com/sun/jna/Function.java" \ - "src/com/sun/jna/Native.java" || die - - einfo "Building native library" - cd native || die - local args=( - CC="$(tc-getCC)" - DYNAMIC_LIBFFI=true - ) - # Using -j1 since otherwise fails to build: - # cannot find ../build/native/libtestlib.so: No such file or directory - # [Makefile:505: ../build/native/libtestlib2.so] Error 1 - emake -j1 "${args[@]}" -} - -src_test() { - JAVA_TEST_EXTRA_ARGS=( - -Djna.nosys=true - -Djna.boot.library.path=build/native - -Djna.library.path=build/native - ) - JAVA_TEST_GENTOO_CLASSPATH=" - junit-4 - reflections - " - - JAVA_TEST_SRC_DIR="contrib/platform/test" - rm -r contrib/platform/test/com/sun/jna/platform/{mac,unix,win32} || die - JAVA_TEST_EXCLUDES=( - # 1) testGetXAttr(com.sun.jna.platform.linux.XAttrUtilTest) - # java.io.IOException: errno: 95 - # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85) - # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70) - # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56) - # at com.sun.jna.platform.linux.XAttrUtilTest.testGetXAttr(XAttrUtilTest.java:83) - # 2) setXAttr(com.sun.jna.platform.linux.XAttrUtilTest) - # java.io.IOException: errno: 95 - # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:85) - # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:70) - # at com.sun.jna.platform.linux.XAttrUtil.setXAttr(XAttrUtil.java:56) - # at com.sun.jna.platform.linux.XAttrUtilTest.setXAttr(XAttrUtilTest.java:53) - com.sun.jna.platform.linux.XAttrUtilTest - ) - java-pkg-simple_src_test - - JAVA_TEST_SRC_DIR="test" - rm -r test/com/sun/jna/wince || die - rm -r test/com/sun/jna/win32 || die - - # 1) testLoadFromJarAbsolute(com.sun.jna.LibraryLoadTest) - # java.lang.UnsatisfiedLinkError: Unable to load library '/libtestlib-jar.so': - # /libtestlib-jar.so: cannot open shared object file: No such file or directory - jar cvf build/jna-test.jar \ - -C build/native libtestlib-jar.so || die - JAVA_GENTOO_CLASSPATH_EXTRA+=":build/jna-test.jar" - - JAVA_TEST_EXCLUDES=( - com.sun.jna.CallbacksTest # Needs to run separately - com.sun.jna.DirectTest # Needs to run separately - com.sun.jna.ELFAnalyserTest # NPE - com.sun.jna.NativeTest # Needs to run separately - com.sun.jna.UnionTest # Needs to run separately - com.sun.jna.VMCrashProtectionTest # Needs to run separately - ) - java-pkg-simple_src_test - - JAVA_TEST_RUN_ONLY=( - com.sun.jna.CallbacksTest - com.sun.jna.DirectTest - com.sun.jna.UnionTest - ) - java-pkg-simple_src_test - - JAVA_TEST_RUN_ONLY=( com.sun.jna.NativeTest ) - java-pkg-simple_src_test - - JAVA_TEST_RUN_ONLY=( com.sun.jna.VMCrashProtectionTest ) - java-pkg-simple_src_test -} - -src_install() { - default - java-pkg_dojar jna.jar jna-platform.jar - java-pkg_doso build/native/libjnidispatch.so - - if use doc; then - java-pkg_dojavadoc target/api - fi - - if use source; then - java-pkg_dosrc "src/*" - java-pkg_dosrc "contrib/platform/src/*" - fi -} -- cgit v1.2.3