Version bump to 1.0.6, fixes bug #485144 reported by Arfrever. Patched tests to work with both junit 4.8 and 4.11. New SLOT 1.

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

4 files changed, 95 insertions, 9 deletions

diff --git a/dev-java/jnr-ffi/ChangeLog b/dev-java/jnr-ffi/ChangeLog
index fff887ed5b28..d21bd020a7a5 100644
--- a/dev-java/jnr-ffi/ChangeLog
+++ b/dev-java/jnr-ffi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jnr-ffi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.11 2013/09/17 14:28:50 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/ChangeLog,v 1.12 2013/09/21 12:25:53 tomwij Exp $
+
+*jnr-ffi-1.0.6 (21 Sep 2013)
+
+  21 Sep 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/jnr-ffi-1.0.6-junit48.patch, +jnr-ffi-1.0.6.ebuild:
+  Version bump to 1.0.6, fixes bug #485144 reported by Arfrever. Patched tests
+  to work with both junit 4.8 and 4.11. New SLOT 1.
 
 *jnr-ffi-0.7.11 (17 Sep 2013)
 
diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest
index 56ee41b1b10d..aeb21a429959 100644
--- a/dev-java/jnr-ffi/Manifest
+++ b/dev-java/jnr-ffi/Manifest
@@ -1,27 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX jnr-ffi-1.0.6-junit48.patch 467 SHA256 9aab14e22055438d5b6fc8aa50c6923fdc5775458d558ba97309277eb7455e4f SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884 WHIRLPOOL aa6317f662efd57901f986043366880b629fdd45e30ccf20c9c37aa1e92a9022479c12779a69b6b434a0f9da9da06677a7ced20e35161252b85e87633a128092
 AUX jnr-ffi_maven-build.xml 11211 SHA256 8a69395ee802785c1b55f4527cf594ca18c59e2ff35b94c43a40dde8eeb06919 SHA512 612b793b664b71e1a1b924aabe2da16c6b0b70947640b3d5b6d6994ffecfd7c0b30991b3a2bb711130052870dd63b9d41f43a54221e52017510119c5d3e4f359 WHIRLPOOL 81497fd103c5f445d5ac5a3548fce4f3b138f066dbd8bff0aba58f7f2c3f17af072a152ff9e22bccfc8a787871caff68d4bb960bd72db81699e891dcbd445be4
 DIST jnr-ffi-0.5.10.tar.gz 559174 SHA256 6d13ae0ca2a63bcee0fcdb81263d676925658b0b466769e893279b453b636c9a SHA512 dc1eff430ab87dcecb798466088cc81fd92d5c44dfe473673635c3dfd7ad7e3e416d2086377b5b93b134902e7e6c3a736ef235f17a358a5a7f541dbaea41b2e5 WHIRLPOOL cef64a4e2db33262c4864b03c95303394c937682ceb9f9fad821932099c1f6e4eb6de36ae655c564aebf69bd4a99a1753839e49396b1adf1c9399bd8a16ef53f
 DIST jnr-ffi-0.6.0.tar.gz 97712 SHA256 91f7a1c21020892332849b9edc5ab7ad98dd7fabe03756fe0a48189ab796a24a SHA512 ea5997de1201c4d326ecd4753ed2ac11ba288d029508891a38e8a8ee8929b3622865057f9276373585414f88b48389ef607fd00474998ca4ce372a2cfc1e9170 WHIRLPOOL b205ecbce04e65981dc890fc0494dac01f5d47090535a336efc980f8877b64ceaf930fd157dd0a5de97987da61a0bbdb4b9cdfce9547d000f4f7c299d7167d60
 DIST jnr-ffi-0.7.11.tar.gz 131566 SHA256 a7045b072762e0905161a7792f60ed66798f298d589ee87262bf1cd75af447b5 SHA512 ddfacafbb5c7764692ef40db082bccb7a635916db9c5ff90ba0720a141e4b61072baaf4b4f5b985ef74fc5e8cb59753b93f7ffddb6f89c8a8ebcd0067ee0178b WHIRLPOOL 41d3308df161db08708fd05b12d9b3c49aba884523c0f19d4eb4531edf4c54316f12255f72a2d45e5ed720a619b2df024c06c7bf96fd252184344af3f8887db0
 DIST jnr-ffi-0.7.7.tar.gz 130740 SHA256 d0f93346af0edd922e330975524f01f3dc5a2beb329fc5a62e32fd5153992807 SHA512 41a315fa6e03837e675a06d1f537a080430005c3a6ba63d03b3471998171a82b8205ba3d784a4d6b6ed4f94aeeac51121057580d51b14362216fac820eff2fa5 WHIRLPOOL 0ac7f995b396e95fdd80c470d2df328af7f97209feb09367ada66f49640a4fc413e111eb8e6748e9bd7341bc974e8b8dad2235be2de9b78621699b675d845225
 DIST jnr-ffi-0.7.9.tar.gz 131265 SHA256 8b9cefd983afc45cdf9dbe6a0f8915d636f26708c3e87de3e88156f0d87cef7d SHA512 fe6d2735fb538b11d9cc72e02f9cf37151db1750caad3ad8a758055d4693ca1e928d101e4f87b1037b99b982eaac7b878e56cc81c441f36e088ca24ca28de8ac WHIRLPOOL 0beca5fd67ff08c92e3a22e625e1ebc088dfdaa2250da0f6de808fec2dbc2fddfd98fa3bda73d7a9c436f7e905ce57901a6e8dcadfeee93b13fe071aa23ff501
+DIST jnr-ffi-1.0.6.tar.gz 168393 SHA256 b049161d4e327085d3c9074dd97c41000fb812b8c5ea6c70a75474db469b81a1 SHA512 7673f9d5a513713bff5992a69db848315f7961a3417c4a247bb26226535d25172b6de26bc4ecc58ae8889da2ba62de40a6e434fb3a4b21a820962e2bce2ba2fa WHIRLPOOL b39831407e3210ce5736842bce4a5ade2d1727abfcfd159ae2d376e78c8fe4f88b3757e7a97e06c56aa47845fded054506f27141ab057a9266d3b06dba0c08c1
 EBUILD jnr-ffi-0.5.10.ebuild 1746 SHA256 ea839d72e3dafcf20f290002e7e2c76f26c4e710278fbbaa9b562e3402a4974a SHA512 7d8cb9c1179a5291ad07f99fa6d490f3f7177db18898a30cbba9497e499d35ebc3878d9da922d2fdfc2cf54202eb7c4d14bb82710bae5e766b97ca6b58bbd33e WHIRLPOOL daf9e228af119b18ce3226aa122883684f16ffdbbbe7efda1ab100ff1213e7e33e46ca14751ad65292b4b0d619a682b8227dab978ad69d0697a4ee3438523403
 EBUILD jnr-ffi-0.6.0.ebuild 1574 SHA256 b1749c5d98efcfe5dfa41009c04eba7a9be189a4967f91642086a68ddc257104 SHA512 385095e9f0373b531fdd8a903ff4ac6ce507b47decc9e3cc53db85fe6a6cd6dada19fafe397944074e8abe87c9dc9520c894b1b3a0a3e7e0fcfacc50bb3c5d0d WHIRLPOOL fb842c514b1395229b7ed2e2723d609db6e64f7cbf73b1576506a6fe9e365522cd7c7e987a2c7a033a52b7b383355511f9284e09f6a45e16dda665d1980d8965
 EBUILD jnr-ffi-0.7.11.ebuild 1578 SHA256 7919eb990e6cfc7a7fb158618c9bf0fc80bb5a2051cc4fd2f0f8de688e313e49 SHA512 03d3002dbe5271a0629c756a0f8ead24ccf38a38b0343f5226272ede53e1a84e5ce2d91618580b403a8fac06f69d48d29f21e722b59829379c4ad6d5d965696c WHIRLPOOL b0530fb7a62a9b678d7fc48f22ea82c35ca234fbecf64e7346f893342ab81be983719d9c1605d26cd5768524110573c27ec1ca47f4c8056c58b3116069c60b08
 EBUILD jnr-ffi-0.7.7.ebuild 1580 SHA256 0fcc5c2ec8d688bb2f4748950e3a1bd4bb037d3bd5b903a5b1d054b36bab53e3 SHA512 5e97cc87d9dca8428bb94191aa6bbd7bb29570d2d98afbaa2f3318fe41e3493a1cc78bb4ace62a37f50c142ddedb966c8b82c0880b5af39ab4b2d91253a8d7b5 WHIRLPOOL bb83600aed3954ccb27e116f25597858946a7ed1f5e95e83f4d035ae6032fe34030f61889c45302558d6be3c3a7d7f5b7a528e8f25c41ea388aa39cfe2e32a10
 EBUILD jnr-ffi-0.7.9.ebuild 1580 SHA256 bf5cdfed3383fa9c008e0317be9a8f3278b314fa16e9d9ae786e9ecad29e42ed SHA512 f671f992842419dc8349ffb9a98ab443cd4cf93a87e5d69175a00be7d42faa7f6e79373d8f13ccd2ed52e4e1760b6de1dfd1fef03a9c9fa8a255c278a74db95a WHIRLPOOL 9406931780b528f935779df2823b357ea1e274f3e2cd9aea1c3ddc8352c304d7389f843fb76c2316dbea5dfcca09ac3a32cb08bb002df768423f0386bf6ce7c0
-MISC ChangeLog 1839 SHA256 cc432aa701e752323a6a9dc84fc97596881ef2a30972899c90412b43af5351a6 SHA512 58f9eacb8f5ebc88a49828bb739d1310ef21e30d3e58e2e711c1425f3a7ee0983a0fe2cbc51c5cf4d67057ff924b4b9b1b2f94944bb27002fb65cd60015a754b WHIRLPOOL cacef1aff8b77eda281231e3c32cf2bf6fbfbd92917b43b4851307307b7eab76ab4ad382d2cab27f6111c56f885f9768dcd0ade99d9749c516b1a11b9614ee89
+EBUILD jnr-ffi-1.0.6.ebuild 1617 SHA256 34035ffa32adc5da455323d84b87c4de7b93fd59f52f25f23a9f76a39ca2d8e4 SHA512 8447d4f5b48623633dce0de91dc3ea52ca86dc9f46949709bc26fe2be2d01536efce1c7b13e19f3aa9787c6c44785c3addceefa584042c2837faa2b6068df4a0 WHIRLPOOL 68237f3fc01c613758f9db1a5c2a66058a52b55221917852a34357b731dd06861a6290910ee215689458c550dbd6f6ef3210704e0aa23356bd1f6cd65275f76d
+MISC ChangeLog 2109 SHA256 41eb7f6d041966770dd2ae98e6aaa16f12a2ec646dd8273ba75dc2e1bd0d4475 SHA512 182ce4cb86fccc10ac83900c7c8b053006180960294d928b5f66e134ed3294eac3f6df46f55b71ccacbb0c7a74d2eba1d5d814f7cc2070cc06aab7209bad0828 WHIRLPOOL fd4d4b30d9d78e646a56a72cb0a2b6753f9f8cccca945412360f154c02de5702adb574262b9033795a41a6ac6d8ca8921c64e955458161a45fa8a24e34a42a08
 MISC metadata.xml 205 SHA256 e319f1701f6be29c8e077049d77738b69b72be0458754ef90ad9a684f2ec1722 SHA512 fb7831a8a05e9995888eaef748c98a12adcb911ef1c9901a3555765782d87cd3172cfb2c47ffa89d8a5454e7aa1f5bd27358b88a035c97f1ff388d7fc85a9d7e WHIRLPOOL 673d7b564054942d04b33cfcd01f7c5ff16ad9f9f2a60586ccc54c60443bf2dc34fa037e4e1de889539838342eea62022a3b9a7cae65b0c2f34fcbacfcfd0c73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSOGX4AAoJEJWyH81tNOV98/AH/142e80p12Cd5pQ9IoJWCcxF
-ZnIcmGYIFImej9WtQ1kQ5uyNIM/GfCjsbRoiePLIwGdDDU1R4YEvONm/oO/k5I8o
-NgE7Chxk8XcAPIS/HuU2eAD+gzSH16SddewXHZFhJuvtUQABxb5nPNazTldTX8sn
-BDWEnehOLhUTuXw9N9Q2Wo4k4D7vxmf3D1mRM8eKvXZwfFR+mZq/Qo5mokXIgmnZ
-K8n/WvrlncdJ+p10dL6rMYlw+Sz04BtxjMzXN3oe0pa0aK2IOFBmqJX8k7HPNo30
-8PXINWl5PTrvzuib/iKDN86zSux/gceXF4yGFH+6PIcWuD6lA8SSWhmO3e93O+c=
-=NqQz
+iQEcBAEBCAAGBQJSPY8hAAoJEJWyH81tNOV91s4H/RdRBgwUB1vX8U/C8jiOiovd
+JVxIMPtv3BKquOlFxQJ6gwjCyz9F8PEr11QcjjYFth8aTuA4fMHnzi6UtmUuCl+I
+aU9JNr5tfm0zRz6oU8JikxU6wh5515PbADmNV8vX3r1dHTAM2eKoI2aYK6ZM5+b/
+9TQIXtMByFz5RxXEVBUF1P+DUc135YMDgI+y207vYi2Neskiwm7k+WcDrSgBgB6o
+d6GNSRysuYc77VV3Zg1rBEG5zeZORQOPOskJqFc+tggolOMePelX1a5yiKj+4yOP
+GmoAz+e+MxOqZSj1iw7I4VNjT++uOkAQ0yWL9/qsd9iG+1m5l/tPOTt3yOymKUs=
+=j+kA
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jnr-ffi/files/jnr-ffi-1.0.6-junit48.patch b/dev-java/jnr-ffi/files/jnr-ffi-1.0.6-junit48.patch
new file mode 100644
index 000000000000..92b4cb2bcfc3
--- /dev/null
+++ b/dev-java/jnr-ffi/files/jnr-ffi-1.0.6-junit48.patch
@@ -0,0 +1,11 @@
+--- a/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
++++ b/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java
+@@ -35,7 +35,7 @@
+         Pointer ptr = referenceManager.add(bar);
+         Pointer ptr2 = referenceManager.add(bar2);
+         assertNotSame(ptr, ptr2);
+-        assertNotEquals(ptr, ptr2);
++        assertTrue(!ptr.equals(ptr2));
+         assertSame(bar, referenceManager.get(ptr));
+         assertSame(bar2, referenceManager.get(ptr2));
+     }
diff --git a/dev-java/jnr-ffi/jnr-ffi-1.0.6.ebuild b/dev-java/jnr-ffi/jnr-ffi-1.0.6.ebuild
new file mode 100644
index 000000000000..a728bcc5c7ac
--- /dev/null
+++ b/dev-java/jnr-ffi/jnr-ffi-1.0.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jnr-ffi/jnr-ffi-1.0.6.ebuild,v 1.1 2013/09/21 12:25:53 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 vcs-snapshot
+
+DESCRIPTION="An abstracted interface to invoking native functions from java"
+HOMEPAGE="https://github.com/jnr/jnr-ffi"
+SRC_URI="https://github.com/jnr/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 LGPL-3 )"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/jffi:1.2
+	dev-java/jnr-x86asm:1.0
+	dev-java/asm:4"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/ant-junit:0
+		>=dev-java/junit-4.8:4
+	)"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
+
+	epatch "${FILESDIR}"/${P}-junit48.patch
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc"
+JAVA_ANT_ENCODING="UTF-8"
+
+EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+src_test() {
+	# Fails, upstream pom has ignore test failures enabled.
+	rm -v src/test/java/jnr/ffi/StringArrayTest.java || die
+
+	# build native test library
+	emake BUILD_DIR=build -f libtest/GNUmakefile
+
+	_JAVA_OPTIONS="-Djnr.ffi.library.path=build" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}