Version bump. Fixes bug #269084

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 94 insertions, 3 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/Manifest b/dev-java/junit/Manifest
index 6537df717886..1eacb9af09e7 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX junit-3.8.2-build.xml 3179 RMD160 218ac28d9c167b719f6ace32479dd559b3ed010e SHA1 e4f2e9076f93c2700e096f05a426402cb7730ad3 SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042
 DIST junit3.8.1.zip 441665 RMD160 d9f63f651dd0954ffca8975a8bcf2e53c6b14574 SHA1 049bcda1172e4190925d0d343fcc32158d4f1089 SHA256 884953028bc3d2d554f99b5f627a84d7f92a42754560c63829b0ab732ff9bab8
 DIST junit3.8.2.zip 461426 RMD160 c66d64d8aa738460490e62fd332c112076d9b662 SHA1 701578302e244e5173dca3040cce0774a5c39645 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a
 DIST junit4.4.zip 813114 RMD160 915d20222030f5678a2d74cf07080a305c0c1407 SHA1 83be34288bf8e595a6eb5a1de9c6cd96042d8c32 SHA256 9bbe7c16b122acd9d918d86ddab8b77836ffb03f9ceb2f0379be653fdc738b6d
 DIST junit4.5.zip 1179602 RMD160 3c5900d6f7d854be2648ee705f95e090dc44f6b0 SHA1 75d642adaf15091c7ca9ed54f0f2f058bd9ec653 SHA256 673d5aa30b5a750346fd95f42d7d665519428e2555fd5344f730009e9cae7ace
+DIST junit4.6.zip 1259346 RMD160 4f87024e91b7252af89ad925db5cda0e17128525 SHA1 98c8c625e999f0c7463397a684a5c47a0ea106e3 SHA256 fa0acd11fab2b1b0cd57dd0bc7fdb4e7084d2e1a3ade7bc2c54a0f397f989b26
 EBUILD junit-3.8.1-r3.ebuild 1033 RMD160 985f4040b645214ec0425ace012872880a333b85 SHA1 b9a07ba172b78330685b59662fcc0401380fbae0 SHA256 20af0880778366fd31ae7e6a405adb6db40daa364ff7fb8dc08b962f2419498b
 EBUILD junit-3.8.2-r1.ebuild 1008 RMD160 a4bfa28999a40c5d97f2b76052e799867694661b SHA1 ee030ffc47561441e19371df944423dda7146c70 SHA256 b8138b1a926763317c84091bf629dc30d5a0f81e13cd0b2c4f508b5600dfbb94
 EBUILD junit-4.4-r1.ebuild 2151 RMD160 db4fbcbac8abb2484d4302c84e2161783810f146 SHA1 cd6b32ec7b4b539997278a4f5507dd05a63fbca7 SHA256 2460a0c382ded854d17d1addae8997b84e3a5da7b52bb78ced92805df2ce2c39
 EBUILD junit-4.5.ebuild 2047 RMD160 446b016912e8f1aaa6642a284d2a0aa7c2d36387 SHA1 219fab5a599377b53f42b8c005d73fbeba8fbf90 SHA256 c560b4636936590c2050a641bf28d332ffbd68767ed2ec78414b7102b3c3d98a
-MISC ChangeLog 6712 RMD160 01101b280c3ee4664d189d66560b1a4c306cf1f0 SHA1 f3d0fb8f11d602695e93c80bbd08ec20c84255a0 SHA256 34b0f61c89fdc2e53bc9f994649a798f801d96596b11a54d40bcb2c5bbcdcb6b
+EBUILD junit-4.6.ebuild 2051 RMD160 d2eb536bdfaf7294d21910fc4520ce53fe89fce6 SHA1 43947628b5b1add53d901f0811b5dc7fc2567991 SHA256 c0dae2c512e7632dabc36b41ebb4a0e5f1fc0f495fd7e33d0eb661c97dfaea5c
+MISC ChangeLog 6839 RMD160 639c6568a7e5f284e466ac5a5dddbef545d79f1c SHA1 5b50fb8d1856a2ebd7bb2d6f6fed8c47c5bc8503 SHA256 4385d904f9503945170b26c645e1a1df0411ab2c32506d6adb24b57911cfee30
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoX2o4ACgkQRh6X64ivZaI3ogCff8CYycnKntVLxAFIdxSXyMOk
+oPgAn3A1AewA//UWvhAyqp1ilXjQNEU4
+=j/Tg
+-----END PGP SIGNATURE-----
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
+}