3 files changed, 84 insertions, 1 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/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/*
+}