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

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

6 files changed, 43 insertions, 41 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/Manifest b/dev-java/jaffl/Manifest
index 4bd1e161721a..848e5df3d80a 100644
--- a/dev-java/jaffl/Manifest
+++ b/dev-java/jaffl/Manifest
@@ -1,31 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX jaffl-0.5.11-GNUmakefile.patch 477 SHA256 32d61636ffbeb42e994c61305032550ca6de44ce5c8c46498aa3da5e7b501338 SHA512 00ed0970f7e984a4137f4bdfe7913e674f00237fdc8c7344f0b57ffaec1322d23673863d5b38a9792e4c6f2d7ac63c29929155924b75715b34b88560aef09c55 WHIRLPOOL bf3d453d43547c7706c0b74a0c2b12fddce30e664e546cf8a4da32d13b678bf2163c262f9ced559dc7d9dff367ca042d0f80b4c06fbbd39cd62734dc764320b4
+AUX jaffl-0.5.11-library-path.patch 488 SHA256 191afe6bf54114d436ce62f85144ce8d7554758549824c0f5cb043444630cd06 SHA512 75ac215b0ec38d5117ff09e1c0b71b78bb319ba449feccdc7420ce512fbce707f0234b95b212206785ce9ee03b125cb328a51c033023eaed2c529232525f487f WHIRLPOOL 09707d0e074a3c753fba3a11c08c4c1b7e6e617cb0c3a73089241026990dc0981ee9efbdb5a7a92b8c834e65c3b77b33594954038940dbc1f29c7cd371901f31
 AUX library-path-0.5.1.patch 445 SHA256 c8d08190ac6b5161630019cdb9abfd90941dab3e7b52086eca21718890cef43e SHA512 48ce65924504d9262babc7786f9bc22e9641f9cede9665384003d14a2dc17ae10e7903303bc55520b6fe5305578f405aa2cc932a5cb5d509fb0daeed594660d6 WHIRLPOOL e351ce261ffbb70cc6a49dba5b5f8befd85f2419ffbb6a46dec9f5c885d717906476ffaf6755108713837a9855953a5e6a53d83a5f63ad5f3f35dcded1ee2042
-AUX library-path-0.5.9.patch 488 SHA256 191afe6bf54114d436ce62f85144ce8d7554758549824c0f5cb043444630cd06 SHA512 75ac215b0ec38d5117ff09e1c0b71b78bb319ba449feccdc7420ce512fbce707f0234b95b212206785ce9ee03b125cb328a51c033023eaed2c529232525f487f WHIRLPOOL 09707d0e074a3c753fba3a11c08c4c1b7e6e617cb0c3a73089241026990dc0981ee9efbdb5a7a92b8c834e65c3b77b33594954038940dbc1f29c7cd371901f31
-AUX library-path.patch 450 SHA256 b50c0160914c64a1657a9b5b7743f86656b0ad9706465b14ab60be58fa87ef68 SHA512 174b2c269db3d3179c2be26190c965af49ad9d3ea255a5634ce6eeb294aeacbf6b17168bc362a2e0d59dcb22f26c626dc1b3c6eda83058ae9b7f55e06e9b0f6d WHIRLPOOL a1b3facfceeecf579370a55dc924f9030c29da6ab129a577feb6b754fbdafb2e6c42101949eba04401c9c99639ead146b645027b142be08fc93b74dbe88e06f0
 DIST jaffl-0.5.1.tar.gz 558817 SHA256 ba392468edcac21f8765dea717bede0cf3ce6488c85471ce1010e4f6973b034f SHA512 735417cc4110b63df39b43a9d96bf0c2b894abb3d7fc8886bdb33086c0d1003f9e41777a499efe60e8b6f8b3768cb4ec59ac0950455dc20922fe9fad4367bbf6 WHIRLPOOL 8ca384e7145ae43f741f06a4d7fcb7ddf8fbfd0c62e57beeaf4d2b17540b477d92dd54a4138b75bc600740da81eb8e8d56dd1ac05d6da5ccd4e009b946084fc1
 DIST jaffl-0.5.11.tar.gz 559465 SHA256 77a7e7bf0b98521ed749238fec8eb184426b074010874a9ee9f076e27b74ac6a SHA512 efa5479901ac6d21310af7d482298281189b7d91b806a273cf99faacb4ee0ec6862427077e2553153c3741a640371199cf78750cd4de9f9fdd92e3f1962d7728 WHIRLPOOL 6970de5819e6335c454584a5071290ed10ace121197a5f4396063dbc9eae388bffa573ab921c6896c018f4f3c1441a0dda54952de8a7527cb5aebefe0a7127f3
 EBUILD jaffl-0.5.1.ebuild 2066 SHA256 a07d165461897a87203236ac36f484468d901bc394c2623b8b81d2b0401bb0cb SHA512 b85aacb4f65424d9f99a9192c62a35a85c4f793e23c57bd294e45ed1bd964d1a7b6c40fe1543a78989b305fd7788c23384049164bd6374e1b224550acfa2ddda WHIRLPOOL 2a15d09d0718b77c6c8a0ab98b59a698d0ab6c3670bf911a9f50071721da7c3950bbde2487b66e64f1f3fc7e660771fb48c7e7b5d531c5a47b6abe63e3ba4069
-EBUILD jaffl-0.5.11.ebuild 2102 SHA256 d733f2f31d1010ae78d232bb432facd7d85f5ec3f861fcca4e9ddda1c4951d8c SHA512 cfc73e01f3aa4098984e5074c7484b73e6ff42c42fda80913b487effa96b31bb0a7de3e0aed35ba08f8dd5de9c52ea62fd45029b4bc3fb7344eeae8969515679 WHIRLPOOL c66508eca9f846be693729c24ae5b87ede5bcf614f7306a3c2b33dbaabbc3f97f0c698a817c84e08a77c4eb16f3a6fc6ab06ae2ea32db17ecfd4babd9d24bbf1
-MISC ChangeLog 1578 SHA256 3eea9f1f05d113e6d80cc2bc0a142881fc68eb2f6f6a331d604e1e2e09e5f4ba SHA512 d496bbf09fb14bdd1bdaee31b9320ee823657a68dbb75562f791202bdb1b891d6226fdd41023a60fd7f3a7932f5d8d6267953658b4342e5bad22cc4d915c1f9e WHIRLPOOL 264f9f88349b8eab0711461880dbc1f55bf2aae569f181ac29eb7b119c46e3723dabc61c544c53dfbcd2c1f45846aa1a728a9f346bcae9832ff2d17658f545a2
+EBUILD jaffl-0.5.11.ebuild 2146 SHA256 d2002db879f11c083756722850802a22d1172ab5c5a867a42a9ed0ad6269861c SHA512 96bc99ed03b1baad83fe2779b25e4303e1ddacfc13b50f75cf4485ff724903601ab168f3916f70e7f179b0f7b966b2737d1784b8ec9fc3f6b40d8e1ff009d531 WHIRLPOOL 72fac6bcbe3756401d900ea97ac1409242966764dcf33097b3da58a9b7c9fee5180360009ddb517b9dcc9173106ce0c486a352f7b26301b13af78ed8e6f6075b
+MISC ChangeLog 1903 SHA256 25784eb9a7a0e57d76fe43d1e41b367fc1bc123c47d2c0ab57e8fdea3ba2f604 SHA512 927a3fadaec30bc7c9cf209d234284f1f874399b62d5ac1971de1cdfc002827cab5f03665394ec9f7b9aa2a11fdd3f9e109423ff79d2c67b73dacc5b686597e3 WHIRLPOOL 4255997688bfcc00c8a8cd8c10ebb8051ed955c6f173112d24a3bcdffe3accd4ee03ecae8e553280e6daf12e2bb193dd37124f247db8759998ae2bd472cceca0
 MISC metadata.xml 416 SHA256 2309ae0b6289f8d89aa8d462e7fb9bc9d4bf16d50057455ae187d960f48b85f9 SHA512 91c1e479dc79dc4b85d0c8261c16825f248df6419b2234411252ab7d11ba3ab2b158aa0d33e60b007860c58152ca24420286fc1c17abcfe8a5a283951f325e2a WHIRLPOOL 78a8a3ee9680da7a0b1905d336a33aa40e3613ab183b5e7226b2f10814bfe3e9a63c7357349571f4490be7c72686940abe9f545857375685e3f51e6d81dccf34
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdAFIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRhoP/2TWELVoVyl+6Uqa5fFYkZVK
-WIblEED8TDMajSAmiGO9nAVnnK7rOkqggBbGehEHovXYlMF1g5FB9/JEJtfFLnzl
-r95sYkkuKcots2xIbJefScOUCL4M9yGgwpiyUdBIjpUURRl4JoFookb8/glR9HRw
-HU88z7o4yJA//zesuiJVtYeg+Y/S0urF6PlVGG+PkPNc2pfMlxFdZ5YRvQBS8uEf
-LqNOxWEFdzrAUhUQF4/dONbRxiVKBqjAgpli/jOFkMJUKFKKcZ0zMBRMS1He5zKg
-G58XjL3wpFTSgu9ncTZT/8AlzSjx34Fc1LWW1x/NTga+zm3dHX9Cw1HBZNUcMzMv
-VVq53rS+FoXdv6mkT7mrRn76uAHfg82nAiNZ2/94Spe3OTpbgNUkC17pArEVW433
-uugIYqyazRcuieToAGBU3eVSTWwn/Q3YXu1LoOnSYjfz/lsat5+VIKoUkJ+QxuiD
-as/KopLCpff9zLmOiGAvHI9wp/iXLW5putNApOBVHztMJp71NJzHDYDZF/6IrUSJ
-MBgY+4krpx3SrUxMG468PQWK4g7o4FrjyKjUISTNVxQBahz0ctZKRuIA2tAniQYY
-JMwtLpifhbQigExEFzV3S4dvwnYURkDweeEZE2t0xXENky8XxQy+mGkHT6Vwvsoj
-8mTNvAnoYlZSLh6W92Ek
-=H0/R
+iQEcBAEBCAAGBQJVdY/AAAoJEJGRpfGTSRu43msIAK2XpnBDaY8A3FV6Ni+SraYy
+jXK9NWTHlF07yhLGulWeepWTFjRmXcrYDuzJKe2+D/rX4b7//PEuU8o99FWeYb1W
+zX8H3ogLtZOBgEE68bhPulVVHrXrhF0ixRRxKXJDQTe42XTmMErAaRrgHgOkg2hJ
+RTniAZljc82mbTNxKpD08kyAdzSw8WXPylaWTqiwAxDcv8K5Nm6OQlVEGPht8h8S
+k5WsqmBG3AaCRnj3uDP8is61aphRNNSElic2dHVJLyTGmT5E0x2qWVxeTqodC7am
+h6/IadD6MAGbho+L8krfbUKvUXI1P1SxXOLd0SZ4s8oLHsU0GeWFwjXUzyUnUj8=
+=EAPd
 -----END PGP SIGNATURE-----
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}
 }