[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2024-01-29 Thread Miroslav Šulc
commit: a463c107217aec060a2e10b7644ce0342c1c6359
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Jan 29 08:01:11 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jan 29 08:27:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a463c107

dev-java/jna: DEPEND on xorg-proto:0

Closes: https://bugs.gentoo.org/922916
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35065
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/{jna-5.14.0.ebuild => jna-5.14.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/jna/jna-5.14.0.ebuild b/dev-java/jna/jna-5.14.0-r1.ebuild
similarity index 99%
rename from dev-java/jna/jna-5.14.0.ebuild
rename to dev-java/jna/jna-5.14.0-r1.ebuild
index d9f59b4ed75e..183ba4f35027 100644
--- a/dev-java/jna/jna-5.14.0.ebuild
+++ b/dev-java/jna/jna-5.14.0-r1.ebuild
@@ -31,6 +31,7 @@ CDEPEND="
 
 DEPEND="
>=virtual/jdk-1.8:*
+   x11-base/xorg-proto:0
test? (
dev-java/reflections:0
)



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2024-01-19 Thread Sam James
commit: 06bab334412602b6d524489feb8e4e25f8cf3739
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 19 10:47:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 19 10:47:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06bab334

dev-java/jna: Stabilize 5.14.0 x86, #922472

Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/jna-5.14.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.14.0.ebuild b/dev-java/jna/jna-5.14.0.ebuild
index 2b23fed6af21..d9f59b4ed75e 100644
--- a/dev-java/jna/jna-5.14.0.ebuild
+++ b/dev-java/jna/jna-5.14.0.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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2024-01-19 Thread Sam James
commit: db8af84159dac5c47a96e9484db98e4a66a5e4be
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 19 10:07:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 19 10:07:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db8af841

dev-java/jna: Stabilize 5.14.0 amd64, #922472

Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/jna-5.14.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jna/jna-5.14.0.ebuild b/dev-java/jna/jna-5.14.0.ebuild
index 5a2384e5a276..fd177100272f 100644
--- a/dev-java/jna/jna-5.14.0.ebuild
+++ b/dev-java/jna/jna-5.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2024-01-19 Thread Sam James
commit: 831109458de87e47702bbc6c37af931a674e1afd
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 19 10:07:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 19 10:07:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83110945

dev-java/jna: Stabilize 5.14.0 arm64, #922472

Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/jna-5.14.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.14.0.ebuild b/dev-java/jna/jna-5.14.0.ebuild
index fd177100272f..2b23fed6af21 100644
--- a/dev-java/jna/jna-5.14.0.ebuild
+++ b/dev-java/jna/jna-5.14.0.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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2023-12-20 Thread Miroslav Šulc
commit: f465e30c0f723ade8d1bfa82f77b778be36d32e7
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Dec 11 21:33:26 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Dec 20 09:15:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f465e30c

dev-java/jna: add 5.14.0

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: 
https://github.com/gentoo/gentoo/pull/33579/commits/8c77ae7d12ca0c1cb3e0c260a6e073bf7eebbe20
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/Manifest  |   1 +
 dev-java/jna/jna-5.14.0.ebuild | 197 +
 2 files changed, 198 insertions(+)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 5a75b4046036..667bee66b18f 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1 +1,2 @@
 DIST jna-5.13.0.tar.gz 116027625 BLAKE2B 
1f2bc7ab28adefa0bbad122957ed2c6ef55ab88e79b30c05f0d2d88e0e05152f7bb5e28097906a7e24f78304dfa2b225587adb0ada205ca3c2ceac1cdbab3f04
 SHA512 
aefd0becc03bb7fd753e8c5cdcbcb20f6d590125a5fb03048bef0024e826ab0254b750e22a8bb26bea38cc89262ad45e5030b666cb2c857b01b15a6a55379a0f
+DIST jna-5.14.0.tar.gz 116167104 BLAKE2B 
3ccb9e53e843690f9c90272c2e94fb2d903dd9bbcb7b6294a6ed3d973d3945c2b3fe5ac5e4c472830a7d07f4f32d84e781bb2ae3bd73cdd1894392331554e2cd
 SHA512 
5758898052b3b099cd8b40046f764813377970a428e66370ba2a7125403661e25379d55fdb0ff75de32d66cbff20f0a05f438b2ca18804cc53f2edf4b1927ff0

diff --git a/dev-java/jna/jna-5.14.0.ebuild b/dev-java/jna/jna-5.14.0.ebuild
new file mode 100644
index ..5a2384e5a276
--- /dev/null
+++ b/dev-java/jna/jna-5.14.0.ebuild
@@ -0,0 +1,197 @@
+# 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"
+   "${FILESDIR}/jna-5.13.0-LibCTest.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=(
+   

[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2023-09-28 Thread Miroslav Šulc
commit: 81d10cec46c9dc2c4177d1c230dcf806aa47deae
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Sep 28 08:58:39 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep 29 05:53:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d10cec

dev-java/jna: separate test run for com.sun.jna.TypeMapperTest

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30966
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/jna-5.13.0-r1.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild 
b/dev-java/jna/jna-5.13.0-r1.ebuild
index ee0cd09734ed..a09e852950df 100644
--- a/dev-java/jna/jna-5.13.0-r1.ebuild
+++ b/dev-java/jna/jna-5.13.0-r1.ebuild
@@ -158,6 +158,7 @@ src_test() {
com.sun.jna.CallbacksTest # Needs to run separately
com.sun.jna.DirectTest # Needs to run separately
com.sun.jna.NativeTest # Needs to run separately
+   com.sun.jna.TypeMapperTest # Needs to run separately
com.sun.jna.UnionTest # Needs to run separately
com.sun.jna.VMCrashProtectionTest # Needs to run separately
)
@@ -175,6 +176,9 @@ src_test() {
 
JAVA_TEST_RUN_ONLY=( com.sun.jna.VMCrashProtectionTest )
java-pkg-simple_src_test
+
+   JAVA_TEST_RUN_ONLY=( com.sun.jna.TypeMapperTest )
+   java-pkg-simple_src_test
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2023-09-28 Thread Miroslav Šulc
commit: af4466d0574e930174c273508430655e95eabe3f
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri May 12 09:24:27 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep 29 05:53:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4466d0

dev-java/jna: add testdata, solves NPE on ELFAnalyserTest

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/jna-5.13.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild 
b/dev-java/jna/jna-5.13.0-r1.ebuild
index 9f97a53844f7..ee0cd09734ed 100644
--- a/dev-java/jna/jna-5.13.0-r1.ebuild
+++ b/dev-java/jna/jna-5.13.0-r1.ebuild
@@ -150,13 +150,13 @@ src_test() {
# 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
+   -C build/native libtestlib-jar.so \
+   -C test com/sun/jna/data || 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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/, dev-java/jna/files/

2023-09-28 Thread Miroslav Šulc
commit: 476fbf3f679937345c0b4a61410951250bc63e19
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Jun 20 09:37:20 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep 29 05:53:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=476fbf3f

dev-java/jna: Ignore testStatvfs from com.sun.jna.platform.linux.LibCTest

Closes: https://bugs.gentoo.org/906053
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/files/jna-5.13.0-LibCTest.patch | 12 
 dev-java/jna/jna-5.13.0-r1.ebuild|  1 +
 2 files changed, 13 insertions(+)

diff --git a/dev-java/jna/files/jna-5.13.0-LibCTest.patch 
b/dev-java/jna/files/jna-5.13.0-LibCTest.patch
new file mode 100644
index ..8cc9da563ed3
--- /dev/null
+++ b/dev-java/jna/files/jna-5.13.0-LibCTest.patch
@@ -0,0 +1,12 @@
+Bug #906053
+--- a/contrib/platform/test/com/sun/jna/platform/linux/LibCTest.java
 b/contrib/platform/test/com/sun/jna/platform/linux/LibCTest.java
+@@ -71,7 +71,7 @@ public class LibCTest extends TestCase {
+ }
+ 
+ @Test
+-public void testStatvfs() throws IOException, InterruptedException {
++public void noTestStatvfs() throws IOException, InterruptedException {
+ Statvfs vfs = new Statvfs();
+ 
+ String testDirectory = "/";

diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild 
b/dev-java/jna/jna-5.13.0-r1.ebuild
index 4a2c7b7ff1e4..9f97a53844f7 100644
--- a/dev-java/jna/jna-5.13.0-r1.ebuild
+++ b/dev-java/jna/jna-5.13.0-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}/5.11.0-makefile-flags.patch"
"${FILESDIR}/jna-5.11.0-no-Werror.patch"
"${FILESDIR}/jna-5.13.0-testpath.patch"
+   "${FILESDIR}/jna-5.13.0-LibCTest.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/, dev-java/jna/files/

2023-09-17 Thread Arthur Zamarin
commit: d4aa470ac2832bc73f88e361cd9f46685345d303
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Sep 17 14:39:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Sep 17 14:45:09 2023 +
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..
--- 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..
--- 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"
-

[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2023-09-17 Thread Arthur Zamarin
commit: 420218feee0c5b1a208e5e01fe92a9cfdca82f3e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Sep 17 14:28:06 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Sep 17 14:28:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420218fe

dev-java/jna: Stabilize 5.13.0-r1 ppc64, #908837

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jna/jna-5.13.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2023-07-18 Thread Sam James
commit: 1ec7361a89dbca50539405e375556db557da0c03
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 18 09:52:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 18 09:52:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ec7361a

dev-java/jna: Stabilize 5.13.0-r1 x86, #908837

Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/jna-5.13.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild 
b/dev-java/jna/jna-5.13.0-r1.ebuild
index 4f35a0d13911..19642915662e 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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2023-06-19 Thread Sam James
commit: 049c162cfdc94d6a0d7951f1baef195b57d2f434
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 19 14:18:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 19 14:18:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049c162c

dev-java/jna: Stabilize 5.13.0-r1 amd64, #908837

Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/jna-5.13.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild 
b/dev-java/jna/jna-5.13.0-r1.ebuild
index 41cff439..4f35a0d13911 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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2023-06-19 Thread Sam James
commit: 65acc184477cd11c8cf3e7062321b4d13893d68c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 19 14:18:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 19 14:18:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65acc184

dev-java/jna: Stabilize 5.13.0-r1 arm64, #908837

Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/jna-5.13.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.13.0-r1.ebuild 
b/dev-java/jna/jna-5.13.0-r1.ebuild
index ab5471ed4157..41cff439 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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2023-05-20 Thread Sam James
commit: 3768708989ba388546542ddb11e10f2140fcca93
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed May 10 11:00:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 20 09:39:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37687089

dev-java/jna: avoid installing pre-stripped files

Closes: https://bugs.gentoo.org/848912
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30971
Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/{jna-5.13.0.ebuild => jna-5.13.0-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/jna/jna-5.13.0.ebuild b/dev-java/jna/jna-5.13.0-r1.ebuild
similarity index 99%
rename from dev-java/jna/jna-5.13.0.ebuild
rename to dev-java/jna/jna-5.13.0-r1.ebuild
index 88dde9319e6d..ab5471ed4157 100644
--- a/dev-java/jna/jna-5.13.0.ebuild
+++ b/dev-java/jna/jna-5.13.0-r1.ebuild
@@ -102,6 +102,7 @@ src_compile() {
cd native || die
local args=(
CC="$(tc-getCC)"
+   STRIP=true
DYNAMIC_LIBFFI=true
)
# Using -j1 since otherwise fails to build:



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/, dev-java/jna/files/

2023-05-09 Thread Miroslav Šulc
commit: 534c13da07a4e2dd14c6c2754b22238606db99c9
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun May  7 06:38:40 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed May 10 04:59:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534c13da

dev-java/jna: add 5.13.0

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30953
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/Manifest|   1 +
 dev-java/jna/files/jna-5.13.0-testpath.patch | 103 +++
 dev-java/jna/jna-5.13.0.ebuild   | 191 +++
 3 files changed, 295 insertions(+)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 8790b86f56df..f60719c514f1 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1 +1,2 @@
 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/jna-5.13.0-testpath.patch 
b/dev-java/jna/files/jna-5.13.0-testpath.patch
new file mode 100644
index ..7bd918c4181a
--- /dev/null
+++ b/dev-java/jna/files/jna-5.13.0-testpath.patch
@@ -0,0 +1,103 @@
+This patch solves several test failures on com.sun.jna.LibraryLoadTest like
+"Expected JNA native library at build/native-linux-x86-64/libtestlib.so is 
missing"
+--- a/test/com/sun/jna/Paths.java
 b/test/com/sun/jna/Paths.java
+@@ -47,12 +47,12 @@ public interface Paths {
+  USING_CLOVER
+  ? "build.clover" : "build");
+ String CLASSES = BUILDDIR + (Platform.isWindowsCE() ? "" : "/classes");
+-String JNAJAR = BUILDDIR + "/jna.jar";
++String JNAJAR = "jna.jar";
+ 
+ String TESTPATH = Platform.isWindowsCE()
+ ? "/Storage Card/"
+ : System.getProperty("jna.nativedir",
+- BUILDDIR + "/native-" + Platform.RESOURCE_PREFIX 
+ "/");
++ BUILDDIR + "/native/");
+ String TESTJAR = BUILDDIR + "/jna-test.jar";
+ String TESTJAR2 = BUILDDIR + "/jna-test2.jar";
+ String TESTJAR3 = BUILDDIR + "/jna-test3.jar";
+1) testAvoidJarUnpacking(com.sun.jna.JNALoadTest)
+java.lang.ClassNotFoundException: com.sun.jna.Native
+   at java.net.URLClassLoader.findClass(URLClassLoader.java:387)
+   at com.sun.jna.JNALoadTest$TestLoader.findClass(JNALoadTest.java:64)
+   at java.lang.ClassLoader.loadClass(ClassLoader.java:418)
+   at java.lang.ClassLoader.loadClass(ClassLoader.java:351)
+   at java.lang.Class.forName0(Native Method)
+   at java.lang.Class.forName(Class.java:348)
+   at com.sun.jna.JNALoadTest.testAvoidJarUnpacking(JNALoadTest.java:94)
+2) testLoadAndUnloadFromJar(com.sun.jna.JNALoadTest)
+java.lang.ClassNotFoundException: com.sun.jna.Native
+   at java.net.URLClassLoader.findClass(URLClassLoader.java:387)
+   at com.sun.jna.JNALoadTest$TestLoader.findClass(JNALoadTest.java:64)
+   at java.lang.ClassLoader.loadClass(ClassLoader.java:418)
+   at java.lang.ClassLoader.loadClass(ClassLoader.java:351)
+   at java.lang.Class.forName0(Native Method)
+   at java.lang.Class.forName(Class.java:348)
+   at 
com.sun.jna.JNALoadTest.testLoadAndUnloadFromJar(JNALoadTest.java:128)
+3) testAvoidResourcePathLoading(com.sun.jna.JNALoadTest)
+java.lang.Error: Expected JNA library at 
build/classes/com/sun/jna/linux-x86-64/libjnidispatch.so is missing
+   at com.sun.jna.JNALoadTest.assertLibraryExists(JNALoadTest.java:87)
+   at com.sun.jna.JNALoadTest$TestLoader.(JNALoadTest.java:54)
+   at 
com.sun.jna.JNALoadTest.testAvoidResourcePathLoading(JNALoadTest.java:109)
+4) testLoadFromUnicodePath(com.sun.jna.JNALoadTest)
+java.lang.ClassNotFoundException: com.sun.jna.Native
+   at java.net.URLClassLoader.findClass(URLClassLoader.java:387)
+   at com.sun.jna.JNALoadTest$TestLoader.findClass(JNALoadTest.java:64)
+   at java.lang.ClassLoader.loadClass(ClassLoader.java:418)
+   at java.lang.ClassLoader.loadClass(ClassLoader.java:351)
+   at java.lang.Class.forName0(Native Method)
+   at java.lang.Class.forName(Class.java:348)
+   at com.sun.jna.JNALoadTest.testLoadFromUnicodePath(JNALoadTest.java:255)
+5) testLoadAndUnloadFromResourcePath(com.sun.jna.JNALoadTest)
+java.lang.Error: Expected JNA library at 
build/classes/com/sun/jna/linux-x86-64/libjnidispatch.so is missing
+   at 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/, dev-java/jna/files/

2023-05-08 Thread Sam James
commit: f5f05e9efa68f48ae23a3adf48e04178b4ab7f4e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon May  8 05:38:44 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  8 17:35:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f05e9e

dev-java/jna: patch to avoid adding -Werror flag

Closes: https://bugs.gentoo.org/13
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/files/jna-5.11.0-no-Werror.patch | 17 +
 dev-java/jna/jna-5.11.0-r1.ebuild |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/dev-java/jna/files/jna-5.11.0-no-Werror.patch 
b/dev-java/jna/files/jna-5.11.0-no-Werror.patch
new file mode 100644
index ..629a1a4452de
--- /dev/null
+++ b/dev-java/jna/files/jna-5.11.0-no-Werror.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/13
+--- a/native/Makefile
 b/native/Makefile
+@@ -356,11 +356,11 @@ ifeq ($(CC),gcc)
+ GCC_MAJOR_VERSION = $(shell gcc -dumpversion | cut -f 1 -d '.')
+ ifneq ($(GCC_MAJOR_VERSION),4)
+   ifneq ($(GCC_MAJOR_VERSION),3)
+-  LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered 
-Wno-unused-variable -Wno-alloca-larger-than
++  LOC_CC_OPTS=-Wno-unknown-warning-option -Wno-clobbered 
-Wno-unused-variable -Wno-alloca-larger-than
+   endif
+ endif
+ else
+-LOC_CC_OPTS=-Wno-unknown-warning-option -Werror -Wno-clobbered 
-Wno-unused-variable
++LOC_CC_OPTS=-Wno-unknown-warning-option -Wno-clobbered 
-Wno-unused-variable
+ endif
+ 
+ # Enable 64-bit builds if the arch demands it

diff --git a/dev-java/jna/jna-5.11.0-r1.ebuild 
b/dev-java/jna/jna-5.11.0-r1.ebuild
index d1b4898f918a..3753bc815a3c 100644
--- a/dev-java/jna/jna-5.11.0-r1.ebuild
+++ b/dev-java/jna/jna-5.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,6 +47,7 @@ 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"



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2023-05-08 Thread Sam James
commit: 5c5355610f95a4eb3d4f4f7738737e7735a11074
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon May  8 05:40:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  8 17:35:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c535561

dev-java/jna: update upstream metadata

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30926
Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/metadata.xml b/dev-java/jna/metadata.xml
index 3966f68718c9..8e530dbd3fd1 100644
--- a/dev-java/jna/metadata.xml
+++ b/dev-java/jna/metadata.xml
@@ -6,6 +6,6 @@
 Java
   
   
-twall/jna
+java-native-access/jna
   
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-07-22 Thread Florian Schmaus
commit: 85aa245ca7ec77f04b3a060b2e1628bacabdc076
Author: Florian Schmaus  gentoo  org>
AuthorDate: Fri Jul 22 21:27:18 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Fri Jul 22 21:31:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85aa245c

dev-java/jna: correct package phase for variable definition

Setting EANT_GENTOO_CLASSPATH_EXTRA in pkg_setup() causes binary
packages to die when being emerged. We set the variable by calling
java-pkg_getjars with jna build-only dependencies as argument, which
will not be available if a binary package is emerged.

Instead those variables, which are only needed when the package is
compiled, should be set in src_prepare().

Thanks to zorry for reporting this.

Signed-off-by: Florian Schmaus  gentoo.org>
Reported-by: Magnus Granberg  gentoo.org>

 dev-java/jna/{jna-5.11.0.ebuild => jna-5.11.0-r1.ebuild} | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0-r1.ebuild
similarity index 98%
rename from dev-java/jna/jna-5.11.0.ebuild
rename to dev-java/jna/jna-5.11.0-r1.ebuild
index 0d53024ae379..d1b4898f918a 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.0-r1.ebuild
@@ -56,8 +56,8 @@ 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"
 
-pkg_setup() {
-   java-pkg-2_pkg_setup
+src_prepare() {
+   default
 
EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \
animal-sniffer-annotations,ant-core,asm-9)"
@@ -68,10 +68,6 @@ pkg_setup() {
ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'"
# Parallel build does not respect dependency relationships between 
objects
ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
-}
-
-src_prepare() {
-   default
 
# Eliminate build.xml's dependency on bundled native JARs
sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml ||



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/

2022-07-15 Thread Miroslav Šulc
commit: 480352472c5429f37cd7c7cebd867c7fdb0896c3
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Jul 15 18:27:19 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jul 16 03:29:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48035247

dev-java/jna: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26423
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/files/4.2.2-makefile-flags.patch | 25 -
 1 file changed, 25 deletions(-)

diff --git a/dev-java/jna/files/4.2.2-makefile-flags.patch 
b/dev-java/jna/files/4.2.2-makefile-flags.patch
deleted file mode 100644
index 3e290ece4e78..
--- a/dev-java/jna/files/4.2.2-makefile-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
 a/native/Makefile  2016-03-16 14:37:28.0 +
-+++ b/native/Makefile  2016-04-16 22:27:06.426345376 +0100
-@@ -81,7 +81,7 @@
- LIBSFX=.so
- ARSFX=.a
- JNISFX=$(LIBSFX)
--CC=gcc
-+CC?=gcc
- LD=$(CC)
- LIBS=
- # Default to Sun recommendations for JNI compilation
-@@ -94,10 +94,10 @@
- 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)



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-07-06 Thread Miroslav Šulc
commit: db833863af0fa9bc79c54e7b691ef502e7fec45d
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jul  6 19:55:11 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jul  7 04:03:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db833863

dev-java/jna: drop 5.10.0

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26245
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/Manifest  |  1 -
 dev-java/jna/jna-5.10.0.ebuild | 99 --
 2 files changed, 100 deletions(-)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 1d8ab37fde64..8790b86f56df 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,2 +1 @@
-DIST jna-5.10.0.tar.gz 106258319 BLAKE2B 
f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd
 SHA512 
93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
 DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 
9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf
 SHA512 
0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
deleted file mode 100644
index 4e08475cbb53..
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 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.10.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}/${PV}-build.xml.patch"
-   "${FILESDIR}/4.2.2-makefile-flags.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"
-
-pkg_setup() {
-   java-pkg-2_pkg_setup
-
-   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)'"
-   # Parallel build does not respect dependency relationships between 
objects
-   ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
-}
-
-src_prepare() {
-   default
-
-   # 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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-07-06 Thread Arthur Zamarin
commit: e16ce17640a5c09c00d161b5cd1d222351800378
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jul  6 18:26:21 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jul  6 18:26:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e16ce176

dev-java/jna: Stabilize 5.11.0 ppc64, #855512

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jna/jna-5.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
index 9e6092e7e10a..0d53024ae379 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-07-02 Thread Agostino Sarubbo
commit: 176eecea6841bd62eabec828fb74a957f8ab40d2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jul  2 12:22:49 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jul  2 12:23:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176eecea

dev-java/jna: x86 stable wrt bug #855512

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/jna/jna-5.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
index 451f1c4dec31..9e6092e7e10a 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-07-02 Thread Agostino Sarubbo
commit: 2d596965d5e60e1c162f6beeef7f8db821a160e5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jul  2 12:19:29 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jul  2 12:20:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d596965

dev-java/jna: amd64 stable wrt bug #855512

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/jna/jna-5.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
index 0abb2fc65dbd..451f1c4dec31 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-07-02 Thread Jakov Smolić
commit: fd61a967c2fcb9c2b6c71907528416193fd160f7
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jul  2 07:18:55 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jul  2 07:18:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd61a967

dev-java/jna: Stabilize 5.11.0 arm64, #855512

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/jna/jna-5.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
index 44173ced3c04..0abb2fc65dbd 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/, dev-java/jna/files/

2022-06-17 Thread Arthur Zamarin
commit: ffc74f6e03748a09db665fcd2d65af67d7db1b88
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jun 15 16:57:59 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun 17 08:15:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc74f6e

dev-java/jna: drop 4.2.2-r3

Closes: https://bugs.gentoo.org/762940
Closes: https://bugs.gentoo.org/833325
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25913
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jna/Manifest|  1 -
 dev-java/jna/files/4.2.2-build.xml.patch | 23 -
 dev-java/jna/jna-4.2.2-r3.ebuild | 87 
 dev-java/jna/metadata.xml|  4 --
 4 files changed, 115 deletions(-)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 516edfa4d5b6..1d8ab37fde64 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,3 +1,2 @@
-DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 
3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e
 SHA512 
11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
 DIST jna-5.10.0.tar.gz 106258319 BLAKE2B 
f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd
 SHA512 
93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
 DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 
9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf
 SHA512 
0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d

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..
--- a/dev-java/jna/files/4.2.2-build.xml.patch
+++ /dev/null
@@ -1,23 +0,0 @@
 a/build.xml2016-03-16 14:37:28.0 +
-+++ b/build.xml2016-04-16 22:22:27.692967205 +0100
-@@ -320,7 +320,9 @@
-   
-   
-   
-+  
-   
- 
-   
-@@ -909,8 +911,10 @@
- 
- 
- 
-+
- 
-   
- 

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..
--- 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/*
-   

[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-06-15 Thread Arthur Zamarin
commit: 65b57ced60076e5b4760023769b58d3116a6b1c6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 15 16:15:17 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 15 16:15:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b57ced

dev-java/jna: Stabilize 5.10.0 x86, #832824

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 12e087ab81ab..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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-06-15 Thread Arthur Zamarin
commit: 498656c5ceb9a5175504cb4fb13f7aad41241a6f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 15 16:15:13 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 15 16:15:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=498656c5

dev-java/jna: Stabilize 5.10.0 ppc64, #832824

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 08aed43c2b34..12e087ab81ab 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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-06-15 Thread Agostino Sarubbo
commit: 47d72ad83fd13e29bc4b3b37df4211871908421b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 15 14:30:57 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 15 14:30:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d72ad8

dev-java/jna: amd64 stable wrt bug #832824

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 6008ceca28f1..08aed43c2b34 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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-06-15 Thread Jakov Smolić
commit: 4e8d43df997ced5bc4558731ad55264e25dc6be5
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jun 15 07:36:21 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jun 15 07:36:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8d43df

dev-java/jna: Stabilize 5.10.0 arm64, #832824

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 1d15c940f056..6008ceca28f1 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



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/, dev-java/jna/

2022-05-31 Thread Sam James
commit: 14be4a0ea20880015e350f99b0f0140a10877736
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue May 31 14:20:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 31 23:44:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14be4a0e

dev-java/jna: do not call STRIP directly

Closes: https://bugs.gentoo.org/754999
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25702
Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/files/5.11.0-makefile-flags.patch | 34 ++
 dev-java/jna/jna-5.11.0.ebuild |  4 +--
 2 files changed, 36 insertions(+), 2 deletions(-)

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 ..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-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'"
 }



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-05-12 Thread Florian Schmaus
commit: bad35473d260faac34b0531d04e947de1bed88aa
Author: Yuan Liao  gmail  com>
AuthorDate: Wed Apr  6 17:21:00 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu May 12 07:02:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad35473

dev-java/jna: Add 5.11.0

Signed-off-by: Yuan Liao  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24935
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/jna/Manifest  |  1 +
 dev-java/jna/jna-5.11.0.ebuild | 99 ++
 2 files changed, 100 insertions(+)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index ac70c75ad8e2..516edfa4d5b6 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,2 +1,3 @@
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 
3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e
 SHA512 
11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
 DIST jna-5.10.0.tar.gz 106258319 BLAKE2B 
f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd
 SHA512 
93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256
+DIST jna-5.11.0.tar.gz 107424072 BLAKE2B 
9f79a0b0e643c8213c159785814dffaeee2dc3b332647c5c887aa5a6e707be5241d392e75730b803b21362fcbdcee82d7049bcdfb7956039f1534e3cd8e170cf
 SHA512 
0122b56c24125e5dea541bee71b43f127df50c8f90b2c240271c677a8d598d9640bb920bd3390856124e8b1bc89a9bd41d2b6c569ae7275f68a13c08fd07027d

diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0.ebuild
new file mode 100644
index ..be8f367f117d
--- /dev/null
+++ b/dev-java/jna/jna-5.11.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 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}/4.2.2-makefile-flags.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"
+
+pkg_setup() {
+   java-pkg-2_pkg_setup
+
+   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)'"
+   # Parallel build does not respect dependency relationships between 
objects
+   ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
+}
+
+src_prepare() {
+   default
+
+   # 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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/, dev-java/jna/

2022-05-12 Thread Florian Schmaus
commit: 0a265ada45d01cf883d55e3367472db981940aef
Author: Yuan Liao  gmail  com>
AuthorDate: Wed Apr  6 17:27:52 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Thu May 12 07:02:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a265ada

dev-java/jna: Use JUnit 4 to run tests for 5.10.0

The test classes excluded by 5.10.0-tests-exclude.patch actually have
some JUnit 4 tests, whereas the rest of the test suite contains JUnit 3
tests.  JUnit 4 can be used to run both types of tests, but JUnit 3
cannot run JUnit 4 tests, which is why the patch was needed.  By
switching to JUnit 4, test coverage increases, and the patch can also be
dropped.

Signed-off-by: Yuan Liao  gmail.com>
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/jna/files/5.10.0-tests-exclude.patch | 27 ---
 dev-java/jna/jna-5.10.0.ebuild|  3 +--
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/dev-java/jna/files/5.10.0-tests-exclude.patch 
b/dev-java/jna/files/5.10.0-tests-exclude.patch
deleted file mode 100644
index e608e2087f44..
--- a/dev-java/jna/files/5.10.0-tests-exclude.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001
-From: Yuan Liao 
-Date: Thu, 6 Jan 2022 12:21:22 -0800
-Subject: [PATCH] Skip execution of test classes without any tests
-
-Signed-off-by: Yuan Liao 

- build.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/build.xml b/build.xml
-index ed104c2..9fb15ae 100644
 a/build.xml
-+++ b/build.xml
-@@ -1388,6 +1388,9 @@ cd ..
- 
-   
-   
-+  
-+  
-+  
-   
- 
-   
--- 
-2.34.1
-

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 80d0409f955c..1d15c940f056 100644
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -30,7 +30,7 @@ DEPEND="
dev-java/ant-core:0
dev-java/asm:9
test? (
-   dev-java/ant-junit:0
+   dev-java/ant-junit4:0
dev-java/junit:4
dev-java/reflections:0
)
@@ -46,7 +46,6 @@ RDEPEND="
 DOCS=( README.md CHANGES.md OTHERS TODO )
 PATCHES=(
"${FILESDIR}/${PV}-build.xml.patch"
-   "${FILESDIR}/${PV}-tests-exclude.patch"
"${FILESDIR}/4.2.2-makefile-flags.patch"
 )
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-04-19 Thread Florian Schmaus
commit: 2b21ace2dc5cb1d59973d54190517aa27c4c704f
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Apr 19 07:43:38 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Apr 19 07:43:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b21ace2

dev-java/jna: properly quote $T

Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 3f90c302433e..80d0409f955c 100644
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -54,7 +54,7 @@ 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_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
 EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
 
 pkg_setup() {



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-01-14 Thread Arthur Zamarin
commit: 3b23034ddff5514161a21a6fd11d294c4465496d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 14 15:07:22 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 14 15:07:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b23034d

dev-java/jna: Keyword 5.10.0 arm, #830838

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 82de596f4cf1..3f90c302433e 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 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-01-09 Thread Miroslav Šulc
commit: 1a0f8afba88fd7f3a7813c280e9d87074f5f459a
Author: Yuan Liao  gmail  com>
AuthorDate: Sat Jan  8 22:30:57 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jan  9 09:07:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0f8afb

dev-java/jna: DEPEND on x11-libs/libXt for 5.10.0

The 'awt' USE flag has not been added to 5.10.0, which is effectively
like this USE flag is enabled by default (dev-java/jna[awt(+)]).  Bug
830812 shows that x11-libs/libXt is still required for 5.10.0.  Another
long-existing bug 762940 suggests that if the ebuild had the 'awt' USE
flag and it was disabled then libXt might be redundant, but that is not
applicable to this case.

As of the commit time, based on experiments in containers created from
the gentoo/stage3 Docker image, declaration of x11-libs/libXt as a
dependency would only cause 3 additional packages to be installed in a
new copy of stage3, none of which would take a very long time to merge,
so the benefit of making the dependency optional via the 'awt' USE flag
might not be very significant.

Bug: https://bugs.gentoo.org/762940
Closes: https://bugs.gentoo.org/830812
Signed-off-by: Yuan Liao  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23708
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 8c52f56053bb..82de596f4cf1 100644
--- a/dev-java/jna/jna-5.10.0.ebuild
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -35,6 +35,7 @@ DEPEND="
dev-java/reflections:0
)
${CDEPEND}
+   x11-libs/libXt
 "
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-01-08 Thread Miroslav Šulc
commit: d767b6f6d9af9c3546fada7d3cc4f457da4bb264
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Jan  8 12:23:13 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jan  8 13:08:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d767b6f6

dev-java/jna: Drop ~arm keyword

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23698
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 4f867572be8c..8c52f56053bb 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 ~arm64 ~ppc64 ~x86"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-01-08 Thread Arthur Zamarin
commit: 355ef2a6faf7476ff46bbae9fcd10edb9bdb1e91
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan  8 10:17:26 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan  8 10:17:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=355ef2a6

dev-java/jna: Keyword 5.10.0 arm64, #830680

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index 006b5fd7bf71..4f867572be8c 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 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2022-01-08 Thread Arthur Zamarin
commit: 8108bcedcc9bfe9f92e3e2f4db1cf1a1681eeaa9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan  8 10:17:22 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan  8 10:17:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8108bced

dev-java/jna: Keyword 5.10.0 arm, #830680

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jna/jna-5.10.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
index b7730f9d8e7a..006b5fd7bf71 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 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 BDEPEND="
virtual/pkgconfig



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/, dev-java/jna/

2022-01-08 Thread Miroslav Šulc
commit: 9eb362c301c9ca8a1968867436506860ac11a759
Author: Yuan Liao  gmail  com>
AuthorDate: Thu Jan  6 18:03:27 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jan  8 08:56:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb362c3

dev-java/jna: Add 5.10.0

Signed-off-by: Yuan Liao  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23679
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/Manifest |  1 +
 dev-java/jna/files/5.10.0-build.xml.patch | 55 +++
 dev-java/jna/files/5.10.0-tests-exclude.patch | 27 
 dev-java/jna/jna-5.10.0.ebuild| 99 +++
 4 files changed, 182 insertions(+)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 20ee000d50be..ac70c75ad8e2 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1 +1,2 @@
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 
3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e
 SHA512 
11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
+DIST jna-5.10.0.tar.gz 106258319 BLAKE2B 
f5605fd91bacc1e900e835494c27b0fdb4ba91b0c04bad1757133bed5938603264ce9fba89c5ce7e4644456b752b934f6e205d0131659e77bf0c58c2b44c61cd
 SHA512 
93e1ab659a60d711557eb93620bcbd05f3dbe9c739b256cfb647d8ac2a4038d0bc638c614b58339b2875017ac18b219a4ddeb0d92e5ca25fef2e326bc14ae256

diff --git a/dev-java/jna/files/5.10.0-build.xml.patch 
b/dev-java/jna/files/5.10.0-build.xml.patch
new file mode 100644
index ..242845bfd356
--- /dev/null
+++ b/dev-java/jna/files/5.10.0-build.xml.patch
@@ -0,0 +1,55 @@
+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/files/5.10.0-tests-exclude.patch 
b/dev-java/jna/files/5.10.0-tests-exclude.patch
new file mode 100644
index ..e608e2087f44
--- /dev/null
+++ b/dev-java/jna/files/5.10.0-tests-exclude.patch
@@ -0,0 +1,27 @@
+From 2b50e2296c9c9961fd168abe285f773aecd6437a Mon Sep 17 00:00:00 2001
+From: Yuan Liao 
+Date: Thu, 6 Jan 2022 12:21:22 -0800
+Subject: [PATCH] Skip execution of test classes without any tests
+
+Signed-off-by: Yuan Liao 
+---
+ build.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index ed104c2..9fb15ae 100644
+--- a/build.xml
 b/build.xml
+@@ -1388,6 +1388,9 @@ cd ..
+ 
+   
+   
++  
++  
++  
+   
+ 
+   
+-- 
+2.34.1
+

diff --git a/dev-java/jna/jna-5.10.0.ebuild b/dev-java/jna/jna-5.10.0.ebuild
new file mode 100644
index ..b7730f9d8e7a
--- /dev/null
+++ b/dev-java/jna/jna-5.10.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 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.10.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 ~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-junit:0
+   dev-java/junit:4
+   dev-java/reflections:0
+   )
+   ${CDEPEND}
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}
+"
+
+DOCS=( README.md CHANGES.md OTHERS TODO )
+PATCHES=(
+   "${FILESDIR}/${PV}-build.xml.patch"
+   "${FILESDIR}/${PV}-tests-exclude.patch"
+   "${FILESDIR}/4.2.2-makefile-flags.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"
+
+pkg_setup() {
+   java-pkg-2_pkg_setup
+
+   EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2021-11-26 Thread Sam James
commit: 97551df0d876e8af255a67a24f7b77c771bab945
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 26 09:23:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 26 09:23:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97551df0

dev-java/jna: Stabilize 4.2.2-r3 ppc64, #809932

Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/jna-4.2.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-4.2.2-r3.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild
index 7568ac95b61e..2950dfd0edbf 100644
--- a/dev-java/jna/jna-4.2.2-r3.ebuild
+++ b/dev-java/jna/jna-4.2.2-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="4"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="+awt +nio-buffers test"
 
 REQUIRED_USE="test? ( awt nio-buffers )"



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2021-11-12 Thread Agostino Sarubbo
commit: 69403f112501457264eac13311bda98e3772f40d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 12 08:16:20 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 12 08:16:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69403f11

dev-java/jna: x86 stable wrt bug #809932

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/jna/jna-4.2.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-4.2.2-r3.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild
index 503ed32bd2b..7568ac95b61 100644
--- a/dev-java/jna/jna-4.2.2-r3.ebuild
+++ b/dev-java/jna/jna-4.2.2-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="4"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="+awt +nio-buffers test"
 
 REQUIRED_USE="test? ( awt nio-buffers )"



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2021-11-11 Thread Agostino Sarubbo
commit: ee91a4d20a64919be6e7e9e8e545f84bc63d1ccb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 11 11:35:41 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 11 11:35:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee91a4d2

dev-java/jna: amd64 stable wrt bug #809932

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/jna/jna-4.2.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-4.2.2-r3.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild
index 6ba89af0532..503ed32bd2b 100644
--- a/dev-java/jna/jna-4.2.2-r3.ebuild
+++ b/dev-java/jna/jna-4.2.2-r3.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="4"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="+awt +nio-buffers test"
 
 REQUIRED_USE="test? ( awt nio-buffers )"



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2021-07-10 Thread Sam James
commit: d6d75f9108ee7b7c2296472a451d3f3c2c708008
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 10 18:31:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 10 18:47:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6d75f91

dev-java/jna: add dev-libs/libffi subslot dep

Signed-off-by: Sam James  gentoo.org>

 dev-java/jna/{jna-4.2.2-r2.ebuild => jna-4.2.2-r3.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-4.2.2-r2.ebuild b/dev-java/jna/jna-4.2.2-r3.ebuild
similarity index 98%
rename from dev-java/jna/jna-4.2.2-r2.ebuild
rename to dev-java/jna/jna-4.2.2-r3.ebuild
index 672aa2f06bb..6ba89af0532 100644
--- a/dev-java/jna/jna-4.2.2-r2.ebuild
+++ b/dev-java/jna/jna-4.2.2-r3.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="test? ( awt nio-buffers )"
 # fine. Someone bisect it please. :)
 RESTRICT="test"
 
-CDEPEND="dev-libs/libffi"
+CDEPEND="dev-libs/libffi:="
 DEPEND="${CDEPEND}
virtual/jdk:1.8
x11-libs/libXt



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2021-06-14 Thread Sergei Trofimovich
commit: be54fdc09f2ade3e50955d57da86fe0f3f215833
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jun 14 06:39:06 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jun 14 06:39:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be54fdc0

dev-java/jna: keyworded 4.2.2-r2 for ppc64

keyworded wrt bug #795210

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-java/jna/jna-4.2.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-4.2.2-r2.ebuild b/dev-java/jna/jna-4.2.2-r2.ebuild
index ea4a7b11f2c..672aa2f06bb 100644
--- a/dev-java/jna/jna-4.2.2-r2.ebuild
+++ b/dev-java/jna/jna-4.2.2-r2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/java-native-access/jna/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+awt +nio-buffers test"
 
 REQUIRED_USE="test? ( awt nio-buffers )"



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2021-06-12 Thread Miroslav Šulc
commit: 463ee301ac6407219d558c077bab31334c6706ba
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 12 10:00:54 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 12 13:19:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=463ee301

dev-java/jna: removed obsolete 4.2.2-r1

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/jna-4.2.2-r1.ebuild | 86 
 1 file changed, 86 deletions(-)

diff --git a/dev-java/jna/jna-4.2.2-r1.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild
deleted file mode 100644
index 6ae5356a0b0..000
--- a/dev-java/jna/jna-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="Java Native Access (JNA)"
-HOMEPAGE="https://github.com/twall/jna;
-SRC_URI="https://github.com/twall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="4"
-KEYWORDS="~amd64 ~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"
-
-RDEPEND="${CDEPEND}
-   >=virtual/jre-1.7"
-
-DEPEND="${CDEPEND}
-   >=virtual/jdk-1.7
-   x11-libs/libXt
-   virtual/pkgconfig
-   test? (
-   dev-java/ant-junit:0
-   dev-java/guava:20
-   dev-java/javassist:3
-   dev-java/reflections:0
-   )"
-
-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
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2021-06-12 Thread Miroslav Šulc
commit: 0bbc0cdf5c9659cec63baf45e9ab6ee909a903f7
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Jun  9 11:04:50 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 12 09:54:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bbc0cdf

dev-java/jna: min java restrict to 1.8

It failed to build with java 11

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21173
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/jna-4.2.2-r2.ebuild | 87 
 1 file changed, 87 insertions(+)

diff --git a/dev-java/jna/jna-4.2.2-r2.ebuild b/dev-java/jna/jna-4.2.2-r2.ebuild
new file mode 100644
index 000..ea4a7b11f2c
--- /dev/null
+++ b/dev-java/jna/jna-4.2.2-r2.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 ~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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2021-04-25 Thread Miroslav Šulc
commit: 435b2616a0c3a4e6a10f526bd522c728af5ba2ee
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Apr 25 17:52:12 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Apr 25 17:52:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=435b2616

dev-java/jna: dropped unused slot 0

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jna/Manifest |  1 -
 dev-java/jna/jna-3.4.1.ebuild | 88 ---
 2 files changed, 89 deletions(-)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index a83367395e4..20ee000d50b 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,2 +1 @@
-DIST jna-3.4.1.tar.gz 35285043 BLAKE2B 
192f893f25c692a80d8b3ea0b469e951ef45ea561a02f1ec2ac8292f37ac32df468c7bb04211f1009314da4d7acba8ab9220114980b3f30b56af5f2310d5a18a
 SHA512 
8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917
 DIST jna-4.2.2.tar.gz 58638853 BLAKE2B 
3941202ad7839f748c65f1abf53a335f6de7959def06de27a30520457147af3f70f6de54d640718b8314f6e61ab61ee9b26c39812d5cb1f918b8ff714d6b902e
 SHA512 
11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f

diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
deleted file mode 100644
index 48d35ff519b..000
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="test doc source"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic vcs-snapshot
-
-DESCRIPTION="Java Native Access (JNA)"
-HOMEPAGE="https://github.com/twall/jna#readme;
-SRC_URI="https://github.com/twall/jna/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+awt +nio-buffers"
-REQUIRED_USE="test? ( awt nio-buffers )"
-
-CDEPEND="
-   dev-libs/libffi"
-RDEPEND="${CDEPEND}
-   >=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-   >=virtual/jdk-1.6
-   virtual/pkgconfig
-   test? (
-   dev-java/junit:0
-   dev-java/ant-core:0
-   dev-java/ant-junit:0
-   )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jar contrib-jars"
-
-java_prepare() {
-   # This jar is needed for some tests.
-   # So let's make a copy of it.
-   cp lib/clover.jar "${T}" || die
-
-   find -name "*.jar" -exec rm -v {} + || die
-   rm -r native/libffi || die
-   mkdir -p doc/javadoc || die
-
-   # and restore it.
-   cp "${T}"/clover.jar lib || die
-
-   # Build to same directory on 64-bit archs.
-   mkdir build || die
-   ln -snf build build-d64 || 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
-}
-
-EANT_EXTRA_ARGS="-Ddynlink.native=true"
-
-EANT_TEST_ANT_TASKS="ant-junit ant-core"
-src_test() {
-   local sysprops=""
-
-   # crashes vm (segfault)
-   sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java 
|| die
-
-   # crashes vm, java 7 only (icedtea-7,  oracle-jdk-bin-1.7)
-   sed -i -e 's|testGCCallbackOnFinalize|no&|' 
test/com/sun/jna/CallbacksTest.java || die
-
-   sysprops+=" -Djava.awt.headless=true"
-   sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount
-
-   mkdir -p lib || die
-   java-pkg_jar-from --into lib --build-only junit
-
-   # need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
-   # survive the junit task.
-   _JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
-}
-
-src_install() {
-   java-pkg_dojar build/${PN}.jar
-   java-pkg_dojar contrib/platform/dist/platform.jar
-   java-pkg_doso build/native/libjnidispatch.so
-   use source && java-pkg_dosrc src/com
-   use doc && java-pkg_dojavadoc doc/javadoc
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2020-11-16 Thread Sergei Trofimovich
commit: 8e684bf22309945cc4392ecb7ad5af83e4e92bd5
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 16 22:47:07 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 16 22:53:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e684bf2

dev-java/jna: use dev-libs/libffi instead of virtual/libffi

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-java/jna/jna-3.4.1.ebuild| 4 ++--
 dev-java/jna/jna-4.2.2-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
index b1305657b0d..48d35ff519b 100644
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ IUSE="+awt +nio-buffers"
 REQUIRED_USE="test? ( awt nio-buffers )"
 
 CDEPEND="
-   virtual/libffi"
+   dev-libs/libffi"
 RDEPEND="${CDEPEND}
>=virtual/jre-1.6"
 DEPEND="${CDEPEND}

diff --git a/dev-java/jna/jna-4.2.2-r1.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild
index 4e55ccbbcd7..469cd1d2666 100644
--- a/dev-java/jna/jna-4.2.2-r1.ebuild
+++ b/dev-java/jna/jna-4.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ REQUIRED_USE="test? ( awt nio-buffers )"
 # fine. Someone bisect it please. :)
 RESTRICT="test"
 
-CDEPEND="virtual/libffi"
+CDEPEND="dev-libs/libffi"
 
 RDEPEND="${CDEPEND}
>=virtual/jre-1.7"



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2018-11-04 Thread Pacho Ramos
commit: 5a2a13249a81e63463eb63b46560682681df849f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov  4 14:57:24 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  4 15:16:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2a1324

dev-java/jna: Stop using ant-nodeps

Bug: https://bugs.gentoo.org/466558
Signed-off-by: Pacho Ramos  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-java/jna/jna-3.4.1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
index 0a2dbc3a57e..b1305657b0d 100644
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 JAVA_PKG_IUSE="test doc source"
-WANT_ANT_TASKS="ant-nodeps"
 
 inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic vcs-snapshot
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2018-03-17 Thread Pacho Ramos
commit: 1dd7be2a553411093f29e8317743ddac83abcf86
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Mar 17 13:21:13 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Mar 17 13:35:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dd7be2a

dev-java/jna: Drop dependencies on obsolete dev-java/ant-trax and 
dev-java/ant-nodeps (#466558)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-java/jna/jna-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
index 4a0924c3f98..0a2dbc3a57e 100644
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -59,7 +59,7 @@ java_prepare() {
 
 EANT_EXTRA_ARGS="-Ddynlink.native=true"
 
-EANT_TEST_ANT_TASKS="ant-junit ant-nodeps ant-trax"
+EANT_TEST_ANT_TASKS="ant-junit ant-core"
 src_test() {
local sysprops=""
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2018-03-17 Thread Pacho Ramos
commit: fba7de29c359f4ff1595c30f5fed7362bf34882d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Mar 17 13:15:38 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Mar 17 13:35:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba7de29

dev-java/jna: Drop dependencies on obsolete dev-java/ant-trax and 
dev-java/ant-nodeps (#466558)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-java/jna/jna-3.4.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
index a3210becfbb..4a0924c3f98 100644
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -25,8 +25,8 @@ DEPEND="${CDEPEND}
virtual/pkgconfig
test? (
dev-java/junit:0
+   dev-java/ant-core:0
dev-java/ant-junit:0
-   dev-java/ant-trax:0
)"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/, dev-java/jna/files/

2016-11-06 Thread James Le Cuirot
commit: cbdae3b8d57ca13850bf943e3ff253684c6c3d27
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Nov  6 11:38:55 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Nov  6 11:39:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbdae3b8

dev-java/jna: Use newer guava SLOT, EAPI bump to 6

Package-Manager: portage-2.3.2

 dev-java/jna/files/3.4.0-build.xml.patch   | 31 -
 dev-java/jna/files/3.4.0-makefile-flags.patch  | 53 --
 dev-java/jna/files/4.2.2-build.xml.patch   |  4 +-
 dev-java/jna/files/4.2.2-makefile-flags.patch  |  4 +-
 .../jna/{jna-4.2.2.ebuild => jna-4.2.2-r1.ebuild}  | 26 +++
 5 files changed, 21 insertions(+), 97 deletions(-)

diff --git a/dev-java/jna/files/3.4.0-build.xml.patch 
b/dev-java/jna/files/3.4.0-build.xml.patch
deleted file mode 100644
index c907b59..
--- a/dev-java/jna/files/3.4.0-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 build.xml.orig 2011-01-25 17:33:24.750473340 +0100
-+++ build.xml  2011-01-25 17:07:14.657410373 +0100
-@@ -176,7 +176,9 @@
- 
-   
-   
-+  
-   
- 
-   
-@@ -433,13 +435,17 @@
- 
- 
- 
-+
- 
-   
- 
-+
-   
-   
-   

diff --git a/dev-java/jna/files/3.4.0-makefile-flags.patch 
b/dev-java/jna/files/3.4.0-makefile-flags.patch
deleted file mode 100644
index 90d96e0..
--- a/dev-java/jna/files/3.4.0-makefile-flags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/native/Makefile b/native/Makefile
-index 75246a8..7bdcf04 100644
 a/native/Makefile
-+++ b/native/Makefile
-@@ -83,10 +83,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)
-@@ -149,7 +149,7 @@ ifneq ($(MINGW),)
- CDEFINES=-DPSAPI_VERSION=1
- CC = $(MINGW) -m64 -mno-cygwin
- LD = $(CC)
--LDFLAGS=-o $@ -shared
-+LDFLAGS+=-o $@ -shared
- LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt 
- FFI_CONFIG += --host=x86_64-pc-mingw32
- else
-@@ -169,14 +169,14 @@ ifeq ($(OS),linux)
- ARCH=$(shell uname -m | sed 's/i.86/i386/g')
- PCFLAGS+=-fPIC
- CDEFINES+=-DHAVE_PROTECTION
--LDFLAGS+=-Wl,-soname,$@
-+LDFLAGS+= -Wl,-soname,$(shell basename $@)
- endif
- 
- ifneq (,$(findstring bsd,$(OS)))
- ARCH=$(shell uname -m | sed 's/i.86/i386/g')
- PCFLAGS+=-fPIC
- CINCLUDES+=-I/usr/X11R6/include
--LDFLAGS=-o $@ -shared 
-+LDFLAGS+= -o $@ -shared 
- CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
- endif
- 
-@@ -239,7 +239,7 @@ endif
- 
- PCFLAGS+=$(ISYSROOT) -x objective-c
- CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
--LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
-+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
-   -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 
's/^\([0-9][0-9]*\).*/\1/g') \
-   -current_version $(JNA_JNI_VERSION) \
-   -mmacosx-version-min=10.3 \

diff --git a/dev-java/jna/files/4.2.2-build.xml.patch 
b/dev-java/jna/files/4.2.2-build.xml.patch
index 3647646..de49c24 100644
--- a/dev-java/jna/files/4.2.2-build.xml.patch
+++ b/dev-java/jna/files/4.2.2-build.xml.patch
@@ -1,5 +1,5 @@
 build.xml.orig 2016-03-16 14:37:28.0 +
-+++ build.xml  2016-04-16 22:22:27.692967205 +0100
+--- a/build.xml2016-03-16 14:37:28.0 +
 b/build.xml2016-04-16 22:22:27.692967205 +0100
 @@ -320,7 +320,9 @@



diff --git a/dev-java/jna/files/4.2.2-makefile-flags.patch 
b/dev-java/jna/files/4.2.2-makefile-flags.patch
index 10cf4b2..3e290ec 100644
--- a/dev-java/jna/files/4.2.2-makefile-flags.patch
+++ b/dev-java/jna/files/4.2.2-makefile-flags.patch
@@ -1,5 +1,5 @@
 native/Makefile.orig   2016-03-16 14:37:28.0 +
-+++ native/Makefile2016-04-16 22:27:06.426345376 +0100
+--- a/native/Makefile  2016-03-16 14:37:28.0 +
 b/native/Makefile  2016-04-16 22:27:06.426345376 +0100
 @@ -81,7 +81,7 @@
  LIBSFX=.so
  ARSFX=.a

diff --git a/dev-java/jna/jna-4.2.2.ebuild b/dev-java/jna/jna-4.2.2-r1.ebuild
similarity index 87%
rename from dev-java/jna/jna-4.2.2.ebuild
rename to dev-java/jna/jna-4.2.2-r1.ebuild
index 87bb741..50e3636 100644
--- a/dev-java/jna/jna-4.2.2.ebuild
+++ b/dev-java/jna/jna-4.2.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 JAVA_PKG_IUSE="doc source"
 
@@ -34,28 +34,30 @@ 

[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2016-11-06 Thread James Le Cuirot
commit: 8089e79fe6eb90fcc964651fd04c2f5dc9055913
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Nov  6 11:18:49 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Nov  6 11:19:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8089e79f

dev-java/jna: 3.4.1 stable on amd64, x86 using ALLARCHES

Package-Manager: portage-2.3.2

 dev-java/jna/jna-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
index fe114e6..294b80d 100644
--- a/dev-java/jna/jna-3.4.1.ebuild
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/twall/jna#readme;
 SRC_URI="https://github.com/twall/jna/tarball/${PV} -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+awt +nio-buffers"
 REQUIRED_USE="test? ( awt nio-buffers )"
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2016-11-06 Thread James Le Cuirot
commit: e4ae2041ceaf6c95f2f3c61bdae5907f1a4122e2
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Nov  6 11:19:25 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Nov  6 11:19:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4ae2041

dev-java/jna: Remove old 3.4.0

Package-Manager: portage-2.3.2

 dev-java/jna/Manifest |  1 -
 dev-java/jna/jna-3.4.0.ebuild | 88 ---
 2 files changed, 89 deletions(-)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 1fd7c91..e589106 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,3 +1,2 @@
-DIST jna-3.4.0.tar.gz 34547165 SHA256 
bff8fb935044a1e5de611e576e30a08c263e6a26a9f4c631dbe3a0cac2d79f14 SHA512 
30c4e6a3a5ac133095248d3eb7d4983a91e11a267a581268a91316927ac75c5a133a58625d321276ac0b229c42c502f85492672d99713c90de98a648bd008b35
 WHIRLPOOL 
0a5a9d35db0e0090375235048c985fd8bd9ccf319d03c1c3db33e81d3e1a1bec8718a48f6b8180c7531d3963ae91b5337f539eb69e3db73b3f87ea693706fe08
 DIST jna-3.4.1.tar.gz 35285043 SHA256 
fb0ff552a11ddf18b82f1e3fbfe01985fb7a41e242124c63257bb685408ca16e SHA512 
8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917
 WHIRLPOOL 
9c06862f76fbab7175f134a3f965d7d944ff536a03f03256307f8300b1fd1c9888c6e312bb74a80088128278efa9f8f7dfca668e4ebeacfff91bba3bc97951b0
 DIST jna-4.2.2.tar.gz 58638853 SHA256 
46330123be97fa5c11b1747c74470a39f2b1a3396d66fd6ead4d034660eb094a SHA512 
11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
 WHIRLPOOL 
a8cd562276c4e2955ad5aa178660810f6dd45d0bd51f1c267d1a8fd139f9fb6a45aaf794a03c9f333c51617240cbff0d79f57ce73e4fc341c431b3ab959055f1

diff --git a/dev-java/jna/jna-3.4.0.ebuild b/dev-java/jna/jna-3.4.0.ebuild
deleted file mode 100644
index a4584ea..
--- a/dev-java/jna/jna-3.4.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="test doc source"
-WANT_ANT_TASKS="ant-nodeps"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic vcs-snapshot
-
-DESCRIPTION="Java Native Access (JNA)"
-HOMEPAGE="https://github.com/twall/jna#readme;
-SRC_URI="https://github.com/twall/jna/tarball/3.4.0 -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+awt +nio-buffers"
-REQUIRED_USE="test? ( awt nio-buffers )"
-
-COMMON_DEP="
-   virtual/libffi"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-1.6
-   virtual/pkgconfig
-   test? (
-   dev-java/junit:0
-   dev-java/ant-junit:0
-   dev-java/ant-trax:0
-   )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jar contrib-jars"
-
-java_prepare() {
-   # delete bundled jars and copy of libffi
-   find -name "*.jar" -exec rm -v {} + || die
-   rm -r native/libffi || die
-
-   # respect CFLAGS, don't inhibit warnings, honour CC
-   # fix build.xml file
-   epatch "${FILESDIR}/${PV}-makefile-flags.patch" 
"${FILESDIR}/${PV}-build.xml.patch"
-
-   # Build to same directory on 64-bit archs.
-   mkdir build || die
-   ln -snf build build-d64 || 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
-}
-
-EANT_EXTRA_ARGS="-Ddynlink.native=true"
-
-EANT_TEST_ANT_TASKS="ant-junit ant-nodeps ant-trax"
-src_test() {
-   local sysprops=""
-
-   # crashes vm (segfault)
-   sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java 
|| die
-
-   # crashes vm, java 7 only (icedtea-7,  oracle-jdk-bin-1.7)
-   sed -i -e 's|testGCCallbackOnFinalize|no&|' 
test/com/sun/jna/CallbacksTest.java || die
-
-   sysprops+=" -Djava.awt.headless=true"
-   sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount
-
-   mkdir -p lib || die
-   java-pkg_jar-from --into lib --build-only junit
-
-   # need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
-   # survive the junit task.
-   _JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
-}
-
-src_install() {
-   java-pkg_dojar build/${PN}.jar
-   java-pkg_dojar contrib/platform/dist/platform.jar
-   java-pkg_doso build/native/libjnidispatch.so
-   use source && java-pkg_dosrc src/com
-   use doc && java-pkg_dojavadoc doc/javadoc
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/

2016-08-08 Thread James Le Cuirot
commit: eda9940c61ea8ed2aad89bdcd5d256740a211fde
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Wed Aug  3 18:57:02 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Aug  5 16:37:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda9940c

dev-java/jna: remove unused patch

 dev-java/jna/files/jna-3.4.0-makefile-flags.patch | 62 ---
 1 file changed, 62 deletions(-)

diff --git a/dev-java/jna/files/jna-3.4.0-makefile-flags.patch 
b/dev-java/jna/files/jna-3.4.0-makefile-flags.patch
deleted file mode 100644
index e4ff00b..000
--- a/dev-java/jna/files/jna-3.4.0-makefile-flags.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/native/Makefile b/native/Makefile
-index 75246a8..a1c3e66 100644
 a/native/Makefile
-+++ b/native/Makefile
-@@ -70,7 +70,7 @@ LIBPFX=lib
- LIBSFX=.so
- ARSFX=.a
- JNISFX=$(LIBSFX)
--CC=gcc
-+CC?=gcc
- LD=$(CC)
- LIBS=
- # Default to Sun recommendations for JNI compilation
-@@ -83,10 +83,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)
-@@ -149,7 +149,7 @@ ifneq ($(MINGW),)
- CDEFINES=-DPSAPI_VERSION=1
- CC = $(MINGW) -m64 -mno-cygwin
- LD = $(CC)
--LDFLAGS=-o $@ -shared
-+LDFLAGS+=-o $@ -shared
- LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt 
- FFI_CONFIG += --host=x86_64-pc-mingw32
- else
-@@ -169,14 +169,14 @@ ifeq ($(OS),linux)
- ARCH=$(shell uname -m | sed 's/i.86/i386/g')
- PCFLAGS+=-fPIC
- CDEFINES+=-DHAVE_PROTECTION
--LDFLAGS+=-Wl,-soname,$@
-+LDFLAGS+= -Wl,-soname,$(shell basename $@)
- endif
- 
- ifneq (,$(findstring bsd,$(OS)))
- ARCH=$(shell uname -m | sed 's/i.86/i386/g')
- PCFLAGS+=-fPIC
- CINCLUDES+=-I/usr/X11R6/include
--LDFLAGS=-o $@ -shared 
-+LDFLAGS+= -o $@ -shared 
- CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
- endif
- 
-@@ -239,7 +239,7 @@ endif
- 
- PCFLAGS+=$(ISYSROOT) -x objective-c
- CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
--LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
-+LDFLAGS+=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
-   -compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 
's/^\([0-9][0-9]*\).*/\1/g') \
-   -current_version $(JNA_JNI_VERSION) \
-   -mmacosx-version-min=10.3 \



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2016-06-28 Thread Patrick Lauer
commit: 952d59cd692d3f5589ddb0401c228dd349843624
Author: Patrick Lauer  gentoo  org>
AuthorDate: Tue Jun 28 10:32:08 2016 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Tue Jun 28 12:28:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952d59cd

dev-java/jna: Add missing Xt dependency

Package-Manager: portage-2.3.0

 dev-java/jna/jna-4.2.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/jna/jna-4.2.2.ebuild b/dev-java/jna/jna-4.2.2.ebuild
index 8d82418..87bb741 100644
--- a/dev-java/jna/jna-4.2.2.ebuild
+++ b/dev-java/jna/jna-4.2.2.ebuild
@@ -30,6 +30,7 @@ RDEPEND="${CDEPEND}
 
 DEPEND="${CDEPEND}
>=virtual/jdk-1.7
+   x11-libs/libXt
virtual/pkgconfig
test? (
dev-java/ant-junit:0



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2016-05-11 Thread James Le Cuirot
commit: f81d7ecc9b41cab24fc03f3b7e7da6d9796bb1ea
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed May 11 21:06:04 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed May 11 21:06:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81d7ecc

dev-java/jna: Remove old 3.4.0-r1

Package-Manager: portage-2.2.28

 dev-java/jna/jna-3.4.0-r1.ebuild | 92 
 1 file changed, 92 deletions(-)

diff --git a/dev-java/jna/jna-3.4.0-r1.ebuild b/dev-java/jna/jna-3.4.0-r1.ebuild
deleted file mode 100644
index 9789387..000
--- a/dev-java/jna/jna-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Java Native Access (JNA)"
-HOMEPAGE="https://github.com/twall/jna#readme;
-SRC_URI="https://github.com/twall/jna/tarball/3.4.0 -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+awt +nio-buffers"
-REQUIRED_USE="test? ( awt nio-buffers )"
-
-COMMON_DEP="
-   virtual/libffi"
-RDEPEND="${COMMON_DEP}
-   >=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
-   >=virtual/jdk-1.6
-   dev-java/ant-nodeps:0
-   virtual/pkgconfig
-   test? (
-   dev-java/ant-junit:0
-   dev-java/ant-trax:0
-   )"
-
-java_prepare() {
-   # delete bundled jars and copy of libffi
-   find -name "*.jar" -exec rm -v {} + || die
-   rm -r native/libffi || die
-
-   epatch "${FILESDIR}/${PV}-build.xml.patch"
-   # respect CFLAGS, don't inhibit warnings, honour CC
-   epatch "${FILESDIR}/${P}-makefile-flags.patch"
-   tc-export CC
-
-   # Build to same directory on 64-bit archs.
-   mkdir build || die
-   ln -snf build build-d64 || 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
-}
-
-EANT_BUILD_TARGET="jar contrib-jars"
-EANT_ANT_TASKS="ant-nodeps"
-EANT_EXTRA_ARGS="-Ddynlink.native=true"
-
-EANT_TEST_ANT_TASKS="ant-junit ant-nodeps ant-trax"
-src_test() {
-   local sysprops=""
-
-   # crashes vm (segfault)
-   sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java 
|| die
-
-   # crashes vm, java 7 only (icedtea-7,  oracle-jdk-bin-1.7)
-   sed -i -e 's|testGCCallbackOnFinalize|no&|' 
test/com/sun/jna/CallbacksTest.java || die
-
-   sysprops+=" -Djava.awt.headless=true"
-   sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount
-
-   mkdir -p lib || die
-   java-pkg_jar-from --into lib --build-only junit
-
-   # need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
-   # survive the junit task.
-   _JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
-}
-
-src_install() {
-   java-pkg_dojar build/${PN}.jar
-   java-pkg_dojar contrib/platform/dist/platform.jar
-   java-pkg_doso build/native/libjnidispatch.so
-
-   java-pkg_register-optional-dependency emul-linux-x86-jna #313209
-
-   use source && java-pkg_dosrc src/com
-   use doc && java-pkg_dojavadoc doc/javadoc
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/files/, dev-java/jna/

2016-05-11 Thread James Le Cuirot
commit: f7351c4323d1ad8a2160879cde9038b60b41610b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed May 11 21:03:06 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed May 11 21:06:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7351c43

dev-java/jna: Version bump to 4.2.2, fixes #510796

Package-Manager: portage-2.2.28

 dev-java/jna/Manifest |  1 +
 dev-java/jna/files/4.2.2-build.xml.patch  | 23 
 dev-java/jna/files/4.2.2-makefile-flags.patch | 25 +
 dev-java/jna/jna-4.2.2.ebuild | 78 +++
 dev-java/jna/metadata.xml |  2 +-
 5 files changed, 128 insertions(+), 1 deletion(-)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index 2125bdc..1fd7c91 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1,2 +1,3 @@
 DIST jna-3.4.0.tar.gz 34547165 SHA256 
bff8fb935044a1e5de611e576e30a08c263e6a26a9f4c631dbe3a0cac2d79f14 SHA512 
30c4e6a3a5ac133095248d3eb7d4983a91e11a267a581268a91316927ac75c5a133a58625d321276ac0b229c42c502f85492672d99713c90de98a648bd008b35
 WHIRLPOOL 
0a5a9d35db0e0090375235048c985fd8bd9ccf319d03c1c3db33e81d3e1a1bec8718a48f6b8180c7531d3963ae91b5337f539eb69e3db73b3f87ea693706fe08
 DIST jna-3.4.1.tar.gz 35285043 SHA256 
fb0ff552a11ddf18b82f1e3fbfe01985fb7a41e242124c63257bb685408ca16e SHA512 
8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917
 WHIRLPOOL 
9c06862f76fbab7175f134a3f965d7d944ff536a03f03256307f8300b1fd1c9888c6e312bb74a80088128278efa9f8f7dfca668e4ebeacfff91bba3bc97951b0
+DIST jna-4.2.2.tar.gz 58638853 SHA256 
46330123be97fa5c11b1747c74470a39f2b1a3396d66fd6ead4d034660eb094a SHA512 
11ab524f87f6dc7fe3ac8eb0620f9ba392445147770304be7b7fa5cd49de8efed983ad30c16077bfa6419eaf1ff50311a3ded811a78fdcd09bc686ef93ad7f9f
 WHIRLPOOL 
a8cd562276c4e2955ad5aa178660810f6dd45d0bd51f1c267d1a8fd139f9fb6a45aaf794a03c9f333c51617240cbff0d79f57ce73e4fc341c431b3ab959055f1

diff --git a/dev-java/jna/files/4.2.2-build.xml.patch 
b/dev-java/jna/files/4.2.2-build.xml.patch
new file mode 100644
index 000..3647646
--- /dev/null
+++ b/dev-java/jna/files/4.2.2-build.xml.patch
@@ -0,0 +1,23 @@
+--- build.xml.orig 2016-03-16 14:37:28.0 +
 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/4.2.2-makefile-flags.patch 
b/dev-java/jna/files/4.2.2-makefile-flags.patch
new file mode 100644
index 000..10cf4b2
--- /dev/null
+++ b/dev-java/jna/files/4.2.2-makefile-flags.patch
@@ -0,0 +1,25 @@
+--- native/Makefile.orig   2016-03-16 14:37:28.0 +
 native/Makefile2016-04-16 22:27:06.426345376 +0100
+@@ -81,7 +81,7 @@
+ LIBSFX=.so
+ ARSFX=.a
+ JNISFX=$(LIBSFX)
+-CC=gcc
++CC?=gcc
+ LD=$(CC)
+ LIBS=
+ # Default to Sun recommendations for JNI compilation
+@@ -94,10 +94,10 @@
+ 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)

diff --git a/dev-java/jna/jna-4.2.2.ebuild b/dev-java/jna/jna-4.2.2.ebuild
new file mode 100644
index 000..8d82418
--- /dev/null
+++ b/dev-java/jna/jna-4.2.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs
+
+DESCRIPTION="Java Native Access (JNA)"
+HOMEPAGE="https://github.com/twall/jna;
+SRC_URI="https://github.com/twall/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="4"
+KEYWORDS="~amd64 ~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="virtual/libffi"
+
+RDEPEND="${CDEPEND}
+   >=virtual/jre-1.7"
+
+DEPEND="${CDEPEND}
+   >=virtual/jdk-1.7
+   virtual/pkgconfig
+   test? (
+   dev-java/ant-junit:0
+   dev-java/guava:18
+   dev-java/javassist:3
+   

[gentoo-commits] repo/gentoo:master commit in: dev-java/jna/

2015-09-30 Thread Patrice Clement
commit: 0e59abf8d4fde8404ca0f0bd23f117460fc953ca
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Sep 30 23:05:53 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Sep 30 23:05:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e59abf8

dev-java/jna: Version bump.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/jna/Manifest |  1 +
 dev-java/jna/jna-3.4.1.ebuild | 90 +++
 2 files changed, 91 insertions(+)

diff --git a/dev-java/jna/Manifest b/dev-java/jna/Manifest
index f99a716..2125bdc 100644
--- a/dev-java/jna/Manifest
+++ b/dev-java/jna/Manifest
@@ -1 +1,2 @@
 DIST jna-3.4.0.tar.gz 34547165 SHA256 
bff8fb935044a1e5de611e576e30a08c263e6a26a9f4c631dbe3a0cac2d79f14 SHA512 
30c4e6a3a5ac133095248d3eb7d4983a91e11a267a581268a91316927ac75c5a133a58625d321276ac0b229c42c502f85492672d99713c90de98a648bd008b35
 WHIRLPOOL 
0a5a9d35db0e0090375235048c985fd8bd9ccf319d03c1c3db33e81d3e1a1bec8718a48f6b8180c7531d3963ae91b5337f539eb69e3db73b3f87ea693706fe08
+DIST jna-3.4.1.tar.gz 35285043 SHA256 
fb0ff552a11ddf18b82f1e3fbfe01985fb7a41e242124c63257bb685408ca16e SHA512 
8164de9d213f670e6408627ec13fc128802351c2b906e1e1e95fd3280917ef1eba24d8b6b913a9df8034d20a5d46f6f823b5ee2d18b83248093a1855c89c5917
 WHIRLPOOL 
9c06862f76fbab7175f134a3f965d7d944ff536a03f03256307f8300b1fd1c9888c6e312bb74a80088128278efa9f8f7dfca668e4ebeacfff91bba3bc97951b0

diff --git a/dev-java/jna/jna-3.4.1.ebuild b/dev-java/jna/jna-3.4.1.ebuild
new file mode 100644
index 000..8ad9de7
--- /dev/null
+++ b/dev-java/jna/jna-3.4.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="test doc source"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic vcs-snapshot
+
+DESCRIPTION="Java Native Access (JNA)"
+HOMEPAGE="https://github.com/twall/jna#readme;
+SRC_URI="https://github.com/twall/jna/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+awt +nio-buffers"
+REQUIRED_USE="test? ( awt nio-buffers )"
+
+CDEPEND="
+   virtual/libffi"
+RDEPEND="${CDEPEND}
+   >=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+   >=virtual/jdk-1.6
+   virtual/pkgconfig
+   test? (
+   dev-java/junit:0
+   dev-java/ant-junit:0
+   dev-java/ant-trax:0
+   )"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jar contrib-jars"
+
+java_prepare() {
+   # This jar is needed for some tests.
+   # So let's make a copy of it.
+   cp lib/clover.jar "${T}" || die
+
+   find -name "*.jar" -exec rm -v {} + || die
+   rm -r native/libffi || die
+   mkdir -p doc/javadoc || die
+
+   # and restore it.
+   cp "${T}"/clover.jar lib || die
+
+   # Build to same directory on 64-bit archs.
+   mkdir build || die
+   ln -snf build build-d64 || 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
+}
+
+EANT_EXTRA_ARGS="-Ddynlink.native=true"
+
+EANT_TEST_ANT_TASKS="ant-junit ant-nodeps ant-trax"
+src_test() {
+   local sysprops=""
+
+   # crashes vm (segfault)
+   sed -i -e 's|testRegisterMethods|no&|' test/com/sun/jna/DirectTest.java 
|| die
+
+   # crashes vm, java 7 only (icedtea-7,  oracle-jdk-bin-1.7)
+   sed -i -e 's|testGCCallbackOnFinalize|no&|' 
test/com/sun/jna/CallbacksTest.java || die
+
+   sysprops+=" -Djava.awt.headless=true"
+   sysprops+=" -Djava.io.tmpdir=${T}" #to ensure exec mount
+
+   mkdir -p lib || die
+   java-pkg_jar-from --into lib --build-only junit
+
+   # need to use _JAVA_OPTIONS or add them to the build.xml. ANT_OPTS won't
+   # survive the junit task.
+   _JAVA_OPTIONS="${sysprops}" java-pkg-2_src_test
+}
+
+src_install() {
+   java-pkg_dojar build/${PN}.jar
+   java-pkg_dojar contrib/platform/dist/platform.jar
+   java-pkg_doso build/native/libjnidispatch.so
+   use source && java-pkg_dosrc src/com
+   use doc && java-pkg_dojavadoc doc/javadoc
+}