Version bump to 1.2.7, fixes part of bug #485144 reported by Arfrever. Patched tests to work with both junit 4.8 and 4.11.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 156 insertions, 6 deletions

diff --git a/dev-java/jffi/ChangeLog b/dev-java/jffi/ChangeLog
index 0e684bad5040..50305ae57005 100644
--- a/dev-java/jffi/ChangeLog
+++ b/dev-java/jffi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jffi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.28 2013/09/01 14:39:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/ChangeLog,v 1.29 2013/09/17 14:22:37 tomwij Exp $
+
+*jffi-1.2.7 (17 Sep 2013)
+
+  17 Sep 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/jffi-1.2.7-junit-4.11.patch, +jffi-1.2.7.ebuild:
+  Version bump to 1.2.7, fixes part of bug #485144 reported by Arfrever. Patched
+  tests to work with both junit 4.8 and 4.11.
 
   01 Sep 2013; Fabian Groffen <grobian@gentoo.org> jffi-1.2.6.ebuild:
   Fixed for and marked *-macos
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index bc560a7f1b3d..7d4fdb973fc0 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -6,21 +6,28 @@ AUX jffi-1.0.0-makefile.patch 3196 SHA256 51d5299b057924f37727baf34cf4ba8915fe96
 AUX jffi-1.0.11_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63 SHA512 cef3690413d0e5e9687ba29e7aa54082ee9e8f9021a210eec2ca1169e19749a8ca797a50698142f6811dd9939306a1e840262518523dc1f60e45fa4a62321b94 WHIRLPOOL 2346f974ad15e729b98427d9ec8782465d3ae77271c78f3440d8818f529357c81606df319f0aa3d49e47d202db43e867810234ecb8c5936b7221f383fe21f780
 AUX jffi-1.2.5_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63 SHA512 cef3690413d0e5e9687ba29e7aa54082ee9e8f9021a210eec2ca1169e19749a8ca797a50698142f6811dd9939306a1e840262518523dc1f60e45fa4a62321b94 WHIRLPOOL 2346f974ad15e729b98427d9ec8782465d3ae77271c78f3440d8818f529357c81606df319f0aa3d49e47d202db43e867810234ecb8c5936b7221f383fe21f780
 AUX jffi-1.2.6_no-werror.patch 382 SHA256 24fb274a3ec39eb94d6f9d3401df2127518b00a30d1f06276cb880b70f769f63 SHA512 cef3690413d0e5e9687ba29e7aa54082ee9e8f9021a210eec2ca1169e19749a8ca797a50698142f6811dd9939306a1e840262518523dc1f60e45fa4a62321b94 WHIRLPOOL 2346f974ad15e729b98427d9ec8782465d3ae77271c78f3440d8818f529357c81606df319f0aa3d49e47d202db43e867810234ecb8c5936b7221f383fe21f780
+AUX jffi-1.2.7-junit-4.11.patch 700 SHA256 db896154d8f55aae69f564a908ca1ea79c96af44f561bd2a1cc47a99226fef4a SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9 WHIRLPOOL 910bfba3cc1164bc2f7197195dfb9d739e32eb406185e8027f9d47a3e3cf6759fadac01b8cdfb0127d74ffd0f487280d5dacc360a81595f3aa5e93414197081b
 AUX jffi_maven-build.xml 11287 SHA256 fa81bee544d5304731268fd807c5176ffeca6d50c0882aebd2d9510118782a0b SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7 WHIRLPOOL 42f50c85cad6673cff32b41593c3b30c5193b1ce204a1df6a97d68d70ee6a6cd61f2b6d887bc36002e516849d91139fa1254a76b8951e839a483865e875964a5
 DIST jffi-1.0.0.tar.gz 1627422 SHA256 9950edbaf897cc1fa10fb944336a86ceba92674f54a1eaf59b2ab4881825d25e SHA512 cb37052d0a2dc719d1f2ab2620c1a1908cf51c5d1e04d13caaecb3659916a59e8e46fa90c2b6ddb9a63f7b78f224233b9316908456aaf9ebbc1432e7592006c7 WHIRLPOOL fba9c40a55cef900ccb5207f5d93345869693fd7ba027388797499cf65bc584260c37fd0962c0037a83c2d05eb7958c193482a8967501bedbaa2f1465644494f
 DIST jffi-1.0.11.tar.gz 1899655 SHA256 b66781a07e095dbaf9d568b77762e06215da4458d963956ea22dd5adb5f3126a SHA512 0f98c1aa55dfd9fd9338399e173f118ef12d01a65429a49ed5264a23fa6700e7ebdf13ffb6b6318fcd8ea9dce66a47524c5cefa50f3f11a251ca44a4f38fd6aa WHIRLPOOL aa8c3f88b75a26221b3c41ed552fdd83c551ae05fc7455f072b8a3d7f3190cad26a638d1800a67b09d8074b5dfdd04f2be73287a7f22c0cfcc5dbc8df0d2ae12
 DIST jffi-1.2.5.tar.gz 1798081 SHA256 2101c48855558902f2e21baacd0b2c8b7098feb3ca1487a195c2bc3d9116ebd4 SHA512 2613a1874899e1a734ad54d68f7d969fe3bc12bd1ae1aaf5a63a17d63ac6ac6b9812740b7c7a771e66ba0e4ff02105c6a2427771d4571be40ae869f3d6f077e3 WHIRLPOOL 174303fc9f10cf295e009ef2320f9b13295f5e96187ab2ae4599de891b27e1279645ea47409eb8aec9a8b247a5568cddd6f8566950b64be37e399cb0eda0219f
 DIST jffi-1.2.6.tar.gz 1850410 SHA256 b568d832828bf0cb980c545e8fd16147034048ca2d3ffc62cae4f844c8cc6cec SHA512 df178691e6894599f2a45146950cca7e4c81e92c38fc751c40b39e660970c19d0dce41c9192053dddf07f42317d28033f59b7140c904784c477526e7471b6938 WHIRLPOOL adb57b9ac981177ae7d697aae41bbaaff3a38dab4c4364258b13272023076dacdd93a751eb24a339ae17a4162d4511685a4aa67afd5d8fab2f852e0403ee73f1
+DIST jffi-1.2.7.tar.gz 1908203 SHA256 25f1930f294cec9651447edd08a51a990b7c92c69eca87257233e86e4dd5f979 SHA512 837ebb0085ec2acc5dc688c3e1883a7c986df62a32a41887196b88f5b5714ee667f918f2bdf005f019faae02df2f7903f291fa32c5ec3cabc360d9b1d8e4548d WHIRLPOOL 0e9824d54b21eb61142f4a868cd10122d9837c34732fc4ff9ba3093c0d4c11ee25dc0e045a40a4157faed201de9498e7cea28df85e7f14d07b58d2f4d1fb26e1
 EBUILD jffi-1.0.0.ebuild 2274 SHA256 a5fe1144dacf4f666105ef56cec8a8bf7b246a68dbde639ec4a0c9c867a2d4b1 SHA512 35894dc27f8b0d0f672d1d39548af68057f79e252663cf2c9ec8802e7dabb6d721afd3e1d030b37f7c7c37e395c39cbf5cda2a5b4b97f95d17fa3aa9b4d642cc WHIRLPOOL 986db534860b62f5dce5a12667410dfeb7c120a0a3f9e4fc5c57dca37d694204a4ac2b4b3d2b76bc7a961d15a88c7868c2290eab253a46f0f1b64a32d48191b8
 EBUILD jffi-1.0.11.ebuild 2562 SHA256 e925f71ef49b9fb710f5f6ab0493a0099c57fc218aa939addf06868f51032092 SHA512 a99c55469211698e24257216249550d6f3d83d37a3a61c6887f3bc0e87ec1b5d88badb75af1eeb7955ab58da5f58621ea7e460b0b6355f4473e05c643e5ce0ab WHIRLPOOL 43eea302b639890b69014f1c3e97866a5afa5a80f84c5db0c15f872276846304c27ed966743426ba783f030060f0c85101148bb4e2275525a69ca10033fbf6cb
 EBUILD jffi-1.2.5.ebuild 2358 SHA256 89636672db08de6b69c64d1da78cad1e05679323d812900be1325202e9540707 SHA512 6df150b5bb15f94f937676b93a720c407a07dcaa646a6f72fd9bb706b61729da2332deec464f7cff0ef99c6d5716ca26dfc8ce4e821f9733db37e6387ab12a98 WHIRLPOOL 6c82cdc180b1cf9fce413facb9b4bdfcbc649f25fb5ae573b840d4deed72d0f3c66f5d459eedb1afb5b3dbf8cd873d8e6fc680c4eb944989605ec23e3914f737
 EBUILD jffi-1.2.6.ebuild 3069 SHA256 52af5d368eff758bc0a6bbd7be7ac7188d13a473f0905744df1c37eb25dd7bdc SHA512 7329dd7ed5f7b9ae10a38684a9dcd3c5f725432aee173cfbe82602198292c91a084c02e90bcb413bd307c5e17abfabf710830189a4a8d09c214ac8543bd4836f WHIRLPOOL 7b770a7c295d3c5caa5fcf8ede7d3254090049a4d11b7c8cf5c01537cbcfeec5b7f9a11d1baed8af1a8eef3fa8ad968838e515e74d8dd66b711eb04514f9132b
-MISC ChangeLog 4954 SHA256 b62c95f440fea046cac3a47b5ea2c85de282c9dee3ed1cc22d4d39f7d390ea6b SHA512 b2cb64a619fb8d4c9fe9a62863c4d3efa6f918dfceeaee35a3cc13f5eb6c9eee9ea304120a87f2b6bacfb97b7ce8a40fc74ebd162474538f02a0e8510070b909 WHIRLPOOL 7fc56d7f848ab7b63d48ee84f1d3fccd079f6106c793098c41541638bcb6f6292a75f8962ffd3ad8d0d4a9c0c5b959490821cc5da70110c2e86f342b6393a06c
+EBUILD jffi-1.2.7.ebuild 3128 SHA256 0da2672f3e923c9a9b09e28b44c43c5968331b0a13bfda7fd6bd06abc1046cf1 SHA512 c297113feda673e2293f0c946c0fcdf46b25b5811055091555111f016f31cb5c60246dca551a7392e8abb95dd4a9263f152ca88b450b3cc95ea7e11ce634ad00 WHIRLPOOL 80a2e22b73aee512ffd246ae620e339937e768c1eeabb07bad08082985738b72cf3bd0734d8320e4ad2aba0098c417865777b670d61fbf546a241513f7574247
+MISC ChangeLog 5213 SHA256 150f1431b4cd819efcc864d8c82c0a4b51bc848e35b7241cd476dbffe1a24612 SHA512 4c9eb46361711c8b049aa7f783287e6fc5ae3417dac4257ddef56b224233a1322c7c0708d67d5df848bac4d06b3c534e974ad16f812301b54ce72feb7115fb76 WHIRLPOOL 001e281dd069b4f895f9dbfc5fad5fb2b318ffd9b82a418ccf09ef739dd86d6129b474a76991f8e940f6348872d7b7d853e6cfb7908e04a4688e67f35218b0dc
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (SunOS)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIjUZgACgkQX3X2B8XHTollrQCgnAochVCFvcT2U+r/iROL8S6t
-0TEAn0We6yeohzp/xPSKnQkj7V0AHpMA
-=qtSX
+iQEcBAEBCAAGBQJSOGSCAAoJEJWyH81tNOV9/oUH/ix0H+gI+XwjB+ouuRvhsbvg
+3kfxQA1NbZMg1+rmLHCNFQgsqAJzLy+/6qE5+HN868934gbqXi6FpI9/KQYepXw4
+gXnJzgYEwtkqpnUPm+7lmbIh3Fp/1EsLVluf6S/rumirOnqnVix59owj8/X/+uxS
+Yolv9tOopH0ID4fpZpdRyf7cORfGDKacidXdhj5uwqe5NHTh6mSEEIttiZxrzGTi
+JckCgK9QYVQ63sNbuh807j1/43b8tugIjN0tEDW/Wzy+vvlmnm390f7mnQ5jz6K7
+boPjoXkuSQKD1xNnDzIW7GWJKWCYcBLLEATPUwG15s4KOQOFjpREh4y7XS0rvbM=
+=fQgU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jffi/files/jffi-1.2.7-junit-4.11.patch b/dev-java/jffi/files/jffi-1.2.7-junit-4.11.patch
new file mode 100644
index 000000000000..ac3843a0053a
--- /dev/null
+++ b/dev-java/jffi/files/jffi-1.2.7-junit-4.11.patch
@@ -0,0 +1,14 @@
+--- a/src/test/java/com/kenai/jffi/NumberTest.java
++++ b/src/test/java/com/kenai/jffi/NumberTest.java
+@@ -234,9 +234,8 @@
+     private void returnF32(InvokerType type) {
+         LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type);
+         float[] values = { 0f, 1.0f, -2.0f };
+-        for (int i = 0; i < values.length; ++i) {
+-            assertEquals("Value not returned correctly", values[i], lib.ret_float(values[i]), 0.1f);
+-        }
++        float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f), lib.ret_float(-2.0f) };
++        assertArrayEquals("Value not returned correctly", values, lib_values, 0.1f);
+     }
+ 
+     @Test public void returnDefaultF64() {
diff --git a/dev-java/jffi/jffi-1.2.7.ebuild b/dev-java/jffi/jffi-1.2.7.ebuild
new file mode 100644
index 000000000000..39ddacd6fc2e
--- /dev/null
+++ b/dev-java/jffi/jffi-1.2.7.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jffi/jffi-1.2.7.ebuild,v 1.1 2013/09/17 14:22:37 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 versionator vcs-snapshot
+
+DESCRIPTION="An optimized Java interface to libffi"
+HOMEPAGE="https://github.com/jnr/jffi"
+SRC_URI="https://github.com/jnr/jffi/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+
+COMMON_DEP="virtual/libffi:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	virtual/pkgconfig:0
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/junit:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+	epatch "${FILESDIR}"/${PN}-1.2.6_no-werror.patch
+	epatch "${FILESDIR}"/${P}-junit-4.11.patch
+
+	# misc fixes for Darwin
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		local uarch
+		# don't do multiarch
+		# avoid using Xcode stuff
+		# use Prefix' headers
+		# don't mess with deployment target
+		# set install_name
+		use x64-macos && uarch=x86_64
+		use x86-macos && uarch=i386
+		use ppc-macos && uarch=ppc
+		sed -i \
+			-e "/ARCHES +=/s/=.*$/= ${uarch}/" \
+			-e "/XCODE=/s:=.*$:=${EPREFIX}:" \
+			-e "/MACSDK/s/^/#/" \
+			-e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \
+			-e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \
+			jni/GNUmakefile || die
+	fi
+
+	find "${WORKDIR}" -iname '*.jar' -delete
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+src_compile() {
+	# generate Version.java
+	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
+		package com.kenai.jffi;
+		public final class Version {
+			private Version() {}
+			public static final int MAJOR = $(get_version_component_range 1);
+			public static final int MINOR = $(get_version_component_range 2);
+			public static final int MICRO = $(get_version_component_range 3);
+		}
+	EOF
+
+	java-pkg-2_src_compile
+
+	# generate headers
+	mkdir -p build/jni
+	javah -d build/jni -classpath target/classes \
+		com.kenai.jffi.Foreign \
+		com.kenai.jffi.ObjectBuffer \
+		com.kenai.jffi.Version \
+		|| die
+
+	#build native library.
+	local args=(
+		SRC_DIR=jni
+		JNI_DIR=jni
+		BUILD_DIR=build/jni
+		VERSION=$(get_version_component_range 1-2)
+		USE_SYSTEM_LIBFFI=1
+		-f jni/GNUmakefile
+	)
+	emake "${args[@]}"
+}
+
+EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
+
+src_test() {
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djffi.boot.library.path=build/jni" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	local libname=".so"
+
+	cat > boot.properties <<-EOF
+		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
+	EOF
+	jar -uf target/${PN}.jar boot.properties || die
+
+	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
+
+	java-pkg_dojar target/${PN}.jar
+	java-pkg_doso build/jni/lib${PN}-$(get_version_component_range 1-2)${libname}
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}