Version bump, bug #129773. Based on ebuild from java-overlay. Hey it's only almost 2 years since Junit-4 was released!

Package-Manager: portage-2.1.4_rc14

6 files changed, 117 insertions, 35 deletions

diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index da3f63b17384..a8874e01ece5 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,11 +1,3 @@
-AUX bsf-2.3.0-classpath.patch 667 RMD160 a1cc82b3166ddb81412549cd5963bde4d071548d SHA1 08b93525ccab82c4ab9cd3e7a628b86e0ab4b09f SHA256 c265a5d44d1630b049d9a0c32b51a71efcb5cb27d8671fdca350af4deb24d074
-MD5 bd886816ca8081772505b2550a366f92 files/bsf-2.3.0-classpath.patch 667
-RMD160 a1cc82b3166ddb81412549cd5963bde4d071548d files/bsf-2.3.0-classpath.patch 667
-SHA256 c265a5d44d1630b049d9a0c32b51a71efcb5cb27d8671fdca350af4deb24d074 files/bsf-2.3.0-classpath.patch 667
-AUX bsf-2.3.0-no-autodetection.patch 762 RMD160 074dfff0a02a512b83c7ae5733c2396ba4f7882f SHA1 9d04279428065c53b894e33dbd4430637eb2379a SHA256 4032e0397409aa0ad498999545aaef74c565775848bb4a62fe5566d4d5e54df6
-MD5 2835e321add71eb74f381035c1d61753 files/bsf-2.3.0-no-autodetection.patch 762
-RMD160 074dfff0a02a512b83c7ae5733c2396ba4f7882f files/bsf-2.3.0-no-autodetection.patch 762
-SHA256 4032e0397409aa0ad498999545aaef74c565775848bb4a62fe5566d4d5e54df6 files/bsf-2.3.0-no-autodetection.patch 762
 AUX bsf-2.4.0-build-properties.xml 1984 RMD160 d36e22db74057f1987e02134c59f496c4f3974ee SHA1 4692764eed3f6f3f72a1b6286274f99289e33390 SHA256 517b97081b13f4ac597a56c1d09d4a4961edca316429becf5fe3d440b3770c12
 MD5 51394bcb287c7601b89dc83b45e6166a files/bsf-2.4.0-build-properties.xml 1984
 RMD160 d36e22db74057f1987e02134c59f496c4f3974ee files/bsf-2.4.0-build-properties.xml 1984
@@ -15,10 +7,10 @@ EBUILD bsf-2.4.0-r1.ebuild 2421 RMD160 a102ed4682ccea5b94695b8dfaf5af0540b5a1c8
 MD5 0dcef6d483493b13a130e910c8044b68 bsf-2.4.0-r1.ebuild 2421
 RMD160 a102ed4682ccea5b94695b8dfaf5af0540b5a1c8 bsf-2.4.0-r1.ebuild 2421
 SHA256 2abe8919adb2079f5307628b8f84aba38f523be8825ca06e408637bb064f6341 bsf-2.4.0-r1.ebuild 2421
-MISC ChangeLog 6310 RMD160 558ffd4f373605e0172c7beef5ee41c06caa58a8 SHA1 c1bafe7960494481bfc1beb708ddf1a803ec9f6e SHA256 aa0de9e45ce3ecd865038cf967ca5b8b86bd34115bb7aabb00259769507dbb58
-MD5 a866f883ee01e77a2d439645ba7d4aa1 ChangeLog 6310
-RMD160 558ffd4f373605e0172c7beef5ee41c06caa58a8 ChangeLog 6310
-SHA256 aa0de9e45ce3ecd865038cf967ca5b8b86bd34115bb7aabb00259769507dbb58 ChangeLog 6310
+MISC ChangeLog 6465 RMD160 7bf05445ba4e3e42a2f2fbb5e30e1f30b02a0d67 SHA1 962193657329ceabae0cd784ee263a098d2d6120 SHA256 4e8a8af72513e386097a2e13c76af060ff4766e9aa7c70106bce0b45603e324e
+MD5 eb24c2687d1640ee6fd0a44b7b920cb1 ChangeLog 6465
+RMD160 7bf05445ba4e3e42a2f2fbb5e30e1f30b02a0d67 ChangeLog 6465
+SHA256 4e8a8af72513e386097a2e13c76af060ff4766e9aa7c70106bce0b45603e324e ChangeLog 6465
 MISC metadata.xml 829 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e SHA1 b4c3798c8d0e0ce8dd99884e47f15a7a09be2aba SHA256 12ff3afd1cc82efa3392c06b9bc411bd50318d1b2180b9765d723a51a7922e10
 MD5 2a5c0decd09ba5a48289b129458bf44c metadata.xml 829
 RMD160 46341bec09dfae6c9d870c92fc1520353a8ed58e metadata.xml 829
diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 83749a9ccf73..674b20cf710f 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/junit
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.34 2007/11/15 13:16:23 betelgeuse Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.35 2008/01/11 09:48:56 caster Exp $
+
+*junit-4.4 (11 Jan 2008)
+
+  11 Jan 2008; Vlastimil Babka <caster@gentoo.org> junit-3.8.1-r3.ebuild,
+  +junit-4.4-r1.ebuild:
+  Version bump, bug #129773. Based on ebuild from java-overlay. Hey it's only
+  almost 2 years since Junit-4 was released!
 
   15 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> -junit-3.8.2.ebuild:
   Delete old ebuild.
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 635d6627a971..500f14b53ec2 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,24 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX junit-3.8.2-build.xml 3179 RMD160 218ac28d9c167b719f6ace32479dd559b3ed010e SHA1 e4f2e9076f93c2700e096f05a426402cb7730ad3 SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042
 MD5 00f9e3548251e4bf938ff9d059955bdc files/junit-3.8.2-build.xml 3179
 RMD160 218ac28d9c167b719f6ace32479dd559b3ed010e files/junit-3.8.2-build.xml 3179
 SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042 files/junit-3.8.2-build.xml 3179
 DIST junit3.8.1.zip 441665 RMD160 d9f63f651dd0954ffca8975a8bcf2e53c6b14574 SHA1 049bcda1172e4190925d0d343fcc32158d4f1089 SHA256 884953028bc3d2d554f99b5f627a84d7f92a42754560c63829b0ab732ff9bab8
 DIST junit3.8.2.zip 461426 RMD160 c66d64d8aa738460490e62fd332c112076d9b662 SHA1 701578302e244e5173dca3040cce0774a5c39645 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a
-EBUILD junit-3.8.1-r3.ebuild 1032 RMD160 610f5fe99a1b94296d4442ad4d5d4abace2738f3 SHA1 0f53305260f302e65a438b419515010003839bf6 SHA256 eb49f321b398afff7371a3b309e4617e15e1078bda3b4541d01915b53c6a9a99
-MD5 d77b5937242a3a2bfd68b66919e48ee7 junit-3.8.1-r3.ebuild 1032
-RMD160 610f5fe99a1b94296d4442ad4d5d4abace2738f3 junit-3.8.1-r3.ebuild 1032
-SHA256 eb49f321b398afff7371a3b309e4617e15e1078bda3b4541d01915b53c6a9a99 junit-3.8.1-r3.ebuild 1032
+DIST junit4.4.zip 813114 RMD160 915d20222030f5678a2d74cf07080a305c0c1407 SHA1 83be34288bf8e595a6eb5a1de9c6cd96042d8c32 SHA256 9bbe7c16b122acd9d918d86ddab8b77836ffb03f9ceb2f0379be653fdc738b6d
+EBUILD junit-3.8.1-r3.ebuild 1033 RMD160 985f4040b645214ec0425ace012872880a333b85 SHA1 b9a07ba172b78330685b59662fcc0401380fbae0 SHA256 20af0880778366fd31ae7e6a405adb6db40daa364ff7fb8dc08b962f2419498b
+MD5 3ee2e20e41311c449cc113654ea33afa junit-3.8.1-r3.ebuild 1033
+RMD160 985f4040b645214ec0425ace012872880a333b85 junit-3.8.1-r3.ebuild 1033
+SHA256 20af0880778366fd31ae7e6a405adb6db40daa364ff7fb8dc08b962f2419498b junit-3.8.1-r3.ebuild 1033
 EBUILD junit-3.8.2-r1.ebuild 1084 RMD160 55cae1877626fa8e013a34cfa5039b82a240d3e8 SHA1 27a948a102e268ab59bda484bd347d3ee6723c2e SHA256 542745cdc7c8e1e1f728b77186883780777bf9c8b1663f5c8f1e9f79e5f17e50
 MD5 a7daf283d3a1cacf61bf5b85233da19d junit-3.8.2-r1.ebuild 1084
 RMD160 55cae1877626fa8e013a34cfa5039b82a240d3e8 junit-3.8.2-r1.ebuild 1084
 SHA256 542745cdc7c8e1e1f728b77186883780777bf9c8b1663f5c8f1e9f79e5f17e50 junit-3.8.2-r1.ebuild 1084
-MISC ChangeLog 5013 RMD160 7b8a638d5ee2b838a1ca3a033b3d672f12885c08 SHA1 6cbb05e395cdcd855b35f2d96cd7a9e175658cef SHA256 4958dace44934761564482ce233040435bb80694b06c110f421ec69f0ea86a63
-MD5 81b486f26d31134e53dbc2ea942caa22 ChangeLog 5013
-RMD160 7b8a638d5ee2b838a1ca3a033b3d672f12885c08 ChangeLog 5013
-SHA256 4958dace44934761564482ce233040435bb80694b06c110f421ec69f0ea86a63 ChangeLog 5013
+EBUILD junit-4.4-r1.ebuild 2126 RMD160 4dbffdf3e96366c88b478b4587339b4511f006e5 SHA1 dd88862559c3b8bed7955ede354e8e39fc82e750 SHA256 abd297680708fbc19cf7edbc354e5a7f88d492a6d7cd8af0f444bb9ccf5eb9a2
+MD5 cc7c1ac3267ee1ec69ef612b51edd337 junit-4.4-r1.ebuild 2126
+RMD160 4dbffdf3e96366c88b478b4587339b4511f006e5 junit-4.4-r1.ebuild 2126
+SHA256 abd297680708fbc19cf7edbc354e5a7f88d492a6d7cd8af0f444bb9ccf5eb9a2 junit-4.4-r1.ebuild 2126
+MISC ChangeLog 5257 RMD160 9f5fd64fd7530a45cd76206af31b6438922df175 SHA1 898f3a3bd10657ad7354e289ebb442e73d73e0e8 SHA256 d68959af89e32b3132b33f9ef10a2b4b9253f1cbad33b8bfddb7b61a5bd54779
+MD5 d11af7e97a9966e6d70cf952130428bc ChangeLog 5257
+RMD160 9f5fd64fd7530a45cd76206af31b6438922df175 ChangeLog 5257
+SHA256 d68959af89e32b3132b33f9ef10a2b4b9253f1cbad33b8bfddb7b61a5bd54779 ChangeLog 5257
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -29,10 +31,6 @@ SHA256 b703de60a9ac48aebed2afce4c0dca09a09ec663068e9a630adea6fe59f3f375 files/di
 MD5 20bad8c34272b0d3eca7d68c76f38982 files/digest-junit-3.8.2-r1 223
 RMD160 5b40a50f6c18d4440f831722aaf9d4f1ed8f80ce files/digest-junit-3.8.2-r1 223
 SHA256 51dc8c731634d957e6ba33a2b68e03b483baefdcc9a5605f86662ef829a5df46 files/digest-junit-3.8.2-r1 223
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHPEaccxLzpIGCsLQRAjN2AKCa3P1X1mZc4LcQvo/Exlh9wnZq9QCgmeVO
-lxSvUfdRAy+Gdk9afX2fImM=
-=rAC5
------END PGP SIGNATURE-----
+MD5 c3d2f3f850d458f3fecfb77cff51a71b files/digest-junit-4.4-r1 217
+RMD160 4b2201a063b6ed6261024a74e7f21ae8d731be4a files/digest-junit-4.4-r1 217
+SHA256 5a8202080a6d95038c2cd376675b31007d6966765513b19f8ac6677e058deddd files/digest-junit-4.4-r1 217
diff --git a/dev-java/junit/files/digest-junit-4.4-r1 b/dev-java/junit/files/digest-junit-4.4-r1
new file mode 100644
index 000000000000..10aab49c1624
--- /dev/null
+++ b/dev-java/junit/files/digest-junit-4.4-r1
@@ -0,0 +1,3 @@
+MD5 4755aa0af58a834bedce1f0119dc9514 junit4.4.zip 813114
+RMD160 915d20222030f5678a2d74cf07080a305c0c1407 junit4.4.zip 813114
+SHA256 9bbe7c16b122acd9d918d86ddab8b77836ffb03f9ceb2f0379be653fdc738b6d junit4.4.zip 813114
diff --git a/dev-java/junit/junit-3.8.1-r3.ebuild b/dev-java/junit/junit-3.8.1-r3.ebuild
index a3b26be5313c..9e9823a6c845 100644
--- a/dev-java/junit/junit-3.8.1-r3.ebuild
+++ b/dev-java/junit/junit-3.8.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r3.ebuild,v 1.8 2006/11/24 21:45:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r3.ebuild,v 1.9 2008/01/11 09:48:56 caster Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jre-1.3"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	unzip src.jar || die
 	rm -f junit.jar
 }
diff --git a/dev-java/junit/junit-4.4-r1.ebuild b/dev-java/junit/junit-4.4-r1.ebuild
new file mode 100644
index 000000000000..7ab93c970b05
--- /dev/null
+++ b/dev-java/junit/junit-4.4-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.4-r1.ebuild,v 1.1 2008/01/11 09:48:56 caster 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
+
+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"
+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 src || die
+	unzip -qq -d src ${P}-src.jar || die "unzip failed"
+
+	rm -rf javadoc temp.hamcrest.source *.jar || die
+	find . -name "*.class" -delete || die
+}
+
+src_compile() {
+	mkdir -p classes || die
+	ejavac -d classes -cp $(java-pkg_getjars hamcrest-core) \
+		$(find src -name "*.java")
+	jar -cf ${PN}.jar -C classes . || die "jar failed"
+
+	# generate javadoc
+	if use doc ; then
+		mkdir javadoc || die
+		javadoc -d javadoc -sourcepath src -subpackages junit:org \
+			-classpath $(java-pkg_getjars hamcrest-core) || die "javadoc failed"
+	fi
+}
+
+src_test() {
+	ejavac -sourcepath org:junit -classpath $(java-pkg_getjars hamcrest-core):${PN}.jar \
+		-d classes $(find org junit -name "*.java")
+	cd classes
+	for FILE in $(find . -name "AllTests\.class"); do
+		if [[ ${FILE} != "./org/junit/runners/AllTests.class" ]] ; then
+			local CLASS=$(echo ${FILE} | sed -e "s/\.class//" | sed -e "s%/%.%g" | sed -e "s/\.\.//")
+			java -classpath .:$(java-pkg_getjars hamcrest-core) \
+				org.junit.runner.JUnitCore ${CLASS} || die "Test ${CLASS} failed"
+		fi
+	done
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dodoc README.html doc/ReleaseNotes${PV}.txt || die
+
+	if use doc; then
+		dohtml -r doc/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	if use examples; then
+		java-pkg_doexamples org
+	fi
+
+	use source && java-pkg_dosrc src/org src/junit
+}