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 40F7215814C for ; Sun, 17 Sep 2023 14:53:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59D172BC017; Sun, 17 Sep 2023 14:53:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 424542BC017 for ; Sun, 17 Sep 2023 14:53:38 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C2A6335D2F for ; Sun, 17 Sep 2023 14:53:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99367E8F for ; Sun, 17 Sep 2023 14:53:35 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1694961909.d4aa470ac2832bc73f88e361cd9f46685345d303.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/, dev-java/jna/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jna/Manifest dev-java/jna/files/5.10.0-build.xml.patch dev-java/jna/jna-5.11.0-r1.ebuild X-VCS-Directories: dev-java/jna/ dev-java/jna/files/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: d4aa470ac2832bc73f88e361cd9f46685345d303 X-VCS-Branch: master Date: Sun, 17 Sep 2023 14:53:35 +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: 53ed1dc9-8c50-4fe6-bb61-5b8375bca0fa X-Archives-Hash: d35d15561baa653c48d8d8c0cd5a2c1e commit: d4aa470ac2832bc73f88e361cd9f46685345d303 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Sep 17 14:39:34 2023 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sun Sep 17 14:45:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4aa470a dev-java/jna: drop 5.11.0-r1 Closes: https://bugs.gentoo.org/881021 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/32881 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/jna/Manifest | 1 - dev-java/jna/files/5.10.0-build.xml.patch | 55 ------------------ dev-java/jna/jna-5.11.0-r1.ebuild | 96 ------------------------------- 3 files changed, 152 deletions(-) diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest index f60719c514f1..5a75b4046036 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -1,2 +1 @@ -DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d DIST jna-5.13.0.tar.gz 116027625 BLAKE2B 1f2bc7ab28adefa0bbad122957ed2c6ef55ab88e79b30c05f0d2d88e0e05152f7bb5e28097906a7e24f78304dfa2b225587adb0ada205ca3c2ceac1cdbab3f04 SHA512 aefd0becc03bb7fd753e8c5cdcbcb20f6d590125a5fb03048bef0024e826ab0254b750e22a8bb26bea38cc89262ad45e5030b666cb2c857b01b15a6a55379a0f 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 -}