From c9e9e39938097bf29063c271195ad0d7d7bd02a9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Sep 2023 17:03:45 +0100 Subject: gentoo auto-resync : 17:09:2023 - 17:03:44 --- dev-java/jna/Manifest | 5 +- dev-java/jna/files/5.10.0-build.xml.patch | 55 ------------------ dev-java/jna/jna-5.11.0-r1.ebuild | 96 ------------------------------- dev-java/jna/jna-5.13.0-r1.ebuild | 2 +- 4 files changed, 2 insertions(+), 156 deletions(-) delete mode 100644 dev-java/jna/files/5.10.0-build.xml.patch delete mode 100644 dev-java/jna/jna-5.11.0-r1.ebuild (limited to 'dev-java/jna') diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest index 6ad00722f68c..40a70ed41344 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -1,9 +1,6 @@ -AUX 5.10.0-build.xml.patch 3325 BLAKE2B 9beb22ee4976bbac29e9ff79f5efedbe21e8a7ef93a83a37320fe327574844efa8d1a5ec1c9948df4dc7934d2be9b5635c4ce2b639b2af12f1eb7fc9100beef6 SHA512 4d22a080f85f7cc533db62c66ae77b3b56062624361f40e71dc7e41a57ddaaded05ca30e85b670805165347aa42e179c76f7d5ec0b558ab07b7dadaef0cfa64f AUX 5.11.0-makefile-flags.patch 1183 BLAKE2B 81c465ed4929586787bfa68016a8fe61cf082a8a5e59f5905b3bfae4900f68246cf3ad9c023ba7390c4bed4e38b109d4664e6a4f9759c8247714a65c72a0b357 SHA512 cb71b1af9af8b34d2ec8253ee7543614474527b0bc69ce9ee70e89a8738d423e45928f477de659bf141aad8b0401067fbbc58b50b580077afca40b32e0aa8db4 AUX jna-5.11.0-no-Werror.patch 723 BLAKE2B a5fabcb532861432f9cd76d429c6ac5c0ce54f8dfd8631da2135e2188d19ead69bcf7756972a1a72802b28c976adc6cdcc4528775c321cc74eb476436c842dc6 SHA512 86e356ddc860252c6d743ac71db031e109cff6270c13f4495d3ab7ecd723a6b7a7ca86b37dd2260b6424842dca1a5e2dd7b4792d17bc8b392e78da28e10b70c7 AUX jna-5.13.0-testpath.patch 5567 BLAKE2B 0c76e603af9ae2a1f3cacde220ec4451d5973f9dab805e20fc5e9bf852928a0489ca742df8277a9c5a47d10064897ea50860d587b21288d605c476d3e7d122ae SHA512 c8c40a6f5ec049641eb3cca2a9b74fd851ebf6264d5a5cc1db10190d645e4bf219f45d5bb68094ce843b32f7079a8ae0ccb1a804f2cc0d066052acf841c96145 -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-r1.ebuild 5205 BLAKE2B 67689eebd0adf8a6734116fa6896093160a32d6546f5587de073db0f822cc175bd1184647e9e4e392f08443286469f37a0e476ac1992aa51ba2d1f053aef2349 SHA512 d4dd8ae37269267acccccfdb7833d1f062904a28edd1d8a419d5e3fc098d3e87fd2c4c50d8af574d0c44031d92335f87dd34ec7a5d3133cd7b99ab7d63c55ed3 +EBUILD jna-5.13.0-r1.ebuild 5204 BLAKE2B cbe2fa105745977b4e5ce740b1c21f30cd0be6ec373b3361a452eaa573c8d2f8fc0f27873e367e764ff26852d1eaa2da899624764e08f15aa1e35402c49bfcd5 SHA512 7c164c5864bf63ee3fdb3e287ca8ae0f207506391b7a10478ce5c8b0e4c138423d1a6850357b929ed8fe2aaf5583c81ef805b9b28f22092e45555b65a1125bbf MISC metadata.xml 334 BLAKE2B 9e55710ddf27995f7f0ea6480a4b2ff6ed38424e5a8de87614715defa4ae9f788932d270df48e78fdadb27851f06f2651d94c0b043816151aea55c08f083c4ee SHA512 b8b0cc53cc447f2811b3e94638de0799efaf99a05f29a0341d3a261b1f0f996ca308a007221f165031e56e60339d8d616ca366f25eda7f7f5d55acfc60a9d695 diff --git a/dev-java/jna/files/5.10.0-build.xml.patch b/dev-java/jna/files/5.10.0-build.xml.patch deleted file mode 100644 index 242845bfd356..000000000000 --- a/dev-java/jna/files/5.10.0-build.xml.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/build.xml b/build.xml -index ed104c2..cd8895c 100644 ---- a/build.xml -+++ b/build.xml -@@ -182,9 +182,9 @@ - - - -- -- -- -+ -+ -+ - - - -@@ -385,7 +385,9 @@ - - - -+ - - - -@@ -1265,8 +1267,10 @@ cd .. - - - -+ - - - -diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml -index 47fa8ed..a623ce6 100644 ---- a/contrib/platform/build.xml -+++ b/contrib/platform/build.xml -@@ -115,9 +115,9 @@ - - - -- -- -- -+ -+ -+ - - - diff --git a/dev-java/jna/jna-5.11.0-r1.ebuild b/dev-java/jna/jna-5.11.0-r1.ebuild deleted file mode 100644 index 3753bc815a3c..000000000000 --- a/dev-java/jna/jna-5.11.0-r1.ebuild +++ /dev/null @@ -1,96 +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_ID="net.java.dev.jna:jna:5.11.0" - -inherit java-pkg-2 java-ant-2 toolchain-funcs - -DESCRIPTION="Java Native Access" -HOMEPAGE="https://github.com/java-native-access/jna" -SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -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:* - dev-java/animal-sniffer-annotations:0 - dev-java/ant-core:0 - dev-java/asm:9 - test? ( - dev-java/ant-junit4:0 - dev-java/junit:4 - dev-java/reflections:0 - ) - ${CDEPEND} - x11-libs/libXt -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND} -" - -DOCS=( README.md CHANGES.md OTHERS TODO ) -PATCHES=( - "${FILESDIR}/5.10.0-build.xml.patch" - "${FILESDIR}/5.11.0-makefile-flags.patch" - "${FILESDIR}/jna-5.11.0-no-Werror.patch" -) - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_PKG_BSFIX_NAME="build.xml build-ant-tools.xml" -EANT_BUILD_TARGET="jar contrib-jars" -EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8 -Ddynlink.native=true" -EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\"" -EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections" - -src_prepare() { - default - - EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \ - animal-sniffer-annotations,ant-core,asm-9)" - - # Any spaces in paths returned by toolchain-funcs and options like MAKEOPTS - # could cause trouble in EANT_EXTRA_ARGS when Java eclasses process the - # variable's value, so define them in ANT_OPTS instead - ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'" - # Parallel build does not respect dependency relationships between objects - ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'" - - # Eliminate build.xml's dependency on bundled native JARs - sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml || - die "Failed to delete lines referencing bundled JARs in build.xml" - - # Clean up bundled JARs and libffi - java-pkg_clean - rm -r native/libffi || die "Failed to remove bundled libffi" - - java-pkg-2_src_prepare -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar "build/${PN}-min.jar" - java-pkg_dojar "contrib/platform/dist/${PN}-platform.jar" - java-pkg_doso build/native-*/libjnidispatch.so - einstalldocs - - use source && java-pkg_dosrc src/* - use doc && java-pkg_dojavadoc doc/javadoc -} diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild b/dev-java/jna/jna-5.13.0-r1.ebuild index 19642915662e..4a2c7b7ff1e4 100644 --- a/dev-java/jna/jna-5.13.0-r1.ebuild +++ b/dev-java/jna/jna-5.13.0-r1.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${P}" LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" SLOT="4" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" BDEPEND=" virtual/pkgconfig -- cgit v1.2.3