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.

(Portage version: 2.1.2.7)

5 files changed, 102 insertions, 1 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/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