Version bump to 4.11, needed for newer version of reverse dependency ant-junit.

Package-Manager: portage-2.1.12.4/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 141 insertions, 5 deletions

diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index f5f081a59db5..65c6b10b76d4 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/junit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.76 2013/06/14 19:51:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.77 2013/06/15 23:20:39 tomwij Exp $
+
+*junit-4.11 (15 Jun 2013)
+
+  15 Jun 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/junit-4.11-do-not-unpack-hamcrest-sources.patch, +junit-4.11.ebuild:
+  Version bump to 4.11, needed for newer version of reverse dependency ant-
+  junit.
 
   14 Jun 2013; Alexis Ballier <aballier@gentoo.org> junit-4.10.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index aa736d553b16..b0e0572f0418 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -3,20 +3,27 @@ Hash: SHA256
 
 AUX gentoo-manifest.mf 54 SHA256 0e474881c459301cd882146728b6a912ae24009baa9f87331d548ab84d446269 SHA512 6e1be608ba73dd56b44c8604684886a654742f09c4b9c3661a9a06d84a1a8a0d4eb835c89580879b5b6d3edc2c51164e195732000527ee4cf9c9725fd9b9e460 WHIRLPOOL 6ef8c2a998d42df2fab735bbdb52fd18461d00fac51bee0f672291893e8214a4a322e6ab7f714a39810f459af77e55b3df7332b1cb1643f89543f4b7bd6a9376
 AUX junit-3.8.2-build.xml 3179 SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042 SHA512 6d2c74c70569feed235db70fdb646c813ce9453b5e7fae6d5fe8c818d0ce820fc155eef8426d8f3263cff45cd4b78542d5524aa1d5efbb84e43698c1d4466f55 WHIRLPOOL f73a9854484abdbbe5a5a04a425627acdb76eb0202bb4b9e1d2c44ba6e20e9a8d022dad15b4e49d75c7584beefd7fc026936b79ddebe6e105ce15cceae157e6c
+AUX junit-4.11-do-not-unpack-hamcrest-sources.patch 613 SHA256 f9469e2a31c13a6781ee495f452c1a29c6a604a6fbe96afac2a2757672f5ae31 SHA512 c2cc1918b5b85c13153ef9ade7086193c287d5b7b7acb0cc1d514a255282850d908583a3bf194417330cee5952b5d53dc789d269123be93b4b01baf8683897f8 WHIRLPOOL af63cc9887754e5d86dd24f8cdac0ccc06400585af94c1bce7d988831d0766a7fc6e6c0e1d35ca27502ac0c386ef7d7caf7984a957ba5c9203d70deeaac56453
 DIST junit3.8.2.zip 461426 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 WHIRLPOOL 284a51a8b659b8dbce378a381475ae2bcedb78231cfe5435382053335ebe5d44b4eec90b9f14bc510fd5b9060b44672896fe0bfad57743e5aca0128f006781d8
 DIST junit4.10.zip 1781594 SHA256 49d1e176f518730c0d34a361932d9bd79d1bebd555126d95337ad7ad6fc9c6b6 SHA512 07cb518b684a254325d8972132f44dda8f8b52b627232b480bd90766a0f14afc6d8751e44b4162305cf9ab3cedd2858fcd7d388ab01b4f67b706dddb696a8cf6 WHIRLPOOL 72e3f6a3615d1e7f98ac24e7e7f4f634c93cdfdadcaafc0d59d7a1c8b218f019f821d2683c932f3716f1d69b9f0cf5c0fd664be6c35a0f297976b8a745ef612b
+DIST junit4.11.zip 2043600 SHA256 0bbf3818026984fd0c9c4f3cb1a9083d2be545147e13ba1cb101ee14161a3487 SHA512 947ba504aa009afc0773189e6ec89e34d5ff844430b0656cabc7b9f3fe5651c08b5b3c25b848454ee7f0a85e7573155d2c0c86e0ca5502c6e1bb573c970ade62 WHIRLPOOL bf21e351dd47099d3e7c280fe62192aa175c1f251ae4157971cfb69602af2724e6dfcb0592bb6fc8227548abe713c9f1056a22ee49446f48bb00e19ef0fa537b
 DIST junit4.6.zip 1259346 SHA256 fa0acd11fab2b1b0cd57dd0bc7fdb4e7084d2e1a3ade7bc2c54a0f397f989b26 SHA512 e3f65183b3c37f0088e9448e3fd4740f87866a6044ec3aefcfcc0da8aa66d770c8b9e0d4c36b1c0278604097642deb0f598da48443e2ea5917095d66609fbdfd WHIRLPOOL 6513e05fe1a59e8725a197dd93bdb5abed8111ff1cdc02594717b3e834bcf62e2a942204067ded34a780413aa5659a282fb45ad019079f1284b38d5fb5179417
 DIST junit4.8.2.zip 1594318 SHA256 c677cc9a08683848299f0e67fe313415de5cbaae5bfd7dee11f7d53bd8ae5107 SHA512 6c1564026b4243d9af4e24e27cf4f14343b74fa3d599b00d5c517b30fdfe4d329228da12c751a308d317b85e105641804478be0899c2b3c52d6c67185b33970b WHIRLPOOL b399c88a0483dc05bd8cdf1e602ce030f84c82566078c0415ebd7fd559a9abeb089f350c50f703f1fe8bc74a4459835c7588720b17b93c823ffb49f1c379df2e
 EBUILD junit-3.8.2-r1.ebuild 1155 SHA256 fa176e3c9164ca47a1d377bd85b1c63e92563074834f40962f6967d3cf9e2d2b SHA512 3c08c8827fae089fe45eb2598b4be49266d320e81adc3e217cfae540d520ffc0270ff2db0f3cfc8eb04c1571f4a35ddf0c6d55a0027618be214c2c1ac1b8c3f0 WHIRLPOOL da64bb2fac5ab78e9625cd46371e20f57b15b10d8f5da2a668b5380e3d7bf679ba53e5ee91f945a1fb87affe22bcb41365d7333cc31fc726017fdf4c4defd932
 EBUILD junit-4.10.ebuild 2633 SHA256 bce81ec91ebe3a3d848f72d279846ebcd257309a16a290115e60cde2583418ac SHA512 d9b92b04f3121d948cbfc362cd24f299aac6de5b12b636342f9369936a957da01367fe96728a81f5cccfdbeef4ff4f7bd28e35e1fbfee29a47c4b418f118a5b6 WHIRLPOOL ee1f9d880365e3559a24cbb2eae614aea2957865fa8353d5ff100c5d74d48e513dee11b06c9b300e46a40f4c70bb4269e12cd4959a91c90e888cd8ea5b2fc3e0
+EBUILD junit-4.11.ebuild 2915 SHA256 4541d261f5fc94a4d5c0bef2ac838263ba80490f80826080b175e4c20d52e7a8 SHA512 1ad5d393200dcfc10869aaeab2daa8464ef9987ffe27eca2063b73fe8bf129a139f793092016a7c7a1204b20cedc7f59b3e9f4ec5e977ef7b4367c6167ba0a74 WHIRLPOOL 38d2e71735d7c3112489daa5a8a0a08acf58afc1cfbaa72270079f17309229f78a2ace71c5f4909a842e90187601480a58bd10b6a3d804b65183ce02ec54a743
 EBUILD junit-4.6.ebuild 2168 SHA256 a21fdc5902080baf1d6425c2b1f65ce4100f7699655dab5e31ea9f2f3dd2bfdc SHA512 1c32b911d21c054bb2ec2220f19d438d80fa48ef1b38f56c4418d9e87f025ee581011c34394a540c6e7ebdcee54ce5742a7ba5bca761410145c70546c77d9b21 WHIRLPOOL a2815eb0a5406786d263168a170fc2f91be5f8264190122316bc85888dbac8030a0b216b611b584c3fd257eef53f8e6c1cf3e7d737966cd81456d539f34d767c
 EBUILD junit-4.8.2-r1.ebuild 2613 SHA256 a08d7ab44faf2c24ae6e25afc84117dadc93c5259e6a333c7ba2f7a5318d534b SHA512 df64089f1809f767faa88dab452c2044d6cf52f320565bbb4b8d6b047befe75d77a35403f684bde676c504cedaca1059a03083863b10f28d753082e091603bd4 WHIRLPOOL b9c11945ea18bed7f5a26dd82eba2d22aa705a1de31f041fc8912f043a7e1ed4b7d302dcdcb3bdd6c432231ac300c2e35fa48b80512cc29919cbbe3ba72b8dbc
-MISC ChangeLog 10065 SHA256 8b2b7ed2e9e6c6841eb941b765dee4771eaabbde9f4504706d8b0a477bc82410 SHA512 937b085580f2d53938ec3e28f161da03d5c094e29e86da1227b03d5be9d42e5255de5e9bc6776c09c392ee451b276e31bb1386576aaec4265183418ba1c7eab1 WHIRLPOOL 8b7fe34a6fb063e14803ef86aeb00f5129e69e91a8f9263d64a708a486e7053d6bb6e3d46831da594c910f97bd72c4936d2af75eb4b55c3e7eb4f65b02bf4c26
+MISC ChangeLog 10301 SHA256 f552fc927900e29b9fa4cb0ba68b7fdf7a38ab3244defb4b58218e624dd64bb9 SHA512 231a73535ef20f9246641a30931e461e6c2316bdc72ae89627a1e85d17fafb17a26c4e79830ae726f08b54f2a9ea4640b928c22fffae0545a54d8521a1c08da7 WHIRLPOOL 00e244b45fad1a2ee6de1706ff3b63e2726ea3a2bfa0c5a035eead80cb41b53ebe0894c2c9bd3e8b0695d223e18b13c9a4d53ad19ce68e909330f0aa19b4e173
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG7dFYACgkQvFcC4BYPU0oiWQCgtHInhlMpKTcMZKMJmhdqrdOg
-0MsAoKBLoAtcKwu4yVb19uSSCHUeoZ2f
-=qn5U
+iQEcBAEBCAAGBQJRvPY5AAoJEJWyH81tNOV9URYIAMWo6sE8PSPnu6bfA7XO+MJJ
+NNcK9+NYT2hc4D+kQysH4+1DFBZmAF0IXr5+r7LcjSA09YnNbWmM223LDrwzHf6X
+AMlDT1qifhoZUN/9spra+NaTfCL40kHyM6/Wo5Ydlu32/h9gcVhA94xKacopH96d
+RCT9QcgKQpyCD1euM+so2TnM7ILjfPq6LcH8BiZ8zHQXgBR8AlqmGKPJv8nk2Vnu
+5wpM/8lIiqEKL+qGSEiGaUn4gRqtKF5obCZvYWUSXsiahdMJH5vyBO3Jcx8z/W7i
+5ifTiibQeGo39VRDlcNWWxTEQuYfyENoVPTMCR91Bv4lW5EZgslIjaS99oa3BfE=
+=oVc1
 -----END PGP SIGNATURE-----
diff --git a/dev-java/junit/files/junit-4.11-do-not-unpack-hamcrest-sources.patch b/dev-java/junit/files/junit-4.11-do-not-unpack-hamcrest-sources.patch
new file mode 100644
index 000000000000..d2d6f855323c
--- /dev/null
+++ b/dev-java/junit/files/junit-4.11-do-not-unpack-hamcrest-sources.patch
@@ -0,0 +1,19 @@
+--- a/build.xml	2012-11-14 20:23:00.000000000 +0100
++++ b/build.xml	2013-06-15 23:12:30.981988033 +0200
+@@ -138,7 +138,7 @@
+     </exec>
+   </target>
+   
+-  <target name="javadoc" depends="unjar.hamcrest">
++  <target name="javadoc">
+     <javadoc destdir="${javadocdir}"
+              author="false"
+              version="false"
+@@ -151,7 +151,6 @@
+       <excludepackage name="org.junit.experimental.theories.internal.*" />
+       
+       <sourcepath location="${src}" />
+-      <sourcepath location="${hamcrestsrc}" />
+       <link href="http://java.sun.com/javase/6/docs/api/" />
+     </javadoc>
+   </target>
diff --git a/dev-java/junit/junit-4.11.ebuild b/dev-java/junit/junit-4.11.ebuild
new file mode 100644
index 000000000000..e11f8733f32f
--- /dev/null
+++ b/dev-java/junit/junit-4.11.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.11.ebuild,v 1.1 2013/06/15 23:20:39 tomwij Exp $
+
+# WARNING: JUNIT.JAR IS _NOT_ SYMLINKED TO ANT-CORE LIB FOLDER AS JUNIT3 IS
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="mirror://github/${PN}-team/${PN}/${PN}${PV}.zip"
+HOMEPAGE="http://www.junit.org/"
+
+LICENSE="CPL-1.0"
+SLOT="4"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux \
+	~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris \
+	~x86-solaris"
+
+CDEPEND="dev-java/hamcrest-core:1.3"
+
+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 samples-and-tests"
+
+src_unpack() {
+	default
+
+	# Unpack the 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 the Gentoo manifest to the working directory.
+	cp "${FILESDIR}/gentoo-manifest.mf" "${S}" || die
+}
+
+java_prepare() {
+	epatch "${FILESDIR}"/${P}-do-not-unpack-hamcrest-sources.patch
+
+	mkdir lib || die
+	java-pkg_jar-from --into lib hamcrest-core{-1.3,.jar,-1.3.jar}
+
+	# 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-1.3)"
+
+	# 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-1.3):"${S}"/target/main
+
+	ejavac -classpath ${cp} \
+		-d classes $(find org/junit/internal -name "*.java")
+	ejavac -classpath ${cp}:"${S}/classes" \
+		-d classes $(find junit/tests org/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}-SNAPSHOT/${PN}-dep-${PV}-SNAPSHOT.jar
+	dodoc README.html doc/ReleaseNotes${PV}.txt
+
+	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}-SNAPSHOT/javadoc
+	fi
+}