2 files changed, 81 insertions, 2 deletions
diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 2692da54d26b..f0ede98e150e 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/junit
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.49 2009/01/07 15:00:59 ranger Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.50 2009/05/23 11:14:17 serkan Exp $
+
+*junit-4.6 (23 May 2009)
+
+  23 May 2009; Serkan Kaba <serkan@gentoo.org> +junit-4.6.ebuild:
+  Version bump. Fixes bug #269084
 
   07 Jan 2009; Brent Baude <ranger@gentoo.org> junit-4.5.ebuild:
   Marking junit-4.5 ppc64 for bug 252819
diff --git a/dev-java/junit/junit-4.6.ebuild b/dev-java/junit/junit-4.6.ebuild
new file mode 100644
index 000000000000..dfa95c125edf
--- /dev/null
+++ b/dev-java/junit/junit-4.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.6.ebuild,v 1.1 2009/05/23 11:14:17 serkan Exp $
+
+# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P=${P/-/}
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://www.junit.org/"
+LICENSE="CPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/hamcrest-core"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	app-arch/unzip
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	mkdir -p src/main/java src/test/java || die
+	unzip -qq -d src/main/java ${P}-src.jar || die "unzip failed"
+
+	# fix javadoc compilation
+	if use doc ; then
+		cp "${S}"/javadoc/stylesheet.css "${S}" || die
+	fi
+
+	rm -rf javadoc temp.hamcrest.source *.jar || die
+	find . -name "*.class" -delete || die
+}
+
+src_compile() {
+	eant build jars -Dhamcrestlib=$(java-pkg_getjars hamcrest-core) $(use_doc javadoc)
+}
+
+src_test() {
+	mkdir classes || die
+	cd junit/tests || die
+	local cp=$(java-pkg_getjars hamcrest-core):${S}/${PN}${PV}/${PN}-dep-${PV}.jar
+	ejavac -sourcepath java -classpath ${cp} -d "${S}"/classes $(find -name "*.java")
+
+	cd "${S}"/classes || die
+	for FILE in $(find . -name "AllTests\.class"); do
+		local CLASS=$(echo ${FILE} | sed -e "s/\.class//" | sed -e "s%/%.%g" | sed -e "s/\.\.//")
+		java -classpath .:${cp} org.junit.runner.JUnitCore ${CLASS} || die "Test ${CLASS} failed"
+	done
+}
+
+src_install() {
+	java-pkg_newjar ${PN}${PV}/${PN}-dep-${PV}.jar
+	dodoc README.html doc/ReleaseNotes${PV}.txt || die
+
+	use examples && java-pkg_doexamples org/junit/samples
+	use source && java-pkg_dosrc src/main/java/org src/main/java/junit
+
+	if use doc; then
+		dohtml -r doc/*
+		java-pkg_dojavadoc ${PN}${PV}/javadoc
+	fi
+}