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

Package-Manager: portage-2.1.2.7

5 files changed, 20 insertions, 69 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/Manifest b/dev-java/backport-util-concurrent/Manifest
index 565be512a0b7..99c143d5f459 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -16,25 +16,18 @@ EBUILD backport-util-concurrent-1.1.01-r1.ebuild 1270 RMD160 8341df948fa152a60de
 MD5 9914ed5284236c643d829dfab375c698 backport-util-concurrent-1.1.01-r1.ebuild 1270
 RMD160 8341df948fa152a60de1d03390753ae3ceadcee0 backport-util-concurrent-1.1.01-r1.ebuild 1270
 SHA256 d8445bc5429390a1945a6d2870071867d9be50f328cad70db4c4d8e8c0a1a298 backport-util-concurrent-1.1.01-r1.ebuild 1270
-EBUILD backport-util-concurrent-1.1.01.ebuild 1206 RMD160 a1a0e8f8882746a3b2b4f36128e04093abb6d589 SHA1 f55fcdf9e6d7dc71fe5eb36b19aefd908635dde0 SHA256 6d1d88cfbc780a97e7820cc678edfe7f73bb47a9b21c29103d3a9600817224fa
-MD5 9a9847758603e69db1a681503f1923a0 backport-util-concurrent-1.1.01.ebuild 1206
-RMD160 a1a0e8f8882746a3b2b4f36128e04093abb6d589 backport-util-concurrent-1.1.01.ebuild 1206
-SHA256 6d1d88cfbc780a97e7820cc678edfe7f73bb47a9b21c29103d3a9600817224fa backport-util-concurrent-1.1.01.ebuild 1206
-EBUILD backport-util-concurrent-3.0.ebuild 1729 RMD160 855e8f69a44beaeedb70dc248b5ade1628f3e17d SHA1 c4a07e69739c0b57f26457dd2a6d7f2d50eedf47 SHA256 4dfe804ba5784d35050b388fbf4cca5169ae90a273381a3534b285883c1c55a4
-MD5 18d7053148b5de4d62f0ce9133b17e24 backport-util-concurrent-3.0.ebuild 1729
-RMD160 855e8f69a44beaeedb70dc248b5ade1628f3e17d backport-util-concurrent-3.0.ebuild 1729
-SHA256 4dfe804ba5784d35050b388fbf4cca5169ae90a273381a3534b285883c1c55a4 backport-util-concurrent-3.0.ebuild 1729
-MISC ChangeLog 2469 RMD160 62d9d30bc3ec48a88b38ae5a8e7a0700916d7e53 SHA1 9a1126940eecca08807dcabfad466ef7645cca34 SHA256 60ee496373171ef2ff5ca7031004ed10478c5b07a6f3422428fec782ab42efbd
-MD5 cf266964714d7caf817e719bf89fc467 ChangeLog 2469
-RMD160 62d9d30bc3ec48a88b38ae5a8e7a0700916d7e53 ChangeLog 2469
-SHA256 60ee496373171ef2ff5ca7031004ed10478c5b07a6f3422428fec782ab42efbd ChangeLog 2469
+EBUILD backport-util-concurrent-3.0.ebuild 1746 RMD160 77bf04bd6640a2560447cbe0aa8d4a1cf8a58825 SHA1 8d11c5b3f5e7051c39798e1c377253ac2343020d SHA256 930c41814a6f86a98a9b4539f5aaf395c595340fce583a7db13bd0e6ab2f15d3
+MD5 0604bfbb9614ad442da05cca51f89164 backport-util-concurrent-3.0.ebuild 1746
+RMD160 77bf04bd6640a2560447cbe0aa8d4a1cf8a58825 backport-util-concurrent-3.0.ebuild 1746
+SHA256 930c41814a6f86a98a9b4539f5aaf395c595340fce583a7db13bd0e6ab2f15d3 backport-util-concurrent-3.0.ebuild 1746
+MISC ChangeLog 2676 RMD160 2f8a66d533e6a86b1d826b8e0fbeeb53690cad1d SHA1 d1a77dad6569da8213409c7c383f211914e4ba78 SHA256 2fb37bd3442d8b73d719651a486a5e0380034418162658a9af8aa1178b2c9aea
+MD5 a72bd246f28cca18a984979cb6178514 ChangeLog 2676
+RMD160 2f8a66d533e6a86b1d826b8e0fbeeb53690cad1d ChangeLog 2676
+SHA256 2fb37bd3442d8b73d719651a486a5e0380034418162658a9af8aa1178b2c9aea ChangeLog 2676
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
-MD5 8cf7ad640bb5fca6200ef55ff2ed58ee files/digest-backport-util-concurrent-1.1.01 310
-RMD160 93100408cedc72d923a20a423a4ffc4b4cc269f5 files/digest-backport-util-concurrent-1.1.01 310
-SHA256 25e9eb9c62ab6c4724c0b0671b003b59bf8c3c3338fa645ec48cdfd92aa8c56b files/digest-backport-util-concurrent-1.1.01 310
 MD5 8cf7ad640bb5fca6200ef55ff2ed58ee files/digest-backport-util-concurrent-1.1.01-r1 310
 RMD160 93100408cedc72d923a20a423a4ffc4b4cc269f5 files/digest-backport-util-concurrent-1.1.01-r1 310
 SHA256 25e9eb9c62ab6c4724c0b0671b003b59bf8c3c3338fa645ec48cdfd92aa8c56b files/digest-backport-util-concurrent-1.1.01-r1 310
@@ -44,7 +37,7 @@ SHA256 cdf4c72dce18386ca0ead3bfe0c4debc2b618d0c40ee08884d4c7f66359018fb files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGYYjFcxLzpIGCsLQRAnSlAJwJzYXCyOz9OltSpJfkSuMl7Y+pZwCbBikj
-xPheS6X4pSlWQHx9OJbRVUY=
-=f4KX
+iD8DBQFGYYkpcxLzpIGCsLQRAselAKCO26QE7kMEYo2HXPiz1L7LVdnFwQCeO3NY
+rOuqvgSc+yY3aEzFlgdhcG8=
+=zMl2
 -----END PGP SIGNATURE-----
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