From c13e9fd7666e9da6a46fb20e4a5bf8c6fff9bd10 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Tue, 9 Feb 2010 17:10:23 +0000 Subject: Remove backport-util-concurrent dependency as there seem to be no usage of it in jruby source anymore. (Portage version: 2.2_rc62/cvs/Linux x86_64) --- dev-java/jruby/ChangeLog | 7 ++++++- dev-java/jruby/jruby-1.3.1-r1.ebuild | 4 +--- dev-java/jruby/jruby-1.4.0-r4.ebuild | 4 +--- dev-java/jruby/jruby-1.4.0-r5.ebuild | 4 +--- 4 files changed, 9 insertions(+), 10 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 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/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 -- cgit v1.2.3-65-gdbad