From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-java/jna/Manifest | 10 ++- dev-java/jna/files/4.2.2-build.xml.patch | 23 ------- dev-java/jna/files/5.11.0-makefile-flags.patch | 34 ++++++++++ dev-java/jna/jna-4.2.2-r3.ebuild | 87 -------------------------- dev-java/jna/jna-5.10.0.ebuild | 2 +- dev-java/jna/jna-5.11.0.ebuild | 4 +- dev-java/jna/metadata.xml | 4 -- 7 files changed, 41 insertions(+), 123 deletions(-) delete mode 100644 dev-java/jna/files/4.2.2-build.xml.patch create mode 100644 dev-java/jna/files/5.11.0-makefile-flags.patch delete mode 100644 dev-java/jna/jna-4.2.2-r3.ebuild (limited to 'dev-java/jna') diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest index 64a099a6d195..1f968935aea8 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -1,10 +1,8 @@ -AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb56868dce428da1347ab91f7fc8e1230b6aca3e82806c80b23a038966f690a16f99b43b5b2594bca543cb606 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54 AUX 5.10.0-build.xml.patch 3325 BLAKE2B 9beb22ee4976bbac29e9ff79f5efedbe21e8a7ef93a83a37320fe327574844efa8d1a5ec1c9948df4dc7934d2be9b5635c4ce2b639b2af12f1eb7fc9100beef6 SHA512 4d22a080f85f7cc533db62c66ae77b3b56062624361f40e71dc7e41a57ddaaded05ca30e85b670805165347aa42e179c76f7d5ec0b558ab07b7dadaef0cfa64f -DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f +AUX 5.11.0-makefile-flags.patch 1183 BLAKE2B 81c465ed4929586787bfa68016a8fe61cf082a8a5e59f5905b3bfae4900f68246cf3ad9c023ba7390c4bed4e38b109d4664e6a4f9759c8247714a65c72a0b357 SHA512 cb71b1af9af8b34d2ec8253ee7543614474527b0bc69ce9ee70e89a8738d423e45928f477de659bf141aad8b0401067fbbc58b50b580077afca40b32e0aa8db4 DIST jna-5.10.0.tar.gz 106258319 BLAKE2B f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd SHA512 93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256 DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf SHA512 0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d -EBUILD jna-4.2.2-r3.ebuild 2140 BLAKE2B 02bf4fa0fddb60ea509a042244e6d450e0827b5002a01d55438028c3e9b67bde5be21bfd3ed11b0ce90faf7f19397bf6f1f6b890ac5a70d2dcc06e59ba63ba98 SHA512 e9b8ba2522bcd0582f8c29eaf7b8b66a687ddf3c28c07d13b8b2e0a9d666efeb7e51d399f57c26e6f178fcf0ae279e272455083663ecc729ef3b0ba4e8c2c885 -EBUILD jna-5.10.0.ebuild 2463 BLAKE2B e7d4f12b13feb036bc0b17613e74a87273c1872f9690e0aa8420e9f622e4153f920760d7a4257e11d6426d49717e4e72ba09a9c4af3b9ff5bc4bdaa14b394da1 SHA512 6d6288af5598eae79640ee0c2872f876046ca180fb24878898663b1f58619c609fc28fa93c3032fe30646b9739c666c5c0cbe9881326cfc0c95c016929da45e9 -EBUILD jna-5.11.0.ebuild 2464 BLAKE2B cafa1c0301a3c5e0135ae0b521f7e762547d2152ef28cac0573e2d66216893839402cc2bba2a8805ecaa75a12682ff2f83f7407f70ff7147e62ead149d36962b SHA512 33f2bcced4969921bf9d02df5d02412376678ec2a49c21379fc9cc48aca8f768b5d0ff4f4ae2a1cd57cf42a8335f5825c4e98edaebd962bd71e8527e9f75e16e -MISC metadata.xml 463 BLAKE2B 9ead7422212fdd6bebd8ec6aabafcdedf0d32420d312a8a0f2cd701dc7eeb940a30e91d1dc0449899a6134e1cb96d47cf95cea5dc20b4974b3d8714c6c00f93b SHA512 1365756d0d98cd7e7bcee2a608a77f1ca95c9546567a0bb37ba0033eb997ef6ae37d86e79c7c7fdc0916cb515658f9a37924181efc3215d00c825b10f9f99b45 +EBUILD jna-5.10.0.ebuild 2459 BLAKE2B 86b61d92ab01caeb641565650fff5e9024ef39f163fccbcbdf2f167b6bb198e952ab21f2650031f85c9ca7436f7a3690a28d28957c58547c080eac12fd235d64 SHA512 408ef249df31976f88baf7ff7222796a402c0ed94154b280eb3c5333b8deee30fe4c22709e2bdbffa3b40e3196ea8b6c39c547fc76ae16c489caefcc2734766f +EBUILD jna-5.11.0.ebuild 2490 BLAKE2B c97633d35bcaa3de72948587a4b56fea5a92a691428f20ba52da2a5111f36f4788e3a55c96b7b06df0c2445e0e34b005505229bfddfdf5d1ef02ccbb8e8b6a31 SHA512 2ed6e9dfeb73b9acc059597a28f59f03c3a93d70a35ee206c5a57c7c987c26c7d1889ea112b6c5d4bc7a0017e2ac6d145abb785aef98825b1b40f184a69ebc0d +MISC metadata.xml 321 BLAKE2B c39a2036ee429d7d2dd70a9481ae84e86dd94d428be06668800b57a32910af90019d644276fb3466ab7ae5ec5a53ab6599ba8e16770ffad5d10730df6926f326 SHA512 aa6b45e487d69fda26d85ad22900da9085aaa3c1fac1b7c2b0ce22199f35d833640a3d9513dc8efc6ae49b6c00f42a3581ca325e67b3e14e8a72742799addece diff --git a/dev-java/jna/files/4.2.2-build.xml.patch b/dev-java/jna/files/4.2.2-build.xml.patch deleted file mode 100644 index de49c24b1912..000000000000 --- a/dev-java/jna/files/4.2.2-build.xml.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/build.xml 2016-03-16 14:37:28.000000000 +0000 -+++ b/build.xml 2016-04-16 22:22:27.692967205 +0100 -@@ -320,7 +320,9 @@ - - - -+ - - - -@@ -909,8 +911,10 @@ - - - -+ - - - diff --git a/dev-java/jna/files/5.11.0-makefile-flags.patch b/dev-java/jna/files/5.11.0-makefile-flags.patch new file mode 100644 index 000000000000..4a84abebf45d --- /dev/null +++ b/dev-java/jna/files/5.11.0-makefile-flags.patch @@ -0,0 +1,34 @@ +--- a/native/Makefile ++++ b/native/Makefile +@@ -81,7 +81,7 @@ LIBPFX=lib + LIBSFX=.so + ARSFX=.a + JNISFX=$(LIBSFX) +-CC=gcc ++CC?=gcc + LD=$(CC) + LIBS= + # Default to Sun recommendations for JNI compilation +@@ -94,10 +94,10 @@ CFLAGS_EXTRA= + COUT=-o $@ + CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include + CDEFINES=-D_REENTRANT +-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses +-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ ++PCFLAGS=-Wall -Wno-unused -Wno-parentheses ++CFLAGS+= $(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \ + -DJNA_JNI_VERSION='"$(JNA_JNI_VERSION)"' -DCHECKSUM='"$(CHECKSUM)"' +-LDFLAGS=-o $@ -shared ++LDFLAGS+= -o $@ -shared + ifeq ($(DYNAMIC_LIBFFI),true) + CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo) + LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi) +@@ -108,7 +108,7 @@ endif + # Avoid bug in X11-based 1.5/1.6 VMs; dynamically load instead of linking + # See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705 + #LIBS=-L"$(LIBDIR)" -ljawt +-STRIP=strip -x ++STRIP?=strip -x + # end defaults + + # Android build (cross-compile) requires the android NDK. diff --git a/dev-java/jna/jna-4.2.2-r3.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild deleted file mode 100644 index 2950dfd0edbf..000000000000 --- a/dev-java/jna/jna-4.2.2-r3.ebuild +++ /dev/null @@ -1,87 +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" -MAVEN_ID="net.java.dev.jna:jna:4.2.2" - -inherit java-pkg-2 java-ant-2 toolchain-funcs - -DESCRIPTION="Java Native Access (JNA)" -HOMEPAGE="https://github.com/java-native-access/jna" -SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="4" -KEYWORDS="amd64 ppc64 x86" -IUSE="+awt +nio-buffers test" - -REQUIRED_USE="test? ( awt nio-buffers )" - -# The tests stall immediately on some systems (not current stable?) when -# the sandbox is active but pass successfully otherwise. Chewi has not -# been able to determine why. This began in 4.2.0 as 4.1.0 worked -# fine. Someone bisect it please. :) -RESTRICT="test" - -CDEPEND="dev-libs/libffi:=" -DEPEND="${CDEPEND} - virtual/jdk:1.8 - x11-libs/libXt - test? ( - dev-java/ant-junit:0 - dev-java/guava:20 - dev-java/javassist:3 - dev-java/reflections:0 - )" -RDEPEND="${CDEPEND} - virtual/jre:1.8" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PV}-build.xml.patch - "${FILESDIR}"/${PV}-makefile-flags.patch -) - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_BUILD_TARGET="native jar contrib-jars" -EANT_EXTRA_ARGS="-Ddynlink.native=true" -EANT_TEST_EXTRA_ARGS="-Dheadless=true -Djava.io.tmpdir=${T}" -EANT_TEST_GENTOO_CLASSPATH="guava-20,javassist-3,reflections" - -src_prepare() { - default - - # delete bundled jars and copy of libffi - # except native jars because build.xml needs them all - find ! -path "./lib/native/*" -name "*.jar" -delete || die - rm -r native/libffi || die - - if ! use awt ; then - sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die - fi - - if ! use nio-buffers ; then - sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_NIO_BUFFERS/g" native/Makefile || die - fi - - java-pkg-2_src_prepare -} - -src_configure() { - tc-export CC -} - -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 - - use source && java-pkg_dosrc src/* - use doc && java-pkg_dojavadoc doc/javadoc -} - -src_test() { - java-pkg-2_src_test -} diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild index 1d15c940f056..4e08475cbb53 100644 --- a/dev-java/jna/jna-5.10.0.ebuild +++ b/dev-java/jna/jna-5.10.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/java-native-access/jna/archive/refs/tags/${PV}.tar.g LICENSE="|| ( Apache-2.0 LGPL-2.1+ )" SLOT="4" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" BDEPEND=" virtual/pkgconfig diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild index be8f367f117d..44173ced3c04 100644 --- a/dev-java/jna/jna-5.11.0.ebuild +++ b/dev-java/jna/jna-5.11.0.ebuild @@ -46,7 +46,7 @@ RDEPEND=" DOCS=( README.md CHANGES.md OTHERS TODO ) PATCHES=( "${FILESDIR}/5.10.0-build.xml.patch" - "${FILESDIR}/4.2.2-makefile-flags.patch" + "${FILESDIR}/5.11.0-makefile-flags.patch" ) JAVA_ANT_REWRITE_CLASSPATH="true" @@ -65,7 +65,7 @@ pkg_setup() { # 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)'" + ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'" # Parallel build does not respect dependency relationships between objects ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'" } diff --git a/dev-java/jna/metadata.xml b/dev-java/jna/metadata.xml index 6a68a977dd25..3966f68718c9 100644 --- a/dev-java/jna/metadata.xml +++ b/dev-java/jna/metadata.xml @@ -5,10 +5,6 @@ java@gentoo.org Java - - Enables support for Java AWT - Enables support for NIO buffers - twall/jna -- cgit v1.2.3