Remove generation 1 ebuild and add app-arch/unzip to DEPEND for 3.0.

(Portage version: 2.1.2.7)

4 files changed, 9 insertions, 51 deletions

diff --git a/dev-java/backport-util-concurrent/ChangeLog b/dev-java/backport-util-concurrent/ChangeLog
index 5e16480f4c87..a732a7485187 100644
--- a/dev-java/backport-util-concurrent/ChangeLog
+++ b/dev-java/backport-util-concurrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/backport-util-concurrent
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.14 2007/06/02 15:11:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.15 2007/06/02 15:13:42 betelgeuse Exp $
+
+  02 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -backport-util-concurrent-1.1.01.ebuild,
+  backport-util-concurrent-3.0.ebuild:
+  Remove generation 1 ebuild and add app-arch/unzip to DEPEND for 3.0.
 
   02 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
   backport-util-concurrent-1.1.01-r1.ebuild:
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01.ebuild
deleted file mode 100644
index b03fa56e2911..000000000000
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01.ebuild,v 1.6 2006/01/21 14:02:52 hansmi Exp $
-
-inherit java-pkg
-
-MY_PV="1.1_01"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="This package is the backport of java.util.concurrent API, introduced in Java 5.0, to Java 1.4"
-HOMEPAGE="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/"
-SRC_URI="http://www.mathcs.emory.edu/dcl/util/${PN}/dist/${MY_P}/${MY_P}-src.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="jikes doc"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	dev-java/junit
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_P}-src"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/external
-	rm -f *.jar
-	java-pkg_jar-from junit
-}
-
-src_compile() {
-	local antflags="javacompile archive"
-	use jikes && antflags="-Dbuild.compiler=jikes ${antflags}"
-	use doc && antflags="${antflags} javadoc"
-
-	ant ${antflags} || die "Compilation failed"
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dohtml -r doc/api
-	java-pkg_dohtml README.html
-}
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.0.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.0.ebuild
index 2c95b229d6c2..0c19d67af2c0 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.0.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/backport-util-concurrent-3.0.ebuild,v 1.2 2007/05/24 13:33:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/backport-util-concurrent-3.0.ebuild,v 1.3 2007/06/02 15:13:42 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc java5 source test"
 inherit java-pkg-2 java-ant-2
@@ -17,7 +17,8 @@ IUSE=""
 
 DEPEND="java5? ( =virtual/jdk-1.5* )
 	!java5? ( =virtual/jdk-1.4* )
-	test? ( =dev-java/junit-3* )"
+	test? ( =dev-java/junit-3* )
+	app-arch/unzip"
 RDEPEND="java5? ( >=virtual/jdk-1.5 )
 	!java5? ( >=virtual/jre-1.4 )"
 
diff --git a/dev-java/backport-util-concurrent/files/digest-backport-util-concurrent-1.1.01 b/dev-java/backport-util-concurrent/files/digest-backport-util-concurrent-1.1.01
deleted file mode 100644
index 730a08090c30..000000000000
--- a/dev-java/backport-util-concurrent/files/digest-backport-util-concurrent-1.1.01
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51753562c60c011a40cb1c41fd273160 backport-util-concurrent-1.1_01-src.tar.bz2 316261
-RMD160 c5b8ce4a0b19f1cc1f865086af1b94fd6a27f620 backport-util-concurrent-1.1_01-src.tar.bz2 316261
-SHA256 86127b578d06fe232ae1a6b31102fb98d1998f30dd96dbd2cf95fc6d8132c34e backport-util-concurrent-1.1_01-src.tar.bz2 316261