summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2011-01-09 16:43:06 +0000
committerHans de Graaff <graaff@gentoo.org>2011-01-09 16:43:06 +0000
commit3cbe284890f5395e9770db274386ee9c6c1e8629 (patch)
tree274b2b8351c8e09828fff9e0fb52609f42090b4a /dev-ruby/rack
parentia64/m68k/s390/sh stable wrt #342525 (diff)
downloadgentoo-2-3cbe284890f5395e9770db274386ee9c6c1e8629.tar.gz
gentoo-2-3cbe284890f5395e9770db274386ee9c6c1e8629.tar.bz2
gentoo-2-3cbe284890f5395e9770db274386ee9c6c1e8629.zip
Put the blocker directly in RDEPEND instead of having to deal with the complexities of ruby_add_rdepend, fixes bug 351192.
(Portage version: 2.1.9.25/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/rack')
-rw-r--r--dev-ruby/rack/ChangeLog8
-rw-r--r--dev-ruby/rack/rack-1.2.1.ebuild6
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-ruby/rack/ChangeLog b/dev-ruby/rack/ChangeLog
index b93c2be8de8d..425a7ad4ae5a 100644
--- a/dev-ruby/rack/ChangeLog
+++ b/dev-ruby/rack/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/rack
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.37 2010/12/28 12:27:07 graaff Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.38 2011/01/09 16:43:06 graaff Exp $
+
+ 09 Jan 2011; Hans de Graaff <graaff@gentoo.org> rack-1.2.1.ebuild:
+ Put the blocker directly in RDEPEND instead of having to deal with the
+ complexities of ruby_add_rdepend, fixes bug 351192.
28 Dec 2010; Hans de Graaff <graaff@gentoo.org> rack-1.1.0.ebuild,
rack-1.1.0-r1.ebuild, rack-1.2.1.ebuild:
diff --git a/dev-ruby/rack/rack-1.2.1.ebuild b/dev-ruby/rack/rack-1.2.1.ebuild
index 3fc116535860..f881f30b2150 100644
--- a/dev-ruby/rack/rack-1.2.1.ebuild
+++ b/dev-ruby/rack/rack-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.1.ebuild,v 1.4 2010/12/28 12:27:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.1.ebuild,v 1.5 2011/01/09 16:43:06 graaff Exp $
EAPI="2"
USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -25,7 +25,7 @@ IUSE=""
ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/ruby-fcgi )"
# Block against versions in older slots that also try to install a binary.
-ruby_add_rdepend "!<dev-ruby/rack-1.1.0-r1"
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.0-r1"
#USE_RUBY=ruby19 \
# ruby_add_bdepend "ruby_targets_ruby19 test" '=dev-ruby/test-unit-1*'