From: Caleb Tennis <caleb@gentoo.org>
Date: Fri, 23 Sep 2005 01:09:25 +0000 (+0000)
Subject: Add a blocker again dev-ruby/rdoc as its now provided in ruby itself
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2771bffcc2fda3ff8f8a53596a9f44ca3cac8065;p=gentoo.git

Add a blocker again dev-ruby/rdoc as its now provided in ruby itself
Package-Manager: portage-2.0.52-r1
---

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/Manifest b/dev-lang/ruby/Manifest
index 51cfa0130056..3479bd75cd0c 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,9 +1,9 @@
 MD5 a63962eec3291eb3762c7462570b39bc ruby-1.6.8-r12.ebuild 1937
-MD5 8ce207c6e7d716285f9c0c064a45cebe ruby-1.8.3.ebuild 3653
-MD5 d2234d03c37129677ed7c35c38be1bcd ruby-1.8.2-r2.ebuild 3813
+MD5 6060b3e00ced0732f7aed9d1c8f58604 ruby-1.8.3.ebuild 3670
+MD5 3c1c7073b75a7c7dc6e6fc48de2ebe64 ruby-1.8.2-r2.ebuild 3828
 MD5 67de00f5d7b9ced2530317f945d0ebc9 ruby-1.8.2.ebuild 3446
 MD5 3f3ef53019f559def811f446ba1b0f04 ruby-1.8.2-r1.ebuild 3753
-MD5 1d4dafe6cb77a49013f32052a1576db6 ChangeLog 21838
+MD5 2e672e8aa3a3027cc7388a2068d3fe23 ChangeLog 22003
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 5d27b5dca2842607d0dd0469612a2224 files/ruby-1.8.2-soap.diff 596
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}"