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

Package-Manager: portage-2.3.2

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 c907b592b040..000000000000
--- 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 @@
-     <path id="test.runpath">
-       <pathelement path="${build}/${jar}"/>
-       <pathelement path="${test.classes}"/>
-+      <!--
-       <pathelement path="lib/clover.jar"/>
-+      -->
-       <path refid="test.libs"/>
-     </path>
-   </target>
-@@ -433,13 +435,17 @@
-     <copy todir="${build}/jws" file="${build}/${jar}"/>
-     <copy todir="${build}/jws" file="${build}/${testjar}"/>
-     <copy todir="${build}/jws" file="lib/junit.jar"/>
-+    <!--
-     <copy todir="${build}/jws" file="lib/clover.jar"/>
-+    -->
-     <jar jarfile="${build}/jws/jnidispatch.jar">
-       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-     </jar>
-+    <!--
-     <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
--      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-+      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar"/>
-     </signjar>
-+    -->
-   </target>
- 	
-   <!-- When running tests from an IDE, be sure to set jna.library.path -->
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 90d96e00f1ce..000000000000
--- 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 36476462c795..de49c24b1912 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.000000000 +0000
-+++ build.xml	2016-04-16 22:22:27.692967205 +0100
+--- a/build.xml	2016-03-16 14:37:28.000000000 +0000
++++ b/build.xml	2016-04-16 22:22:27.692967205 +0100
 @@ -320,7 +320,9 @@
        <pathelement path="${build}/${jar}"/>
        <pathelement path="${test.classes}"/>
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 10cf4b282cb2..3e290ece4e78 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.000000000 +0000
-+++ native/Makefile	2016-04-16 22:27:06.426345376 +0100
+--- a/native/Makefile	2016-03-16 14:37:28.000000000 +0000
++++ 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
index 87bb7413e067..50e363655ded 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 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	test? (
 		dev-java/ant-junit:0
-		dev-java/guava:18
+		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-18,javassist-3,reflections"
+EANT_TEST_GENTOO_CLASSPATH="guava-20,javassist-3,reflections"
+
+src_prepare() {
+	default
 
-java_prepare() {
 	# 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
 
-	epatch "${FILESDIR}"/${PV}-build.xml.patch
-	# respect CFLAGS, don't inhibit warnings, honour CC
-	epatch "${FILESDIR}"/${PV}-makefile-flags.patch
-	tc-export CC
-
 	if ! use awt ; then
 		sed -i -E "s/^(CDEFINES=.*)/\1 -DNO_JAWT/g" native/Makefile || die
 	fi
@@ -63,6 +65,12 @@ java_prepare() {
 	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() {