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

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

2 files changed, 63 insertions, 1 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/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/*
+}