summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ruby/ChangeLog6
-rw-r--r--dev-lang/ruby/ruby-1.8.2-r2.ebuild5
-rw-r--r--dev-lang/ruby/ruby-1.8.3.ebuild6
3 files changed, 12 insertions, 5 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 10ed53d0e408..975340f42130 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ruby
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.147 2005/09/23 01:04:19 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.148 2005/09/23 01:09:25 caleb Exp $
+
+ 23 Sep 2005; Caleb Tennis <caleb@gentoo.org> ruby-1.8.2-r2.ebuild,
+ ruby-1.8.3.ebuild:
+ Add a blocker against dev-ruby/rdoc, as its now provided in ruby itself
*ruby-1.8.3 (23 Sep 2005)
diff --git a/dev-lang/ruby/ruby-1.8.2-r2.ebuild b/dev-lang/ruby/ruby-1.8.2-r2.ebuild
index 9ce03a8b6a7d..9c68714528cb 100644
--- a/dev-lang/ruby/ruby-1.8.2-r2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2-r2.ebuild,v 1.2 2005/07/23 11:53:00 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2-r2.ebuild,v 1.3 2005/09/23 01:09:25 caleb Exp $
ONIGURUMA="onigd2_4_0"
@@ -24,7 +24,8 @@ RDEPEND="virtual/libc
socks5? ( >=net-proxy/dante-1.1.13 )
tcltk? ( dev-lang/tk )
>=dev-ruby/ruby-config-0.3
- !=dev-lang/ruby-cvs-1.8*"
+ !=dev-lang/ruby-cvs-1.8*
+ !dev-ruby/rdoc"
DEPEND="sys-devel/autoconf
sys-apps/findutils
${RDEPEND}"
diff --git a/dev-lang/ruby/ruby-1.8.3.ebuild b/dev-lang/ruby/ruby-1.8.3.ebuild
index fa2d9ff7b31d..e69e823af044 100644
--- a/dev-lang/ruby/ruby-1.8.3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.3.ebuild,v 1.1 2005/09/23 01:04:19 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.3.ebuild,v 1.2 2005/09/23 01:09:25 caleb Exp $
ONIGURUMA="onigd2_4_2"
@@ -24,7 +24,9 @@ RDEPEND="virtual/libc
socks5? ( >=net-proxy/dante-1.1.13 )
tcltk? ( dev-lang/tk )
>=dev-ruby/ruby-config-0.3
- !=dev-lang/ruby-cvs-1.8*"
+ !=dev-lang/ruby-cvs-1.8*
+ !dev-ruby/rdoc"
+
DEPEND="sys-devel/autoconf
sys-apps/findutils
${RDEPEND}"