Revbump to remove java5 useflag, and default to java5.

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

3 files changed, 66 insertions, 50 deletions

diff --git a/dev-java/backport-util-concurrent/ChangeLog b/dev-java/backport-util-concurrent/ChangeLog
index 8d1f5bdc8ef3..6197af1aa42a 100644
--- a/dev-java/backport-util-concurrent/ChangeLog
+++ b/dev-java/backport-util-concurrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/backport-util-concurrent
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.20 2008/01/10 23:03:52 caster Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/backport-util-concurrent/ChangeLog,v 1.21 2009/10/03 23:40:29 caster Exp $
+
+*backport-util-concurrent-3.0-r1 (03 Oct 2009)
+
+  03 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  -backport-util-concurrent-1.1.01-r1.ebuild,
+  +backport-util-concurrent-3.0-r1.ebuild:
+  Revbump to remove java5 useflag, and default to java5.
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org>
   backport-util-concurrent-1.1.01-r1.ebuild:
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
deleted file mode 100644
index 4865dfeb9a68..000000000000
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-1.1.01-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 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.7 2008/01/10 23:03:52 caster Exp $
-
-JAVA_PKG_IUSE="doc source test"
-
-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/"
-SRC_URI="http://www.mathcs.emory.edu/dcl/util/${PN}/dist/${MY_P}/${MY_P}-src.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-COMMON_DEP=""
-DEPEND="=virtual/jdk-1.4*
-	${COMMON_DEP}
-	test? ( =dev-java/junit-3.8* )"
-RDEPEND="=virtual/jre-1.4*
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-src_unpack() {
-	unpack ${A}
-	use test || rm -fr "${S}"/test/tck/src/*
-	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/edu
-}
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
new file mode 100644
index 000000000000..37d306bf7428
--- /dev/null
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.0-r1.ebuild
@@ -0,0 +1,57 @@
+# 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.1 2009/10/03 23:40:29 caster Exp $
+
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A backport of java.util.concurrent API, from Java 5.0, to 1.4, and from Java 6.0 to 5.0"
+HOMEPAGE="http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/"
+SRC_URI="http://dcl.mathcs.emory.edu/util/${PN}/dist/${P}/Java50/${PN}-Java50-${PV}-src.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="=virtual/jdk-1.5*
+	test? ( =dev-java/junit-3* )
+	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}"
+
+	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/*
+}