Mend Makefile to get tests to pass. Update dependencies. Set patches in order. Fix bug 551494.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

5 files changed, 30 insertions, 20 deletions

diff --git a/dev-java/jaffl/ChangeLog b/dev-java/jaffl/ChangeLog
index bd5837facc82..ee7d66a75f63 100644
--- a/dev-java/jaffl/ChangeLog
+++ b/dev-java/jaffl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jaffl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/ChangeLog,v 1.11 2015/06/07 08:31:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/ChangeLog,v 1.12 2015/06/08 12:53:18 monsieurp Exp $
+
+  08 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +files/jaffl-0.5.11-GNUmakefile.patch, +files/jaffl-0.5.11-library-path.patch,
+  -files/library-path-0.5.9.patch, -files/library-path.patch,
+  jaffl-0.5.11.ebuild:
+  Mend Makefile to get tests to pass. Update dependencies. Set patches in order.
+  Fix bug 551494.
 
   07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add github to remote-id in metadata.xml
diff --git a/dev-java/jaffl/files/jaffl-0.5.11-GNUmakefile.patch b/dev-java/jaffl/files/jaffl-0.5.11-GNUmakefile.patch
new file mode 100644
index 000000000000..89e6dda90cc6
--- /dev/null
+++ b/dev-java/jaffl/files/jaffl-0.5.11-GNUmakefile.patch
@@ -0,0 +1,11 @@
+--- libtest/GNUmakefile.orig	2015-06-08 12:11:24.235000000 +0000
++++ libtest/GNUmakefile	2015-06-08 11:47:52.963000000 +0000
+@@ -38,7 +38,7 @@
+ #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
+ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
+ OFLAGS = -O2 $(JFLAGS)
+-WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses
++WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
+ PICFLAGS = -fPIC
+ SOFLAGS = -shared -Wl,-O1
+ LDFLAGS += $(SOFLAGS)
diff --git a/dev-java/jaffl/files/library-path-0.5.9.patch b/dev-java/jaffl/files/jaffl-0.5.11-library-path.patch
index 4782f17111fd..4782f17111fd 100644
--- a/dev-java/jaffl/files/library-path-0.5.9.patch
+++ b/dev-java/jaffl/files/jaffl-0.5.11-library-path.patch
diff --git a/dev-java/jaffl/files/library-path.patch b/dev-java/jaffl/files/library-path.patch
deleted file mode 100644
index 0e7459d0c5ae..000000000000
--- a/dev-java/jaffl/files/library-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/com/kenai/jaffl/provider/Library.java.orig	2009-12-31 09:30:08.000000000 +1300
-+++ src/com/kenai/jaffl/provider/Library.java	2009-12-31 09:38:11.000000000 +1300
-@@ -53,5 +53,6 @@
-         userLibraryPath.addAll(getPropertyPaths("jaffl.library.path"));
-         // Add JNA paths for compatibility
-         userLibraryPath.addAll(getPropertyPaths("jna.library.path"));
-+	userLibraryPath.addAll(getPropertyPaths("java.library.path"));
-     }
- }
diff --git a/dev-java/jaffl/jaffl-0.5.11.ebuild b/dev-java/jaffl/jaffl-0.5.11.ebuild
index 2cbf77555bf5..0ff0787bfc62 100644
--- a/dev-java/jaffl/jaffl-0.5.11.ebuild
+++ b/dev-java/jaffl/jaffl-0.5.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild,v 1.2 2013/07/23 17:23:33 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaffl/jaffl-0.5.11.ebuild,v 1.3 2015/06/08 12:53:18 monsieurp Exp $
 
 EAPI="5"
 
@@ -18,19 +18,19 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-CDEPEND="dev-java/jffi:0.4
+CDEPEND="dev-java/jffi:1.2
 	dev-java/jnr-x86asm:0
 	dev-java/asm:3"
 
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
 
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip
 	${CDEPEND}
 	test? (
 		dev-java/junit:4
-		dev-java/ant-junit4:0
+		dev-java/ant-junit:0
 		dev-java/hamcrest-core:0
 	)"
 
@@ -45,9 +45,10 @@ src_unpack() {
 java_prepare() {
 	rm -vf lib/{.,junit*}/*.jar
 
-	epatch "${FILESDIR}/library-path-0.5.9.patch"
+	epatch "${FILESDIR}"/${P}-library-path.patch
+	epatch "${FILESDIR}"/${P}-GNUmakefile.patch
 
-	java-pkg_jar-from --into lib jffi-0.4
+	java-pkg_jar-from --into lib jffi-1.2
 	java-pkg_jar-from --into lib jnr-x86asm
 	java-pkg_jar-from --into lib asm-3 asm.jar asm-3.2.jar
 	java-pkg_jar-from --into lib asm-3 asm-analysis.jar asm-analysis-3.2.jar
@@ -64,9 +65,9 @@ EANT_EXTRA_ARGS="-Dreference.jffi.jar=lib/jffi.jar \
 	-D\"already.built.${S}\"=true"
 
 src_test() {
-	local paths="$(java-config -di jnr-x86asm,jffi-0.4):${S}/build"
+	local paths="$(java-config -di jnr-x86asm,jffi-1.2):${S}/build"
 
-	ANT_TASKS="ant-junit4 ant-nodeps" eant test \
+	ANT_TASKS="ant-junit ant-nodeps" eant test \
 		-Drun.jvmargs="-Djava.library.path=${paths}" \
 		-Dlibs.junit_4.classpath="$(java-pkg_getjars junit-4,hamcrest-core)" ${EANT_EXTRA_ARGS}
 }