Version bump, bug 486038, drop old

(Portage version: 2.2.6-r1/cvs/Linux x86_64, signed Manifest commit with key 0x35899067)

3 files changed, 19 insertions, 56 deletions

diff --git a/dev-java/commons-compress/ChangeLog b/dev-java/commons-compress/ChangeLog
index 0878cbedf92a..8c160c62f3ff 100644
--- a/dev-java/commons-compress/ChangeLog
+++ b/dev-java/commons-compress/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-compress
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/ChangeLog,v 1.8 2012/06/11 13:07:01 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/ChangeLog,v 1.9 2014/06/01 09:20:08 tommy Exp $
+
+*commons-compress-1.8.1 (01 Jun 2014)
+
+  01 Jun 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -commons-compress-1.1.ebuild, -commons-compress-1.3.ebuild,
+  +commons-compress-1.8.1.ebuild:
+  Version bump, bug 486038, drop old
 
   11 Jun 2012; Johannes Huber <johu@gentoo.org> commons-compress-1.4.1.ebuild:
   Stable for x86, wrt bug #417909
diff --git a/dev-java/commons-compress/commons-compress-1.1.ebuild b/dev-java/commons-compress/commons-compress-1.1.ebuild
deleted file mode 100644
index 78ede3fe9308..000000000000
--- a/dev-java/commons-compress/commons-compress-1.1.ebuild
+++ /dev/null
@@ -1,49 +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/commons-compress/commons-compress-1.1.ebuild,v 1.1 2011/07/31 14:21:09 tommy 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=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	test? (	dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
-EANT_BUILD_TARGET="compile package"
-
-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() {
-	java-pkg_jarfrom junit
-	EANT_TEST_TARGET="compile-tests test"
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-compress/commons-compress-1.3.ebuild b/dev-java/commons-compress/commons-compress-1.8.1.ebuild
index c26b12610939..90c7aeaf7ba9 100644
--- a/dev-java/commons-compress/commons-compress-1.3.ebuild
+++ b/dev-java/commons-compress/commons-compress-1.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.3.ebuild,v 1.4 2012/03/24 17:23:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-compress/commons-compress-1.8.1.ebuild,v 1.1 2014/06/01 09:20:08 tommy Exp $
 
 EAPI="4"
 
@@ -12,11 +12,15 @@ DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.5"
+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
 		dev-java/ant-junit:0 )"
@@ -24,8 +28,9 @@ DEPEND=">=virtual/jdk-1.5
 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"
+EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core xz-java"
 
 java_prepare() {
 	cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"