summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/backport-util-concurrent/ChangeLog6
-rw-r--r--dev-java/backport-util-concurrent/Manifest4
-rw-r--r--dev-java/backport-util-concurrent/backport-util-concurrent-3.0-r1.ebuild13
3 files changed, 11 insertions, 12 deletions
diff --git a/dev-java/backport-util-concurrent/ChangeLog b/dev-java/backport-util-concurrent/ChangeLog
index cf10fafe9611..c5b2cd138d56 100644
--- a/dev-java/backport-util-concurrent/ChangeLog
+++ b/dev-java/backport-util-concurrent/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/backport-util-concurrent
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.23 2009/11/17 14:55:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.24 2009/11/17 15:16:51 caster Exp $
+
+ 17 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+ backport-util-concurrent-3.0-r1.ebuild:
+ Cleanup unpack.
17 Nov 2009; Vlastimil Babka <caster@gentoo.org>
backport-util-concurrent-3.0.ebuild:
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index 27118d5f80f8..10c5d71746e2 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -2,7 +2,7 @@ AUX backport-util-concurrent-3.0-notest.patch 491 RMD160 1267f72b754cfe122c64f64
AUX backport-util-concurrent-3.0-test.patch 380 RMD160 f7bc3be94e79fac268b7ca393203877fadbb1c71 SHA1 b4bcf2991804787fa547d52b1f506e3e3480195a SHA256 dbd133bc068689d8b7dff508a48716e48fbb381f4089c07848003577c53933f6
DIST backport-util-concurrent-3.0-src.zip 949726 RMD160 65a47f01f2de0e4fea2680245323f45c1e7f564f SHA1 aa1ad60e9038c4356516eb66574ad2edeb0f9b02 SHA256 fb5d81c929717baab117ab727a4561302277334e34fd68bafa280004c51b0cc2
DIST backport-util-concurrent-Java50-3.0-src.zip 958747 RMD160 2b7acfedbee157e26d972ea2dcd8ee9e8112fec2 SHA1 495b4e6eaf3253e13e39a2a9aac5aed422e4e186 SHA256 d10858454fc9921632003a69e5a87e5bf08d8cc47edbba747dc29d19968da1a0
-EBUILD backport-util-concurrent-3.0-r1.ebuild 1498 RMD160 6c28091355a1774bc6868f4e559cd78b8f37fe91 SHA1 d8f48b2a1720c410b8731f55342c25ff6079139e SHA256 8cf3e4e420dbfe07bf1fec889d7fb1d60d62305ce35ba51e56610ae0d0315120
+EBUILD backport-util-concurrent-3.0-r1.ebuild 1314 RMD160 d793efa3abb81e7ac9494c6673b5447963f9769c SHA1 7438b0090a4ffe78ef4fd8dad7e36c48be65661a SHA256 73d4ea7a371bcc50f4bd1572861c2726bcc4934d9e24fc59ddad75c240a3a2d3
EBUILD backport-util-concurrent-3.0.ebuild 1682 RMD160 3d9a81312bda82561438bdfdfd6bec2f6b90d49d SHA1 ede61cbf7c5f0fea1f0dd65381cb3eaecd8e2e03 SHA256 812d9ae100bfc03adbb9b4753159df214102ae439cc2b004a17dda6dcaf8b53e
-MISC ChangeLog 4025 RMD160 63373b25ca911ab702bd11ccccc427c71dab93ca SHA1 951f19b43f7ea636103f2ab737d1e04af03a8f08 SHA256 ab8855e955144c4dcbc593174edc818c1a88bed998f67526ae3e2f04e1b1927c
+MISC ChangeLog 4137 RMD160 add65c6428b71a35cdbbda1354d1a9708ee9641c SHA1 0b62cae0fbb8462ba4ad76d1b6d7c4164edc9366 SHA256 c2abed52c3432888ab2fcdd75dcfebff13a3513c5270590de22dbde11bcadf9f
MISC metadata.xml 327 RMD160 6cb78e59be1161bb0838d270ad70b89f1701d067 SHA1 91f86e04405e680145c06ee44ea712f374e85c0f SHA256 5211f0eb4ff59809e2878506ad92010fc57863cf802f27da6d00fcaf718cd8bf
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.0-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.0-r1.ebuild
index 44fe0a564196..1c2b726f1378 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.0-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.0-r1.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2009 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-r1.ebuild,v 1.2 2009/11/02 21:48:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/backport-util-concurrent-3.0-r1.ebuild,v 1.3 2009/11/17 15:16:51 caster Exp $
+EAPI=2
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
@@ -19,15 +20,9 @@ DEPEND="=virtual/jdk-1.5*
app-arch/unzip"
RDEPEND=">=virtual/jdk-1.5"
-S="${WORKDIR}/${P}-src"
-
-src_unpack() {
- unpack ${A}
- # This is just workaround because setting ${S} in pkg_setup doesn't currently
- # work and this seems better than doing it in global scope
- mv ${PN}-Java50-${PV}-src ${P}-src || die
- cd "${S}"
+S="${WORKDIR}/${PN}-Java50-${PV}-src"
+java_prepare() {
if use test; then
# make test not dependo n make
epatch "${FILESDIR}/${P}-test.patch"