Use versionator, add the source use flag, pull in junit only under the test use flag and add src_test.

Package-Manager: portage-2.1.2.4

3 files changed, 44 insertions, 29 deletions

diff --git a/dev-java/backport-util-concurrent/ChangeLog b/dev-java/backport-util-concurrent/ChangeLog
index 769b62717987..400362126a03 100644
--- a/dev-java/backport-util-concurrent/ChangeLog
+++ b/dev-java/backport-util-concurrent/ChangeLog
@@ -1,11 +1,18 @@
 # ChangeLog for dev-java/backport-util-concurrent
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.8 2006/07/22 21:44:22 nelchael Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.9 2007/04/27 21:33:00 betelgeuse Exp $
+
+  27 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  backport-util-concurrent-1.1.01-r1.ebuild:
+  Use versionator, add the source use flag, pull in junit only under the test
+  use flag and add src_test.
 
   22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   backport-util-concurrent-1.1.01-r1.ebuild:
   ant_src_unpack -> src_unpack
 
+*backport-util-concurrent-1.1.01-r1 (03 Jul 2006)
+
   03 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
   +backport-util-concurrent-1.1.01-r1.ebuild:
   Revision bump to support Java system.
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index be7c3870ca22..1bdbf3897bac 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST backport-util-concurrent-1.1_01-src.tar.bz2 316261 RMD160 c5b8ce4a0b19f1cc1f865086af1b94fd6a27f620 SHA1 7ab1786b6720018c23d7de6d8689d4813177bb5b SHA256 86127b578d06fe232ae1a6b31102fb98d1998f30dd96dbd2cf95fc6d8132c34e
-EBUILD backport-util-concurrent-1.1.01-r1.ebuild 1067 RMD160 72f25dec4cafcc2b7438a18e5a92ecf1dbb7e16e SHA1 7f613f5cb686cf8755fb10bbe3851449d8e91dc5 SHA256 b02ea540b11ac5fbff0577c2856bb7f075cb7f7c87be037d85b126ba191cb93c
-MD5 e0b61fe385dd51e0c25baf5a33ce9754 backport-util-concurrent-1.1.01-r1.ebuild 1067
-RMD160 72f25dec4cafcc2b7438a18e5a92ecf1dbb7e16e backport-util-concurrent-1.1.01-r1.ebuild 1067
-SHA256 b02ea540b11ac5fbff0577c2856bb7f075cb7f7c87be037d85b126ba191cb93c backport-util-concurrent-1.1.01-r1.ebuild 1067
+EBUILD backport-util-concurrent-1.1.01-r1.ebuild 1273 RMD160 54adf0a25d63ef159dc0d4b3fc72fc65697d21c9 SHA1 19f7c1be0a9904189958daf79487fd41ab186e27 SHA256 fa9701533fefdf46089ce0125deecb8725af034725598624cc6a9ef3631157c0
+MD5 39c414f92cf3a1c2aa436cabb14a858a backport-util-concurrent-1.1.01-r1.ebuild 1273
+RMD160 54adf0a25d63ef159dc0d4b3fc72fc65697d21c9 backport-util-concurrent-1.1.01-r1.ebuild 1273
+SHA256 fa9701533fefdf46089ce0125deecb8725af034725598624cc6a9ef3631157c0 backport-util-concurrent-1.1.01-r1.ebuild 1273
 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
-MISC ChangeLog 1301 RMD160 1734a077d879fcc0fbb3f46fc6d0b74e91579dc4 SHA1 5d9ac4620570c49ccaa9953b0797f65736b8415d SHA256 93e61ddf68065f958ce7aa04346e85e595d2dbcbac1faa8af7b751f18a1ee267
-MD5 135f709d0793fc522041c093e83e644f ChangeLog 1301
-RMD160 1734a077d879fcc0fbb3f46fc6d0b74e91579dc4 ChangeLog 1301
-SHA256 93e61ddf68065f958ce7aa04346e85e595d2dbcbac1faa8af7b751f18a1ee267 ChangeLog 1301
+MISC ChangeLog 1560 RMD160 cd23474f6f880d8bc99858fc3f4057f95516a583 SHA1 32de55a05bfd484a87cde6414f2f5e9ffa52f20a SHA256 b30d4cc6f1d6bd617f388ea26fe1f781cccd694d7dbdd02215fd4afea347f580
+MD5 49bfececcf0dcda46d8416807241ca1d ChangeLog 1560
+RMD160 cd23474f6f880d8bc99858fc3f4057f95516a583 ChangeLog 1560
+SHA256 b30d4cc6f1d6bd617f388ea26fe1f781cccd694d7dbdd02215fd4afea347f580 ChangeLog 1560
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -25,9 +25,9 @@ MD5 8cf7ad640bb5fca6200ef55ff2ed58ee files/digest-backport-util-concurrent-1.1.0
 RMD160 93100408cedc72d923a20a423a4ffc4b4cc269f5 files/digest-backport-util-concurrent-1.1.01-r1 310
 SHA256 25e9eb9c62ab6c4724c0b0671b003b59bf8c3c3338fa645ec48cdfd92aa8c56b files/digest-backport-util-concurrent-1.1.01-r1 310
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFEwpw/go/w9rxVVVERAlUhAJoC6cjfQe1zk09x3gW8r7/YhA7L4QCdGwLw
-TirMktn3X1Jp3JO1hSnUBrA=
-=w31H
+iD8DBQFGMmwWcxLzpIGCsLQRAlJQAJ9dpRbSGAc+CJAGfD9p0zuSXHkpuQCePiwR
+ObE3KnXXt/8VReEKArP76Pc=
+=HEsz
 -----END PGP SIGNATURE-----
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild
index 34b7a6c0dcf9..b36844a3078b 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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-1.1.01-r1.ebuild,v 1.2 2006/07/22 21:44:22 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild,v 1.3 2007/04/27 21:33:00 betelgeuse Exp $
 
-inherit java-pkg-2 java-ant-2
+JAVA_PKG_IUSE="doc source test"
 
-MY_PV="1.1_01" # TODO use versionator
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV="$(replace_version_separator 2 _)"
 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/"
@@ -13,28 +15,34 @@ SRC_URI="http://www.mathcs.emory.edu/dcl/util/${PN}/dist/${MY_P}/${MY_P}-src.tar
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc"
+IUSE=""
 
+COMMON_DEP=""
 DEPEND="=virtual/jdk-1.4*
-	dev-java/ant-core
-	dev-java/junit"
-RDEPEND="=virtual/jre-1.4*"
+	${COMMON_DEP}
+	test? ( dev-java/junit )"
+RDEPEND="=virtual/jre-1.4*
+	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}-src"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/external
-	rm -f *.jar
-	java-pkg_jar-from junit
+	use test || rm -fr "${S}"/test/tck/src/*
+	cd "${S}/external"
+	rm -v *.jar || die
+	use test && java-pkg_jar-from --build-only junit
 }
 
-src_compile() {
-	eant javacompile archive $(use_doc)
+EANT_BUILD_TARGET="javacompile archive"
+
+src_test() {
+	eant test
 }
 
 src_install() {
 	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dohtml -r doc/api
-	java-pkg_dohtml README.html
+	dohtml README.html || die
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/edu
 }