Fixed test dependency to hamcrest-core (bug #528776)

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

3 files changed, 72 insertions, 5 deletions

diff --git a/dev-java/commons-compress/ChangeLog b/dev-java/commons-compress/ChangeLog
index 434731f42a58..53ff454eab7e 100644
--- a/dev-java/commons-compress/ChangeLog
+++ b/dev-java/commons-compress/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-compress
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/ChangeLog,v 1.10 2014/08/10 20:10:06 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/ChangeLog,v 1.11 2014/11/20 08:22:57 ercpe Exp $
+
+*commons-compress-1.8.1-r1 (20 Nov 2014)
+
+  20 Nov 2014; Johann Schmitz <ercpe@gentoo.org>
+  +commons-compress-1.8.1-r1.ebuild:
+  Fixed test dependency to hamcrest-core (bug #528776)
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org>
   commons-compress-1.4.1.ebuild, commons-compress-1.8.1.ebuild:
diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
index dcac80c41bb8..3f8d63a1ecf7 100644
--- a/dev-java/commons-compress/Manifest
+++ b/dev-java/commons-compress/Manifest
@@ -6,13 +6,18 @@ AUX build.xml 11340 SHA256 d22d5efb3d31b41e9283cfbf4f8cca12f97051dc7f681be03100a
 DIST commons-compress-1.4.1-src.tar.gz 3228776 SHA256 b4f34aa03df917b785479e147381eea86c5c17e9067ddf8c27301ff6cd0aa91c SHA512 e1d327f084a79924938698ae16fa6edaaa73072b083109bbd8ccaa636268c05c387e7c2117b5df8f6b91b143495add9cc7da17c1bd3c989f91c910a9d68f6bdb WHIRLPOOL 50565e7342fa363814ed2f347d1daa1ee59dd28cefcd9e494850edcf47899b8684312996dd60b90236a4f2aacce8a920ace37cca5d1d22ad9f63f6696c8e7452
 DIST commons-compress-1.8.1-src.tar.gz 8476056 SHA256 aa1221643331d9de5c8155b032c7fde23fc8cf3d962155092de89c44d4978412 SHA512 4e4f9633cc3c470970a8da41344a819ff63430a46e219e93896dbe2374738349f78942cff93ad8d348599cfc2dd7d014ae4ff3b09d76a924bb11ca1c4a2c05ea WHIRLPOOL 2d7f3230f47186a72b4b31efd10c5dfd68488d263e26d97b6e715b2b2eab3e22ae3e5946d232ca014aa2a3d14f3abf87ce97bf2e70c7c06788c4093df4156aef
 EBUILD commons-compress-1.4.1.ebuild 1463 SHA256 b36aa74454c592df831779a6b819febe49db167fbc08b1779b25fe1cd97725d6 SHA512 93757a2a4f19030c809f00571ff303112c888add1f4996a2c63c5effdc9306ec0eb83c9597bdc700035ead612d52193996644c93c2b325552f77368f52ba23b8 WHIRLPOOL 5c0144920febb9825b5f75a1966b10853002f22034fa182fb00a2ac545363d755690fac5f541a1608129a3f338ff2eb4d46f2c7dc73a6f12f54ad2d407224c4a
+EBUILD commons-compress-1.8.1-r1.ebuild 1475 SHA256 c92a06a318416420e0ad001e668513c6dc142673768c7d79d9d2cae814c542c2 SHA512 7b09d3067af3795c612cc040a9c7a37ad65c1ed35001f759c5ae4ec6bb0fa4c38aa981d6bb12379cec13478eec8698f9e8304cac3ddd55e08c35c51e154770d5 WHIRLPOOL a23d83bec4287df21e6596fe1751a590d03953de4b8739a6f2f8e67a39b5d357c24a526658f8fc84f996d0f6e296e9c24ba6557db85686ac43b8bd8bde4d84f0
 EBUILD commons-compress-1.8.1.ebuild 1465 SHA256 fa10bd522f16cecd6f9c597b606f051a3554e5cf0be38ab4b2b5f2b768f1a2fd SHA512 7adc9b8d00b1cebf5446f36dc0d86382c399d09938109659032cb98f42eed7131ed3a047be68e9e0f802b63939ff684bb7fd10d9219cceaa9af50f25f5eccc5a WHIRLPOOL 99092397d200995b50cd70ea824f9139f08b0672fc1c01e7872c678dba16523c041d384783e039dd51f79007e945575bc57b0add74ca73cf92389b358fd86c7f
-MISC ChangeLog 1917 SHA256 2203c4c0fde8eaba9e842ae31275cbfcfce210b9dd3b354d8d42e273c4c09736 SHA512 b68cd39cde24aee2cd8706c1be9190e984c221c9a5e5818a2e06bf579c68353697bc56b72deab117bde8b8836c70a4e82ea8a11d9a6f2770da7e9cd2f5377dce WHIRLPOOL cbbfd256d605cb030b56c8bcec684657bd628352c33134be93f6f0eb7470d9fba433c7bee96b95eed4c57ec030c9049756b4420719155229b2d5777310ecbf71
+MISC ChangeLog 2100 SHA256 a6ae5893162651c1569e9ad58c01553784942a4d4edffc4177e7e92656db3f70 SHA512 90ac071049cead967637c220ab0da182ebb08f1b0c5b95662035e748c803eb5af9636220e16162f7e2ce2cd364627ac6108a9387f5475514cdfd2d3f038f7bac WHIRLPOOL 893c00a2659960bccd35416672726c2b958a43b5c01cf9c51c9d7ec203b309cce4f0806defa44b2d19cbb41fc4861895dad8ddc88dd2523a2a793dc7cd5912c5
 MISC metadata.xml 243 SHA256 76e8c4cafe92af4eb083e9682c375a2f887458dac6ce8f2982976a96abcf8219 SHA512 92bf36a1bad3877a5a981271afa7381a38f3cc87267233205af5aa0ad53c455d851bb1d9ff60fe02eda49a3347c497c5bfeaa4c160542abd62d81a0450c4b77f WHIRLPOOL 18fde625e32450606e852e52f034c73d6514284aa19842867313432d1ab1cc1d40ceae766c0c61b927a7b5c3917a6624c8e875583f49c0d5951797cf66e8ff95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0Z8ACgkQcaHudmEf86qgPQCbBbYL6IXUKjJIm1Ju/DUVWLS3
-KEIAoIUlPAgitCjkfIMRqYsUpa8YWdMw
-=95AI
+iQEcBAEBCAAGBQJUbaTnAAoJEKCEBkJ3xQHtyN4H/Rl8XJWGDm7Z+JTf3f3NY03X
+0XnXMspCzc/1mA6O1d1QmjdD9Zwe5D77z6Bfz/+dvzPpFrqBzhbz6/WJzLn3p8By
+HSepEl0kRUb9vTThorvGbSuMrzq/v3Jfap0T8ssrM0cJ/0HlG+uXDFar+tCSZQyI
+2uI6M1qe2y6NdWilE/+Otvso3GI/4LhDHKH1geawm6Ph/1p44ZC6w/+8r3HuYfob
+JvS7Fg+3BS2BDl08WdCHEKA08gAc3Z08BYhpMKiYl2eomtNdvig3VPLhF8WwBV3H
+BmRo8qAPYGkIzFIKldbfZzTw3elnvGBUgZNFlTFaXd9TvsWYhvU7djgQAon7PB8=
+=WOHM
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-compress/commons-compress-1.8.1-r1.ebuild b/dev-java/commons-compress/commons-compress-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..1ab7e300452a
--- /dev/null
+++ b/dev-java/commons-compress/commons-compress-1.8.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/commons-compress-1.8.1-r1.ebuild,v 1.1 2014/11/20 08:22:57 ercpe Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-java/xz-java"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}
+	test? (	dev-java/junit:4
+		dev-java/hamcrest-core:1.3
+		dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
+EANT_GENTOO_CLASSPATH="xz-java"
+EANT_BUILD_TARGET="compile package"
+EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core-1.3 xz-java"
+
+java_prepare() {
+	cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
+
+	# osgi stuff mvn ant:ant doesn't handle
+	mkdir -p target/osgi || die "Failed to create target dir"
+	cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest"
+
+	if ! use test; then
+		find -name "*.jar" -delete || die "Failed to remove test resources"
+	fi
+}
+
+src_test() {
+	EANT_TEST_TARGET="compile-tests test"
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}-1.1.jar
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}