--- jackson/jackson-2.3.1.ebuild	2014-01-12 18:19:01.000000000 +0000
+++ jackson/jackson-2.5.0.ebuild	2015-02-01 14:11:44.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 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/jackson/jackson-2.3.1.ebuild,v 1.1 2014/01/12 18:19:01 ercpe Exp $
 
@@ -6,7 +6,7 @@
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="High-performance JSON processor"
 HOMEPAGE="http://jackson.codehaus.org"
@@ -19,35 +19,33 @@
 
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5
-	test? (
-		dev-java/ant-junit4
-		dev-java/junit:4
-	)
-"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
+	test? ( dev-java/junit:4 )"
 
-S="${WORKDIR}/${PN}-core-${PN}-core-${PV}"
+S="${WORKDIR}/${PN}-core-${PN}-core-${PV}/src"
+JAVA_SRC_DIR="main/java"
 
 java_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-
 	sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
 		-e "s:@projectversion@:${PV}:g" \
 		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
 		-e 's:@projectartifactid@:jackson-core:g' \
-		"${S}/src/main/java/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
-		> "${S}/src/main/java/com/fasterxml/jackson/core/json/PackageVersion.java" || die
+		"${S}/main/java/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
+		> "${S}/main/java/com/fasterxml/jackson/core/json/PackageVersion.java" || die
 }
 
 src_install() {
-	java-pkg_dojar target/${PN}-core.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs/
-	use source && java-pkg_dosrc src/main/java/*
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/*
 }
 
 src_test() {
-	EANT_TASKS="ant-junit4"
-	java-pkg-2_src_test
-}
\ No newline at end of file
+	cd test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
+	local TESTS=$(find * -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
--- jackson-annotations/jackson-annotations-2.3.0.ebuild	2014-01-12 18:26:21.000000000 +0000
+++ jackson-annotations/jackson-annotations-2.5.0.ebuild	2015-02-01 14:12:11.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 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/jackson-annotations/jackson-annotations-2.3.0.ebuild,v 1.1 2014/01/12 18:26:21 ercpe Exp $
 
@@ -6,7 +6,7 @@
 
 JAVA_PKG_IUSE="doc source"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="High-performance JSON processor"
 HOMEPAGE="http://jackson.codehaus.org"
@@ -20,15 +20,10 @@
 RDEPEND=">=virtual/jre-1.5"
 DEPEND=">=virtual/jdk-1.5"
 
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-}
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
 
 src_install() {
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs/
-	use source && java-pkg_dosrc src/main/java/*
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/*
 }
--- jackson-databind/jackson-databind-2.3.1.ebuild	2014-01-12 18:53:43.000000000 +0000
+++ jackson-databind/jackson-databind-2.5.0.ebuild	2015-02-01 14:25:53.000000000 +0000
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 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/jackson-databind/jackson-databind-2.3.1.ebuild,v 1.1 2014/01/12 18:53:43 ercpe Exp $
 
 EAPI="5"
 
-JAVA_PKG_IUSE="source"
+JAVA_PKG_IUSE="doc source test"
 
-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="High-performance JSON processor"
 HOMEPAGE="http://jackson.codehaus.org"
@@ -16,32 +16,53 @@
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="test" # 27/1306 failures :(
 
-CDEPEND="dev-java/jackson:${SLOT}
-	dev-java/jackson-annotations:${SLOT}"
+CDEPEND="~dev-java/jackson-${PV}:${SLOT}
+	~dev-java/jackson-annotations-${PV}:${SLOT}"
 RDEPEND=">=virtual/jre-1.5
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,cglib-2.2,groovy"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
+	${CDEPEND}
+	test? (
+		dev-java/cglib:2.2
+		dev-java/groovy:0
+		dev-java/junit:4
+	)"
+
+JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT}"
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
 
 java_prepare() {
-	cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-
 	sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
 		-e "s:@projectversion@:${PV}:g" \
 		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
 		-e 's:@projectartifactid@:jackson-databind:g' \
-		"${S}/src/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
-		> "${S}/src/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
+		"${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
+		> "${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
+
+	# Use real cglib, not repackaged version.
+	sed -i 's/org\.hibernate\.repackage/net.sf/g' \
+		"${S}/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java" || die
+
+	# Requires newer JScience. Could be any class but they chose this!
+	rm "${S}/test/java/com/fasterxml/jackson/databind/deser/TestNoClassDefFoundDeserializer.java" || die
 }
 
 src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use source && java-pkg_dosrc src/main/java/*
+	java-pkg-simple_src_install
+	dodoc ../README.md ../release-notes/*
+}
+
+src_test() {
+	cd test/java || die
+
+	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies cglib-2.2,groovy,junit-4,${JAVA_GENTOO_CLASSPATH})"
+	local TESTS=$(find * -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
 }