summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang/ruby')
-rw-r--r--dev-lang/ruby/ChangeLog7
-rw-r--r--dev-lang/ruby/Manifest12
-rw-r--r--dev-lang/ruby/ruby-1.8.7_p160.ebuild4
-rw-r--r--dev-lang/ruby/ruby-1.9.1_p129.ebuild4
4 files changed, 16 insertions, 11 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/Manifest b/dev-lang/ruby/Manifest
index e9de714f1cfe..b517aec551bf 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -20,14 +20,14 @@ DIST ruby-1.8.7-p160.tar.bz2 4137518 RMD160 77469c9c4e9303f2ec8ca72a0cbf98b674cb
DIST ruby-1.9.1-p129.tar.bz2 7183891 RMD160 570f567508f9a4ee41e7983ab0a399cbd1a47b8a SHA1 4e36be3bea89c17e2c7e908d5b18bf6071cc91c0 SHA256 cb730f035aec0e3ac104d23d27a79aa9625fdeb115dae2295de65355f449ce27
EBUILD ruby-1.8.6_p114.ebuild 4942 RMD160 c840276c01dd3e3370416d41ad55e7d4faa584e9 SHA1 a31fbba7d8bce6581423900e983167e53cf1b037 SHA256 19a200859573537ed5b4bf51347d5a622d10ce0856463d9b22694217e6f15209
EBUILD ruby-1.8.6_p368.ebuild 5352 RMD160 b1623b687064f88c97ae9665682266f665d97c7a SHA1 25b2d259617b72a48eb5d1d4306f64b6eedcc49e SHA256 029383d463d2dd3a72075d2af43f9bbd5d9579db87940342a2fcbf77ca824c99
-EBUILD ruby-1.8.7_p160.ebuild 5615 RMD160 8a502fbaf9cce88d7682410627a89174ef44b4d8 SHA1 da467cc3972a77b474c97077cae2e974b3275b28 SHA256 149cdc403302a1c2e6c6709f4e3744015a79c2a58d95398f4edf2a069ad7c857
-EBUILD ruby-1.9.1_p129.ebuild 5535 RMD160 fed5640dbe22619faf6ec972142abc01021494be SHA1 219c5884b1d5970d826838869443529c88a11f4f SHA256 35c4b7aac2a0592eba3bc97b21388f8f16cc20a8489f85f30f2a41a55060870b
-MISC ChangeLog 61130 RMD160 29b8060c779a4749a15bd3678d4b145fe82ae5bd SHA1 56d5ee545b09e66ac763d472f8f614f751407124 SHA256 3166035c225f0f831dad9a30d0c7a6f3486dc63d33c73cdf00155fffb67e1161
+EBUILD ruby-1.8.7_p160.ebuild 5619 RMD160 e7e456d886cf868efd395c618448ab482a5ce628 SHA1 caed7b026ed3ecfac6fa67df45ea43ff6704f488 SHA256 037e25291fe7958e6430befb881795b21e56e6ef10fb35a964bcb7d3b2074ca9
+EBUILD ruby-1.9.1_p129.ebuild 5538 RMD160 b8608e8b5287de43ef6f1996270d1d2cccd95ac7 SHA1 77e713a450b68d10ddbebd1cf7d967da95068255 SHA256 8c1c213d9cb537b3428db51653ea50f3e42810359f53d0fd9fed7d378f368872
+MISC ChangeLog 61337 RMD160 d90e3ae14ff4e8632c7e0c51733cace5dbb3eee0 SHA1 01f553840fd0361839851fa13b547791771b7feb SHA256 48d04e6585a8da899b29a8c90b1b7d01c776319d001090660c255c0327e38e50
MISC metadata.xml 262 RMD160 f8642aa78425fe09dc0e0660cb20a5bd4233d5bb SHA1 64def0369477ecf76b9285fb9c1cf0e6a4f334e5 SHA256 5ee3c0cfedcb966505e4fafcfc5321a8ee20c128da9bbcafff5aa268df588d59
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkoNgxkACgkQAiZjviIA2XiI+gCgokwEZ+rb07iIGou4KsCODLkN
-M+AAnR6Xe5omMSpLjarEOIYAvHzlDhC5
-=f/dp
+iEYEARECAAYFAkoZOXQACgkQAiZjviIA2XjI6QCg1pIKWy8BXBcHN4YfKlxehoqg
+x1AAniw0hLTVOzS3+MiUX9kseYd1rCXz
+=7dQm
-----END PGP SIGNATURE-----
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="