Remove backport-util-concurrent dependency as there seem to be no usage of it in jruby source anymore.

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

5 files changed, 13 insertions, 24 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index dde6f593db7c..6c8c082d7e1b 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.54 2010/01/31 17:19:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.55 2010/02/09 17:10:23 caster Exp $
+
+  09 Feb 2010; Vlastimil Babka <caster@gentoo.org> jruby-1.3.1-r1.ebuild,
+  jruby-1.4.0-r4.ebuild, jruby-1.4.0-r5.ebuild:
+  Remove backport-util-concurrent dependency as there seem to be no usage of
+  it in jruby source anymore.
 
 *jruby-1.4.0-r5 (31 Jan 2010)
 
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 46fb21d48a73..e0366a927cf5 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10jruby 22 RMD160 ac56025539a2bbb7a1506a2df958c73cc1c3aba9 SHA1 caf6b109c0a7cfa53a1e470ba0ca5f27a6578723 SHA256 fb1240cfedd315ba3772830abbc238eb3061088fcf70eb4df7e9a99d92f124e4
 AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc
 AUX ftype-test-fixes.patch 2738 RMD160 9de8f9e14469967b736fbcf48c28a2ee9c366d6e SHA1 4e94c0447dfef6f6f9dd8b78b3f77ffaa4d798bb SHA256 82fd519cc11271e4d475529a308dbcf70526c18f7c1f193a2ef93d6f0b4fdd2b
@@ -12,15 +9,8 @@ AUX jruby-1.4.0-system-jars.patch 8423 RMD160 84fd92c13e953eb44c091b77bbbdd0d0c0
 AUX user-test-fixes.patch 5147 RMD160 6258879413ae81a18d0c6bcaa3b0661d86a0d14a SHA1 32d3f80db383cf664c9ad1f9e52c2688ae3cbe5c SHA256 f21469d41de9f9b5fb1682596f64899a71c92332db24bf27e8c50dbb1896a92e
 DIST jruby-src-1.3.1.tar.gz 12076705 RMD160 ef10395dbdf9490820caa65ff6236dd99e7c62c8 SHA1 e4de71e5c01f71f236b3135e07a5841784767fd8 SHA256 9095b0bec0ee8e6cd96b72c7f2aec8a90fa429b840484d57a48d8fb760aae600
 DIST jruby-src-1.4.0.tar.gz 12731458 RMD160 70b6a34a9e1b174fe1c8f1df8ba8ea7cbfa4da37 SHA1 3d6f634e16b789a5a086327c0f09710dd29d1ec7 SHA256 b9fd84ed097ac136afce4462a13bb0752bab467db203ed3797e228a435e26d23
-EBUILD jruby-1.3.1-r1.ebuild 5502 RMD160 94388e24d29a24d3b23013125ae38e5a0e3f4846 SHA1 4c66c6df3aab698f950dc28e57208a4c94d523c7 SHA256 b5b064f8bec2f7ab2c045c684dda9171e57d7942dd22dfaec715dbeba3adc620
-EBUILD jruby-1.4.0-r4.ebuild 5675 RMD160 4de267a5dc112d74aeb0dd8a1d3aedb1a83d01af SHA1 87cc2b17f1292cbaa89c39195c4803b03b991e1c SHA256 e91613114e812adfa3f3b15e49e7fee739ca412ee43821807391cf059eb4de33
-EBUILD jruby-1.4.0-r5.ebuild 5687 RMD160 39f1c3540fa2f378e70104d812f1ff950a4b474c SHA1 dab40c8bc2f294b3ae34e594286fd1a180bdc800 SHA256 3750c9318213439b52ed6d22d70a1320fd21a3744ec66ce8606e4751656f9346
-MISC ChangeLog 10283 RMD160 0ecb3e14a6d4450cf44468d0603ebeb6a56f7a4e SHA1 4aea4ced3176332a168152f91a5304b32960619d SHA256 16937db65ae9cd5a2d1b4548d07401afb86b7f65288e9af8abf3a5f78dca0954
+EBUILD jruby-1.3.1-r1.ebuild 5362 RMD160 9cc4b0f1cd310a6a3d833e8bb339e15853ca44fa SHA1 cdf3e7003c9794372c3c949c37c92eedb95310bd SHA256 f955390140221f98f15b837fc2d62b45be4c0289fb3521e71e65c554fd1f4218
+EBUILD jruby-1.4.0-r4.ebuild 5535 RMD160 2d345137b735c9124d29a8d73c14be45154cb8c3 SHA1 1bd28d26583b138162962f6fcb78e55584a3d5b8 SHA256 a2ea17ef76c7bac171063da50ee8701204e5bd60b7a15eaf3e689ed7d6bdabe3
+EBUILD jruby-1.4.0-r5.ebuild 5547 RMD160 4d88b1c6fc9b717a63f123a2161605653da9485f SHA1 61d83f8bc54766bf39c90b91ec966c3fdf98ef2d SHA256 af63d46d1b8e15083f5464c6a64c3c7d712cd5d1b7f72354d72dcda2bcf984f8
+MISC ChangeLog 10510 RMD160 ccb0e5a636166a62a713a86b3efce519c6c51cb7 SHA1 9f01aa395d98502613cecb97852ebffe3bf365d4 SHA256 9a39061a4aad88162917ce5d38e03ed196c2deb6430ac6354e1d14a51b839673
 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktlu5gACgkQAiZjviIA2Xj37QCgqF0bFcxCo/H5s+fytpxIyTGu
-c78AmwczyvoBVKSTCp2NbhwrzUDxZc9T
-=fpkf
------END PGP SIGNATURE-----
diff --git a/dev-java/jruby/jruby-1.3.1-r1.ebuild b/dev-java/jruby/jruby-1.3.1-r1.ebuild
index 149487ae4cd9..526d0c04722b 100644
--- a/dev-java/jruby/jruby-1.3.1-r1.ebuild
+++ b/dev-java/jruby/jruby-1.3.1-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/jruby/jruby-1.3.1-r1.ebuild,v 1.2 2010/01/02 00:01:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild,v 1.3 2010/02/09 17:10:23 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source test"
@@ -28,7 +28,6 @@ CDEPEND=">=dev-java/bytelist-1.0.2:0
 	dev-java/jna:0
 	dev-java/joda-time:0
 	dev-util/jay:0[java]
-	!java6? ( dev-java/backport-util-concurrent:0 )
 	dev-java/nailgun:0"
 
 RDEPEND="${CDEPEND}
@@ -70,7 +69,6 @@ EANT_NEEDS_TOOLS="true"
 
 pkg_setup() {
 	java-pkg-2_pkg_setup
-	use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent"
 
 	local fail
 
diff --git a/dev-java/jruby/jruby-1.4.0-r4.ebuild b/dev-java/jruby/jruby-1.4.0-r4.ebuild
index a7abb10cfed5..2b6d820fc211 100644
--- a/dev-java/jruby/jruby-1.4.0-r4.ebuild
+++ b/dev-java/jruby/jruby-1.4.0-r4.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/jruby/jruby-1.4.0-r4.ebuild,v 1.2 2010/01/24 00:54:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r4.ebuild,v 1.3 2010/02/09 17:10:23 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source test"
@@ -28,7 +28,6 @@ CDEPEND=">=dev-java/bytelist-1.0.2:0
 	dev-java/jna:0
 	dev-java/joda-time:0
 	dev-util/jay:0[java]
-	!java6? ( dev-java/backport-util-concurrent:0 )
 	dev-java/nailgun:0
 	dev-java/jaffl:0
 	dev-java/jgrapht:0"
@@ -73,7 +72,6 @@ EANT_NEEDS_TOOLS="true"
 
 pkg_setup() {
 	java-pkg-2_pkg_setup
-	use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent"
 
 	local fail
 
diff --git a/dev-java/jruby/jruby-1.4.0-r5.ebuild b/dev-java/jruby/jruby-1.4.0-r5.ebuild
index 5a86c7d8f45d..31e1aa518491 100644
--- a/dev-java/jruby/jruby-1.4.0-r5.ebuild
+++ b/dev-java/jruby/jruby-1.4.0-r5.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/jruby/jruby-1.4.0-r5.ebuild,v 1.1 2010/01/31 17:19:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r5.ebuild,v 1.2 2010/02/09 17:10:23 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source test"
@@ -28,7 +28,6 @@ CDEPEND=">=dev-java/bytelist-1.0.2:0
 	dev-java/jna:0
 	dev-java/joda-time:0
 	dev-util/jay:0[java]
-	!java6? ( dev-java/backport-util-concurrent:0 )
 	dev-java/nailgun:0
 	dev-java/jaffl:0
 	dev-java/jgrapht:0"
@@ -70,7 +69,6 @@ EANT_NEEDS_TOOLS="true"
 
 pkg_setup() {
 	java-pkg-2_pkg_setup
-	use java6 || EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH} backport-util-concurrent"
 
 	local fail