Version bump, bug #157961. Initial work in java-overlay by Miroslav Šulc <fordfrog@gentoo.org>. Adds java5 USE flag for 1.6 > 1.5 backport.

Package-Manager: portage-2.1.2.7

6 files changed, 123 insertions, 15 deletions

diff --git a/dev-java/backport-util-concurrent/ChangeLog b/dev-java/backport-util-concurrent/ChangeLog
index 400362126a03..8bfc83b84f9e 100644
--- a/dev-java/backport-util-concurrent/ChangeLog
+++ b/dev-java/backport-util-concurrent/ChangeLog
@@ -1,6 +1,15 @@
 # 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.9 2007/04/27 21:33:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.10 2007/05/09 21:52:26 caster Exp $
+
+*backport-util-concurrent-3.0 (09 May 2007)
+
+  09 May 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/backport-util-concurrent-3.0-notest.patch,
+  +files/backport-util-concurrent-3.0-test.patch,
+  +backport-util-concurrent-3.0.ebuild:
+  Version bump, bug #157961. Initial work in java-overlay by Miroslav Šulc
+  <fordfrog@gentoo.org>. Adds java5 USE flag for 1.6 > 1.5 backport.
 
   27 Apr 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 1bdbf3897bac..296dd6e6b28e 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,7 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX backport-util-concurrent-3.0-notest.patch 491 RMD160 1267f72b754cfe122c64f64809b146dfb3ce38c5 SHA1 c86c7adcf562dbc8b17b1126f187bd016c1f4d0c SHA256 112918b1488255337fc42c1f5b8d71faefdc10c62a3061452f6d1b427cf0778f
+MD5 e3c5d696951350605cb1ec428ababdcb files/backport-util-concurrent-3.0-notest.patch 491
+RMD160 1267f72b754cfe122c64f64809b146dfb3ce38c5 files/backport-util-concurrent-3.0-notest.patch 491
+SHA256 112918b1488255337fc42c1f5b8d71faefdc10c62a3061452f6d1b427cf0778f files/backport-util-concurrent-3.0-notest.patch 491
+AUX backport-util-concurrent-3.0-test.patch 380 RMD160 f7bc3be94e79fac268b7ca393203877fadbb1c71 SHA1 b4bcf2991804787fa547d52b1f506e3e3480195a SHA256 dbd133bc068689d8b7dff508a48716e48fbb381f4089c07848003577c53933f6
+MD5 4aef47b9140b5542c616c73a39a1ad09 files/backport-util-concurrent-3.0-test.patch 380
+RMD160 f7bc3be94e79fac268b7ca393203877fadbb1c71 files/backport-util-concurrent-3.0-test.patch 380
+SHA256 dbd133bc068689d8b7dff508a48716e48fbb381f4089c07848003577c53933f6 files/backport-util-concurrent-3.0-test.patch 380
 DIST backport-util-concurrent-1.1_01-src.tar.bz2 316261 RMD160 c5b8ce4a0b19f1cc1f865086af1b94fd6a27f620 SHA1 7ab1786b6720018c23d7de6d8689d4813177bb5b SHA256 86127b578d06fe232ae1a6b31102fb98d1998f30dd96dbd2cf95fc6d8132c34e
+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-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
@@ -10,10 +17,14 @@ EBUILD backport-util-concurrent-1.1.01.ebuild 1206 RMD160 a1a0e8f8882746a3b2b4f3
 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 1560 RMD160 cd23474f6f880d8bc99858fc3f4057f95516a583 SHA1 32de55a05bfd484a87cde6414f2f5e9ffa52f20a SHA256 b30d4cc6f1d6bd617f388ea26fe1f781cccd694d7dbdd02215fd4afea347f580
-MD5 49bfececcf0dcda46d8416807241ca1d ChangeLog 1560
-RMD160 cd23474f6f880d8bc99858fc3f4057f95516a583 ChangeLog 1560
-SHA256 b30d4cc6f1d6bd617f388ea26fe1f781cccd694d7dbdd02215fd4afea347f580 ChangeLog 1560
+EBUILD backport-util-concurrent-3.0.ebuild 1716 RMD160 10f51d8ad769964ee4f954f8cafa343c8b9327ce SHA1 0f390f4b48aa0d653e00c98c48a05041519c5b3a SHA256 3d53cad9d30dbc812fa3e7c12a0d5230cbad86269b892e8304022d329598867b
+MD5 2c32ffa38fb46551afc063c85ba19658 backport-util-concurrent-3.0.ebuild 1716
+RMD160 10f51d8ad769964ee4f954f8cafa343c8b9327ce backport-util-concurrent-3.0.ebuild 1716
+SHA256 3d53cad9d30dbc812fa3e7c12a0d5230cbad86269b892e8304022d329598867b backport-util-concurrent-3.0.ebuild 1716
+MISC ChangeLog 1941 RMD160 f341e4f6baf45d26ff7d73a8ca792ed073339a68 SHA1 8b6415282ee8b2c39c092a8c6a73b78a188d8285 SHA256 5fa4489a6786de3ab9092b69f0c8f3e1689d3e2da93b809d37ebd4061b71df57
+MD5 1e6fb945e77c8aa1e7036964d0553e06 ChangeLog 1941
+RMD160 f341e4f6baf45d26ff7d73a8ca792ed073339a68 ChangeLog 1941
+SHA256 5fa4489a6786de3ab9092b69f0c8f3e1689d3e2da93b809d37ebd4061b71df57 ChangeLog 1941
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -24,10 +35,6 @@ SHA256 25e9eb9c62ab6c4724c0b0671b003b59bf8c3c3338fa645ec48cdfd92aa8c56b files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGMmwWcxLzpIGCsLQRAlJQAJ9dpRbSGAc+CJAGfD9p0zuSXHkpuQCePiwR
-ObE3KnXXt/8VReEKArP76Pc=
-=HEsz
------END PGP SIGNATURE-----
+MD5 2133a743067216789627e58f4571232b files/digest-backport-util-concurrent-3.0 599
+RMD160 6cdf18f8c0610a72c3c55982ae992c8e51f4fe62 files/digest-backport-util-concurrent-3.0 599
+SHA256 cdf4c72dce18386ca0ead3bfe0c4debc2b618d0c40ee08884d4c7f66359018fb files/digest-backport-util-concurrent-3.0 599
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
new file mode 100644
index 000000000000..b902938a04b0
--- /dev/null
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.0.ebuild
@@ -0,0 +1,61 @@
+# 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.1 2007/05/09 21:52:26 caster Exp $
+
+JAVA_PKG_IUSE="doc java5 source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="This package is the backport of java.util.concurrent API, introduced in Java 5.0, to Java 1.4, and from Java 6.0 to Java 5.0"
+HOMEPAGE="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/"
+SRC_URI="!java5? ( http://dcl.mathcs.emory.edu/util/${PN}/dist/${P}/Java14/${P}-src.zip )
+	java5? ( http://dcl.mathcs.emory.edu/util/${PN}/dist/${P}/Java50/${PN}-Java50-${PV}-src.zip )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="java5? ( =virtual/jdk-1.5* )
+	!java5? ( =virtual/jdk-1.4* )
+	test? ( =dev-java/junit-3* )"
+RDEPEND="java5? ( >=virtual/jdk-1.5 )
+	!java5? ( >=virtual/jre-1.4 )"
+
+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
+	if use java5; then
+		mv ${PN}-Java50-${PV}-src ${P}-src || die
+	fi
+	cd "${S}"
+
+	if use test; then
+		# make test not dependo n make
+		epatch "${FILESDIR}/${P}-test.patch"
+	else
+		# don't compile test classes
+		epatch "${FILESDIR}/${P}-notest.patch"
+	fi
+
+	cd "${S}/external"
+	rm -v *.jar || die
+
+	use test && java-pkg_jar-from --build-only junit
+}
+
+EANT_BUILD_TARGET="javacompile archive"
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dohtml README.html || die
+
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-notest.patch b/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-notest.patch
new file mode 100644
index 000000000000..65642012fddb
--- /dev/null
+++ b/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-notest.patch
@@ -0,0 +1,14 @@
+--- build.xml.orig	2007-05-09 23:23:00.000000000 +0200
++++ build.xml	2007-05-09 23:23:34.000000000 +0200
+@@ -33,9 +33,9 @@
+              deprecation="true" destdir="${dest}" nowarn="false"
+              source="1.4" target="1.4">
+         <src path="src"/>
+-        <src path="test/tck/src"/>
++<!--        <src path="test/tck/src"/>
+         <src path="test/loops/src"/>
+-        <src path="test/serialization"/>
++        <src path="test/serialization"/>-->
+       </javac>
+     </target>
+ 
diff --git a/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-test.patch b/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-test.patch
new file mode 100644
index 000000000000..493738b6055d
--- /dev/null
+++ b/dev-java/backport-util-concurrent/files/backport-util-concurrent-3.0-test.patch
@@ -0,0 +1,11 @@
+--- build.xml.original	2007-02-10 02:03:52.000000000 +0100
++++ build.xml	2007-02-10 02:04:02.000000000 +0100
+@@ -107,7 +107,7 @@
+     -Djunit.ui=swingui property.
+      -->
+ 
+-    <target name="test" depends="jdeps,make"
++    <target name="test" depends="jdeps"
+             description="runs TCK unit tests on the backport">
+ 
+         <property name="junit.ui" value="textui"/>
diff --git a/dev-java/backport-util-concurrent/files/digest-backport-util-concurrent-3.0 b/dev-java/backport-util-concurrent/files/digest-backport-util-concurrent-3.0
new file mode 100644
index 000000000000..3aab30ea1820
--- /dev/null
+++ b/dev-java/backport-util-concurrent/files/digest-backport-util-concurrent-3.0
@@ -0,0 +1,6 @@
+MD5 7c260d579ac4056939efa15d865ab217 backport-util-concurrent-3.0-src.zip 949726
+RMD160 65a47f01f2de0e4fea2680245323f45c1e7f564f backport-util-concurrent-3.0-src.zip 949726
+SHA256 fb5d81c929717baab117ab727a4561302277334e34fd68bafa280004c51b0cc2 backport-util-concurrent-3.0-src.zip 949726
+MD5 cb4de9e9a415b56acec45507bd01094d backport-util-concurrent-Java50-3.0-src.zip 958747
+RMD160 2b7acfedbee157e26d972ea2dcd8ee9e8112fec2 backport-util-concurrent-Java50-3.0-src.zip 958747
+SHA256 d10858454fc9921632003a69e5a87e5bf08d8cc47edbba747dc29d19968da1a0 backport-util-concurrent-Java50-3.0-src.zip 958747