dev-java/junit: version bump

Package-Manager: portage-2.1.10.43/cvs/Linux x86_64

3 files changed, 96 insertions, 12 deletions

diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 6032deeaa0ea..0e44a8185461 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/junit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.62 2011/05/03 18:27:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.63 2011/12/25 21:42:29 fordfrog Exp $
+
+*junit-4.10 (25 Dec 2011)
+
+  25 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> +junit-4.10.ebuild:
+  Version bump
 
   03 May 2011; Fabian Groffen <grobian@gentoo.org> junit-4.8.2-r1.ebuild:
   Marked ~x64-freebsd
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 32927f6062e3..dc9e819cc10b 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gentoo-manifest.mf 54 RMD160 a3ce1b1b950b8805f249455445895d4461680755 SHA1 5edb1a61dd70ca61959f8cf8a86db979c02453b2 SHA256 0e474881c459301cd882146728b6a912ae24009baa9f87331d548ab84d446269
 AUX junit-3.8.2-build.xml 3179 RMD160 218ac28d9c167b719f6ace32479dd559b3ed010e SHA1 e4f2e9076f93c2700e096f05a426402cb7730ad3 SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042
 DIST junit3.8.2.zip 461426 RMD160 c66d64d8aa738460490e62fd332c112076d9b662 SHA1 701578302e244e5173dca3040cce0774a5c39645 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a
+DIST junit4.10.zip 1781594 RMD160 ec69fd1e1fa8c1fc88c0aa9c105f1bdc0b7a4720 SHA1 2d9663bdfe3079673ff66f1154b42a31b40d8235 SHA256 49d1e176f518730c0d34a361932d9bd79d1bebd555126d95337ad7ad6fc9c6b6
 DIST junit4.6.zip 1259346 RMD160 4f87024e91b7252af89ad925db5cda0e17128525 SHA1 98c8c625e999f0c7463397a684a5c47a0ea106e3 SHA256 fa0acd11fab2b1b0cd57dd0bc7fdb4e7084d2e1a3ade7bc2c54a0f397f989b26
 DIST junit4.8.2.zip 1594318 RMD160 fe476a8027471bcc2cc7ccc93001947222aced83 SHA1 15209b0933816c8e940a8375459be6e61e5f1662 SHA256 c677cc9a08683848299f0e67fe313415de5cbaae5bfd7dee11f7d53bd8ae5107
 EBUILD junit-3.8.2-r1.ebuild 1135 RMD160 7c76b6c516016e709ffd50cb282f4828aab8ee7e SHA1 336961975849a18b91456a448308367cdbe393f9 SHA256 19c67667425cca781a5d15974572866edf31811fd1db5e6dcb8d23aa2f0d12bc
+EBUILD junit-4.10.ebuild 2612 RMD160 40f23befcc6df618023f5446bc435ffe6a33a724 SHA1 e43afec8812ddf1f7b1a3fe5d563f8fba289e629 SHA256 6f7929388bceaca72e140cc98398c02bbb0b3c5316b05e869cf439d38ac6871b
 EBUILD junit-4.6.ebuild 2178 RMD160 ca5b8bd6f4b3b02f0848c07cc11e0c6b9844097f SHA1 2beb3ebc5c51c1d2e41a9a4f2cb400c5086f6693 SHA256 9fb4218f2a227348b9ad27547896d9f4025b245cf06a8d52e8d2baf3b0eea1df
 EBUILD junit-4.8.2-r1.ebuild 2615 RMD160 20f9b378c4e41e517e38edf052d90fd178145244 SHA1 e06dc8cd4635104e6de5168f230047ebb2f457c9 SHA256 1f619f76964fe24ae5c4fefe47ae7d0e05f7181132d543c943f0bf780b95bc93
-MISC ChangeLog 8398 RMD160 f841caeae2e987addb1b5ab9b5cb94add429e595 SHA1 2ffff80330984217d94459fc791702615c36047a SHA256 c26de0cadaec027f5a6c10099a8b422285b3046a68c50fd72b07aabf13264000
+MISC ChangeLog 8514 RMD160 5525458a3191b8d4f366aceae27d793eb81bad11 SHA1 59e4de23b362383b30ae8e01a7d4784f19c0a12e SHA256 0da63eb10ea9daaf2b204b390745184c8d732e8d884cb37f41e4907f501d432e
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (Darwin)
-
-iEYEARECAAYFAk3ASSMACgkQX3X2B8XHTok0XgCfW78jXUtxs629JM6iaIJwHoM3
-9RkAnREhq2SJhbqiRIaRTs8sadSYETr+
-=HSfB
------END PGP SIGNATURE-----
diff --git a/dev-java/junit/junit-4.10.ebuild b/dev-java/junit/junit-4.10.ebuild
new file mode 100644
index 000000000000..113a95c78bc0
--- /dev/null
+++ b/dev-java/junit/junit-4.10.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.10.ebuild,v 1.1 2011/12/25 21:42:29 fordfrog Exp $
+
+# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
+
+EAPI="3"
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="https://github.com/downloads/KentBeck/${PN}/${PN}${PV}.zip"
+HOMEPAGE="http://www.junit.org/"
+LICENSE="CPL-1.0"
+SLOT="4"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/hamcrest-core:0"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	userland_GNU? ( >=sys-apps/findutils-4.3 )
+	${CDEPEND}"
+
+S="${WORKDIR}/${PN}${PV}"
+
+EANT_BUILD_TARGET="jars"
+
+src_unpack() {
+	default
+
+	# Unpack source JAR
+	mkdir -p "${S}/src/main/java" "${S}/src/test/java" \
+		|| die "Unable to create source directories"
+	pushd "${S}/src/main/java" >/dev/null
+	jar xf "${S}/${P}-src.jar" || die "Unable to unpack sources."
+	popd >/dev/null
+
+	# copy Gentoo manifest to working directory
+	cp "${FILESDIR}/gentoo-manifest.mf" "${S}"
+}
+
+java_prepare() {
+	# fix javadoc compilation
+	if use doc ; then
+		cp "${S}"/javadoc/stylesheet.css "${S}" \
+			|| die "Unable to copy Javdoc stylesheet"
+	fi
+
+	# remove binary and other generated files
+	rm -rf javadoc temp.hamcrest.source *.jar \
+		|| die "Unable to clean generated files."
+	find . -name "*.class" -delete \
+		|| die "Unable to remove distributed class files"
+
+	# Let Ant know where its hamcrest went
+	EANT_EXTRA_ARGS="-Dhamcrestlib=$(java-pkg_getjars hamcrest-core)"
+
+	# Add Gentoo manifest information to generated JAR files
+	java-ant_xml-rewrite -f build.xml -c \
+		-e jar -a manifest -v "gentoo-manifest.mf"
+}
+
+src_test() {
+	mkdir classes || die "Unable to create build directory for tests"
+
+	local cp=$(java-pkg_getjars hamcrest-core):${S}/${PN}${PV}/${PN}-dep-${PV}.jar
+	ejavac -classpath ${cp} -d classes $(find junit/tests -name "*.java")
+
+	java -classpath ${cp}:classes org.junit.runner.JUnitCore junit.tests.AllTests \
+		|| die "Tests failed."
+}
+
+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
+}