Revbump to remove java5 useflag, and default to java5.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 68 insertions, 53 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/Manifest b/dev-java/backport-util-concurrent/Manifest
index 83bcc360253f..42fc8c28ec07 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,9 +1,8 @@
 AUX backport-util-concurrent-3.0-notest.patch 491 RMD160 1267f72b754cfe122c64f64809b146dfb3ce38c5 SHA1 c86c7adcf562dbc8b17b1126f187bd016c1f4d0c SHA256 112918b1488255337fc42c1f5b8d71faefdc10c62a3061452f6d1b427cf0778f
 AUX backport-util-concurrent-3.0-test.patch 380 RMD160 f7bc3be94e79fac268b7ca393203877fadbb1c71 SHA1 b4bcf2991804787fa547d52b1f506e3e3480195a SHA256 dbd133bc068689d8b7dff508a48716e48fbb381f4089c07848003577c53933f6
-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 1272 RMD160 4a7b1b37a99e3e722b24409ed3513124758638c1 SHA1 c6eda2b7e1cf5849fefcd45fe97dd0074af076fc SHA256 45c3be39fdab53d84527a65376703d91740b96a77124f684ccf8072b99d88e8f
+EBUILD backport-util-concurrent-3.0-r1.ebuild 1500 RMD160 327d60912818ce0f79e37e20980d004e164b7565 SHA1 c805322a89a151df53899c986a4a6172b4c2ae38 SHA256 c4aa0738e75560304c8c56813e99c83d030ee9d3d28fede7af456790e7988ea7
 EBUILD backport-util-concurrent-3.0.ebuild 1701 RMD160 8bb031b7f65b198ee38311a73a18119de5feff4e SHA1 0757579976e19291b291d4ffb31345aa7bc8fa09 SHA256 79b06ace518a57e58e5a14e6e272e8d95a10e1cc1fbec453f3bf0b32aa0298c8
-MISC ChangeLog 3506 RMD160 b8c2e5ebcce843b27a4b4fa02565a74bc2d5d847 SHA1 3545560877a85131785b02bdd464c6d2e8de2ea9 SHA256 ab518d9557647ebba1078fa8b4801fd069eb9de54ef7284c34af7bfa66c42ba2
+MISC ChangeLog 3752 RMD160 98e8cef2011c438a9eba1a554ce85c77e60dc909 SHA1 034541056a8120b8cdb2b249cf14b30ac20218e2 SHA256 2f6ea5b5172f97599dc446ff6cbf52a7ef1002ae57dda1ee34edeeab02128463
 MISC metadata.xml 327 RMD160 6cb78e59be1161bb0838d270ad70b89f1701d067 SHA1 91f86e04405e680145c06ee44ea712f374e85c0f SHA256 5211f0eb4ff59809e2878506ad92010fc57863cf802f27da6d00fcaf718cd8bf
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/*
+}