[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/, 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/, 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/, 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 @@