summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-05-24 12:11:25 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-05-24 12:11:25 +0000
commit828fc2553f65ae993e513805f399b9ff2777cc6e (patch)
treea4296505838159d36f10d65b4d934247747bec2c /dev-lang
parentKeyworded on alpha, bug #266201 (diff)
downloadgentoo-2-828fc2553f65ae993e513805f399b9ff2777cc6e.tar.gz
gentoo-2-828fc2553f65ae993e513805f399b9ff2777cc6e.tar.bz2
gentoo-2-828fc2553f65ae993e513805f399b9ff2777cc6e.zip
Don't block rdoc-2 or later (which may enter Portage one day as it's needed by some Rakefiles).
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ruby/ChangeLog7
-rw-r--r--dev-lang/ruby/ruby-1.8.7_p160.ebuild4
-rw-r--r--dev-lang/ruby/ruby-1.9.1_p129.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index f1e4a123a2e6..eed965dd3abe 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/ruby
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.403 2009/05/15 14:58:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.404 2009/05/24 12:11:25 flameeyes Exp $
+
+ 24 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ ruby-1.8.7_p160.ebuild, ruby-1.9.1_p129.ebuild:
+ Don't block rdoc-2 or later (which may enter Portage one day as it's
+ needed by some Rakefiles).
15 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
ruby-1.9.1_p129.ebuild:
diff --git a/dev-lang/ruby/ruby-1.8.7_p160.ebuild b/dev-lang/ruby/ruby-1.8.7_p160.ebuild
index 3ab9251ae8c8..e3b40ad03bb4 100644
--- a/dev-lang/ruby/ruby-1.8.7_p160.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p160.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p160.ebuild,v 1.3 2009/05/15 14:40:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p160.ebuild,v 1.4 2009/05/24 12:11:25 flameeyes Exp $
#PATCHES APPLY, DOESN'T COMPILE THOUGH
#ONIGURUMA="onigd2_5_9"
@@ -30,7 +30,7 @@ RDEPEND="
tk? ( dev-lang/tk )
app-admin/eselect-ruby
!=dev-lang/ruby-cvs-${SLOT}*
- !dev-ruby/rdoc
+ !<dev-ruby/rdoc-2
!dev-ruby/rexml"
DEPEND="${RDEPEND}"
PDEPEND="emacs? ( app-emacs/ruby-mode )
diff --git a/dev-lang/ruby/ruby-1.9.1_p129.ebuild b/dev-lang/ruby/ruby-1.9.1_p129.ebuild
index e0f6eb00d51e..8d773bf8b4c7 100644
--- a/dev-lang/ruby/ruby-1.9.1_p129.ebuild
+++ b/dev-lang/ruby/ruby-1.9.1_p129.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1_p129.ebuild,v 1.2 2009/05/15 14:58:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1_p129.ebuild,v 1.3 2009/05/24 12:11:25 flameeyes Exp $
EAPI=2
@@ -34,7 +34,7 @@ RDEPEND="
tk? ( dev-lang/tk[threads] )
>=app-admin/eselect-ruby-20080921
!=dev-lang/ruby-cvs-${SLOT}*
- !dev-ruby/rdoc
+ !<dev-ruby/rdoc-2
!dev-ruby/rexml"
DEPEND="${RDEPEND}"
PDEPEND="