Version bump, bug #293387. Needs java6, the backport to java5 was ommitted due to EOL. The 3.0-r1 RDEPEND is restricted to java5 as it cannot in fact work in java6 - bug #295421.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 67 insertions, 3 deletions

diff --git a/dev-java/backport-util-concurrent/ChangeLog b/dev-java/backport-util-concurrent/ChangeLog
index 1eac6cbd7b2c..ea489b64f2ac 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.27 2010/01/22 11:17:17 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.28 2010/02/09 10:03:16 caster Exp $
+
+*backport-util-concurrent-3.1 (09 Feb 2010)
+
+  09 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  backport-util-concurrent-3.0-r1.ebuild,
+  +backport-util-concurrent-3.1.ebuild:
+  Version bump, bug #293387. Needs java6, the backport to java5 was ommitted
+  due to EOL. The 3.0-r1 RDEPEND is restricted to java5 as it cannot in fact
+  work in java6 - bug #295421.
 
   22 Jan 2010; Vlastimil Babka <caster@gentoo.org>
   -backport-util-concurrent-3.0.ebuild:
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 b36683a416fc..bb0b07561aae 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,6 +1,6 @@
 # Copyright 1999-2010 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.5 2010/01/05 03:44:45 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/backport-util-concurrent-3.0-r1.ebuild,v 1.6 2010/02/09 10:03:16 caster Exp $
 
 EAPI=2
 JAVA_PKG_IUSE="doc source test"
@@ -18,7 +18,7 @@ IUSE=""
 DEPEND="=virtual/jdk-1.5*
 	test? ( =dev-java/junit-3* )
 	app-arch/unzip"
-RDEPEND=">=virtual/jdk-1.5"
+RDEPEND="=virtual/jre-1.5*"
 
 S="${WORKDIR}/${PN}-Java50-${PV}-src"
 
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
new file mode 100644
index 000000000000..cc3e71e6b422
--- /dev/null
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 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.1.ebuild,v 1.1 2010/02/09 10:03:16 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-ant-2
+
+SF_PN="backport-jsr166"
+MY_P="${PN}-Java60-${PV}"
+
+DESCRIPTION="A portability wrapper for java.util.concurrent API (jsr166) 6.0"
+HOMEPAGE="http://${SF_PN}.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	test? ( =dev-java/junit-3* )
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}-src"
+
+java_prepare() {
+	if use test; then
+		# make test not depend on make
+		epatch "${FILESDIR}/${PN}-3.0-test.patch"
+	else
+		# don't compile test classes
+		epatch "${FILESDIR}/${PN}-3.0-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/*
+}