dev-java/junit: applied patch from bug #287757

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

5 files changed, 99 insertions, 76 deletions

diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index fa21cb5ee54d..0dc59abcd4cd 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,13 @@
 # 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.59 2011/01/18 13:37:33 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.60 2011/01/18 14:06:58 fordfrog Exp $
+
+*junit-4.8.2-r1 (18 Jan 2011)
+
+  18 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> -junit-4.8.2.ebuild,
+  +junit-4.8.2-r1.ebuild, +files/gentoo-manifest.mf:
+  Applied patch from bug #287757 (thanks to Daniel Solano Gómez
+  <gentoo@sattvik.com>) and did some adjustments of the ebuild
 
 *junit-4.8.2 (18 Jan 2011)
 
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 33bbb55d3ba4..9189d63bd87d 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,9 +1,10 @@
+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.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.6.ebuild 2178 RMD160 ca5b8bd6f4b3b02f0848c07cc11e0c6b9844097f SHA1 2beb3ebc5c51c1d2e41a9a4f2cb400c5086f6693 SHA256 9fb4218f2a227348b9ad27547896d9f4025b245cf06a8d52e8d2baf3b0eea1df
-EBUILD junit-4.8.2.ebuild 2194 RMD160 70806a6cf41d8e4b7a8bd1ce9f05ce8531923a53 SHA1 30f30d51701ca778540c8f73efd0bfe25a50f7d4 SHA256 e4f7b81177d6adbf10cb7e653a123adcd1cbaee7963abb9080abe7c2012870d2
-MISC ChangeLog 7900 RMD160 d5bc66f33b7375d4c759d3f20afb85e6dea97774 SHA1 e3a9fd668a315d953d9835614f6479c2486cee8c SHA256 87b82217f6d8bdf41fe9140daa05fe8ee0c56ccefe90b7bb3f6b3196eed5fd37
+EBUILD junit-4.8.2-r1.ebuild 2599 RMD160 a035b2f03150d7d6a82da67568044ac5f6f8829f SHA1 9481b9b745580e2888ee3351fe10b560bbb48443 SHA256 8e9dd63c23f8d33883258920c78ad9ea0b0491a82bdc660f0b0834c7ecd4131f
+MISC ChangeLog 8186 RMD160 881e14d8b2c3e0739511c44c9b9b783901f44c57 SHA1 4dc336c1b8cfa86c0f451e54d29cfe10677436e2 SHA256 2afeebcf6af7d14dd6b2be0edd6d1edd594465e3e6b8557b8013e72f67f876d7
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/junit/files/gentoo-manifest.mf b/dev-java/junit/files/gentoo-manifest.mf
new file mode 100644
index 000000000000..f78474422035
--- /dev/null
+++ b/dev-java/junit/files/gentoo-manifest.mf
@@ -0,0 +1 @@
+Class-Path: ../../hamcrest-core/lib/hamcrest-core.jar
diff --git a/dev-java/junit/junit-4.8.2-r1.ebuild b/dev-java/junit/junit-4.8.2-r1.ebuild
new file mode 100644
index 000000000000..913869d4772d
--- /dev/null
+++ b/dev-java/junit/junit-4.8.2-r1.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.8.2-r1.ebuild,v 1.1 2011/01/18 14:06:58 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 ~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 \
+		|| "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
+}
diff --git a/dev-java/junit/junit-4.8.2.ebuild b/dev-java/junit/junit-4.8.2.ebuild
deleted file mode 100644
index cd57a311160e..000000000000
--- a/dev-java/junit/junit-4.8.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.8.2.ebuild,v 1.1 2011/01/18 13:37:34 fordfrog 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
-
-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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="=dev-java/hamcrest-core-1.1*"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
-	userland_GNU? ( >=sys-apps/findutils-4.3 )
-	app-arch/unzip
-	${CDEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-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
-}