From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- dev-java/jna/Manifest | 2 +- dev-java/jna/jna-4.2.2-r2.ebuild | 87 ---------------------------------------- dev-java/jna/jna-4.2.2-r3.ebuild | 87 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 88 deletions(-) delete mode 100644 dev-java/jna/jna-4.2.2-r2.ebuild create 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 d1b5d5108494..c89311189535 100644 --- a/dev-java/jna/Manifest +++ b/dev-java/jna/Manifest @@ -1,5 +1,5 @@ AUX 4.2.2-build.xml.patch 819 BLAKE2B 5f411361cd566360206c996ff5c2c508e829e41bb56868dce428da1347ab91f7fc8e1230b6aca3e82806c80b23a038966f690a16f99b43b5b2594bca543cb606 SHA512 8d2e0552690c9282ce93e39aa489c1fd829e5e63e39c6e6db935b6b5e2308a3ee3cbe1a274ebf2ba59d9819dd4f618d89e22194a9f88dec0763d2a36cd3ca44e AUX 4.2.2-makefile-flags.patch 925 BLAKE2B 642982867b5c187345123725f5e19bccb363915aefc5ea6e69f02e9ca86efee1e5f466c7cb9abf1b2871a735c45f8b7adaf999e42a351e01e515ecdc6648387e SHA512 be29adfff3b92875b38cf9bb326d935a189555bbb10315412b2544b43698cf76132554df64f28a18d4910ef1c46daf8b0a2ef9db7a9bca1ab53c421504187e54 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e SHA512 11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f -EBUILD jna-4.2.2-r2.ebuild 2141 BLAKE2B b80cb145b52cf495a2f7ca147cd68f6e1462ba2a7b32439049607447c227b0ebfb03f6a6a9008a23315602ca1864b96b0c4faa327da85bf113f5a7e63c98d568 SHA512 1080ffb4e91249e12f72ea7c45a47997d10011bf91e802451681e7a124ed10b7f4bd5269f79e3e0ae9b94171ab21dd43ecca8e95753520562cc0315b86538dcc +EBUILD jna-4.2.2-r3.ebuild 2143 BLAKE2B fc92ccc827c1d4118707c76477119d0c0d31d3783fc6f900c49bfaa8fa5359cc1a05c9a72febdcd9831363b3a1353992df35e9fa1446135e90a43d613b2b5e12 SHA512 23106b242b13f8927a928b18cecc87d9422275a7b82b59eaf9d143c5f57d13a65a44991357d04dc5a60e4da78cee837d7bfb1a496bd52bad4a3bb0fcbf60defe MISC metadata.xml 462 BLAKE2B 7ad9e0cb48ce7fdfae4bdc10bf3cb6d6c25a7f86d62dbb9041d0ad2fe04409477eb27754b5f53218fba657f7ed77b423b34bea92bffb61c37ee2eefdcccc3a3b SHA512 88a027ef32c55e551625950ecb2efffc75a7611568f11a4abdcddd4fe24b894eb7d8fb805cba3fc0f79ddf6fae6116804790fc24b3d5b6097ade9ad92ed4c118 diff --git a/dev-java/jna/jna-4.2.2-r2.ebuild b/dev-java/jna/jna-4.2.2-r2.ebuild deleted file mode 100644 index 672aa2f06bb6..000000000000 --- a/dev-java/jna/jna-4.2.2-r2.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-4.2.2-r3.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild new file mode 100644 index 000000000000..6ba89af05328 --- /dev/null +++ b/dev-java/jna/jna-4.2.2-r3.ebuild @@ -0,0 +1,87 @@ +# 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 +} -- cgit v1.2.3