Fix building with USE=doc, fix rspec dependency to right slot. Fix running specs on ruby19.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 25 insertions, 35 deletions

diff --git a/dev-ruby/notify/Manifest b/dev-ruby/notify/Manifest
index 5d502f07064e..3ef542adc2ff 100644
--- a/dev-ruby/notify/Manifest
+++ b/dev-ruby/notify/Manifest
@@ -2,23 +2,13 @@
 Hash: SHA256
 
 DIST notify-0.2.1.gem 5120 RMD160 5385129882ad000904fb61328e2bc36b34da1f37 SHA1 451445ec2bfad97f889e395a6046bab9e7871061 SHA256 401dfdf358e7eb46a235f481950c7e7c84edbe2eca75df60d545bb3a210a4e3f
-EBUILD notify-0.2.1.ebuild 540 RMD160 edbfdccf6824c98646051f3c61785988b4550c0b SHA1 25e283c2d8b101d9f2e4a281ccb80a4ef5b748d8 SHA256 3c37ec5a87d1892065a9780a74dbe9cb12e1560bb4bda98549b3f13568397cb5
-MISC ChangeLog 402 RMD160 c3cfa59fa5e249c8e4b05112cf6e6737a9949aeb SHA1 383dc80c212484d9b59f7395cd99ae87ba66bd54 SHA256 8c82030cac8242b625e4df9a13196839b8a012bb1c6d24160c3ee84848fc3ece
+EBUILD notify-0.2.1.ebuild 567 RMD160 236ec19a4971a5eb5b9d6c1e5b921fc578f7a923 SHA1 6bbe26273deb4ece93c809bdf8e97e811e568ada SHA256 b9a5da9ef7b25ac522f028849bddaed6c9d74c55be47a2b9b4058da008fcd35e
+MISC ChangeLog 490 RMD160 1e5accedc5d0d01754c11630c9ae243202d35554 SHA1 ecd2b722b7dbd860e246f409b6a6da74d881ab3a SHA256 67ea1a3fb6e6bacc82b27b575121740cb2930ff8178f912605c1776b15297b83
 MISC metadata.xml 220 RMD160 7f7779deaa0be13dd0c2a42a0f368c1f427322db SHA1 f76b9fa76642a7c943c52c815428c15b4f844cfb SHA256 3876bf94339a6b2a36040fdf7eaeb1dcddff46924c02b8135f615c2d4eb1c743
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOv3xwAAoJEDYO1FT4VRUUHa8P/2moYkyMZoAZLIzC5G6xd1jZ
-Chp4DVEIJY7ri1bP1sfs86awAn+tZ2iHkCAQ2vAK+QK9GXjsVagpiDLBjYK9+OAw
-S+djLToSZGz3wvFe60NxXiH3aZEytfaROhLYGRrY2vyCY64CJCmYIfEalPsvOrfa
-HmvcssQXOEGfx4cygNSlgdbsHGTOQIxFK9s8TYlC8WXQVTvX6Y/jwnZovxfjAcxj
-4CP4c8JmqsU+WUAdntJs7PVzR+yKSB+izajK9LTvsE8DTfC3Lk8u1Xmd57CNrEfY
-2KD7hqqM/DAYg6E5WkBK6BmgFRtBTfuWbb4EzaYeDPMgWSkfnDrGV5q7Eub/BmMJ
-O/xUKZYi8M0eNs9/ZaSShiyrnr16jA8cDZMnNvyJtqn3vx/tGGfYVf+H1Z8BxXPp
-5eLTyPyMTL+sgWANosOuBjt42z9EgTbmmGIWksROMUwGRsWMgo3as3RstkEJwopS
-Ll7v92HrNtNe1Fwgixg5wW+gaKStw/VcgylJPYwnsDrx2dw3fWpjZNShXmRAWTv/
-x4mmQ9tThdoRyQxBdOQdG3MqUiPC1VjfSc1oZfuDRBsy7riM5TGKncBg8PgPTt7a
-u8NpqJXvLkLSuCnXYEJDM2gwdc/q+R750aEuFaObaPgRy/Jf2kvJ3R8XxApUQ7xZ
-YpLyjwhZXipO1hJYXz6R
-=18Xg
+iF4EAREIAAYFAk7IyUgACgkQiIP6VqMIqNet1AD/fH0JS38fjcgVMty2kF76T/gR
+kYKw8P2B6ihOYiWzJOUA/RHBc1bFtsohb6TzWFdh3eGvANtumhq1JfZEHSXMAszK
+=PKoK
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/termcolor/ChangeLog b/dev-ruby/termcolor/ChangeLog
index 1f8724b78f85..5a7e94e4bdc1 100644
--- a/dev-ruby/termcolor/ChangeLog
+++ b/dev-ruby/termcolor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/termcolor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/ChangeLog,v 1.1 2011/11/13 08:21:27 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/ChangeLog,v 1.2 2011/11/20 09:30:50 graaff Exp $
+
+  20 Nov 2011; Hans de Graaff <graaff@gentoo.org> termcolor-1.2.0.ebuild:
+  Fix building with USE=doc, fix rspec dependency to right slot. Fix running
+  specs on ruby19.
 
 *termcolor-1.2.0 (13 Nov 2011)
 
diff --git a/dev-ruby/termcolor/Manifest b/dev-ruby/termcolor/Manifest
index c503dd0bac07..56bd2a8308bf 100644
--- a/dev-ruby/termcolor/Manifest
+++ b/dev-ruby/termcolor/Manifest
@@ -2,23 +2,13 @@
 Hash: SHA256
 
 DIST termcolor-1.2.0.gem 6656 RMD160 234b7c6e5fdae65febe9214442c66062908d91af SHA1 ccb19dc24757f5a2a27f948fe7bfc7a72e8a4601 SHA256 30b9f7c0f1834c2043a80d7d739e8fcf14303bed0244cb56e3a4676608bf8b67
-EBUILD termcolor-1.2.0.ebuild 715 RMD160 2929c99c8da628fadf374b5e83034074f62d4b37 SHA1 792f7ea303d906015dc9b97c361ad3126f3ee0c4 SHA256 d66b3d47b5c7df943abf45752f72c78d623fd6df5ed96e18a94f4ec876fd85b8
-MISC ChangeLog 417 RMD160 5e3468033b84d95332553a28c18af8a8e030cc22 SHA1 22c79039246501454ca11704911b93830ef15f48 SHA256 5ee0dde3a26d32e0f442d702211c525b29a35b0926c89e5a5d04a2abef4efabc
+EBUILD termcolor-1.2.0.ebuild 797 RMD160 d3e2ee4975b705a03275ffbda7e9a1b68ce915df SHA1 b2437e4e7bdd8d3f47055aff2517b72aa0e5fb1c SHA256 4926574ded542cb639e2012963cb92597bf7341b80bfb27f4a706c02094338d4
+MISC ChangeLog 589 RMD160 5349bd04497b28a273853d38c5a4298349fdfc82 SHA1 cad4c0e19a7419bcd5714c97a6096dfc99a1da8a SHA256 d0b0d3e40dfee689a1c93e6992f8b00b4c0b8dd063ab267f083e557d6b3fd248
 MISC metadata.xml 220 RMD160 7f7779deaa0be13dd0c2a42a0f368c1f427322db SHA1 f76b9fa76642a7c943c52c815428c15b4f844cfb SHA256 3876bf94339a6b2a36040fdf7eaeb1dcddff46924c02b8135f615c2d4eb1c743
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOv34LAAoJEDYO1FT4VRUUH1YP/ivBEGVap4pt7cX/EfhQiwVa
-qMeRQr/h2GllWP3zJ3FRS8znbH9Lp4RZ+V5YzZtLAg1j7Hx5XpKK9rUl9YgoiEPu
-Dzt+dSw/CIJ5CNMZYjtf/pQV+oww/VGrdnaAF0qpvLpz1rXIUAqjfjR4QnlstTm0
-PW7V4H5xxln9uOmTf9y3CVc+BpGUjeYjbDMbRDBii9fYgu5+GTdPE1V9G9gz2yx8
-dQujTvOSSmb57AWrzB9n2ddLncMqAEAg/UD4pyn/Almg8+OD7yOaqfAb3OIuFia1
-PvvPtsOPDZzvqQEK3BstvQg0zmAiXdVVIDQMKX/FSBvH2N5I7mxTsU+ylC/H/429
-N3dsiTuzs47mlWtNnfqM/2XyqEVsgmYWY7y+Xp51eKQWTObwCqTguNb3FhQmY2ch
-JgJYBkrsaorzMoKIsmEk5ABOkOAzTPe1X6zNc3P4DBk2ilR0r+P5hY7IaGxr1+NJ
-wQ0RlKi6pnfOlPq9omgPmhA+xUUCsYBesv/IKxI7mzyYpXALlpYERTVYLGoxyX1C
-610OqiE5dAoliglK7F+83rEywQqU9zCaNjkJe8vBn3k8sEMxm8ZBC8lmvDSnL8y9
-O0wH8mcJDrz0VOwBRkH+oxUlXdWjd6hvlGZPL9hBW4B8RCM2nfu4VqEXM3rgnCT1
-ridfJJEgxF0qWZqkpnnF
-=M+y5
+iF4EAREIAAYFAk7IyM8ACgkQiIP6VqMIqNeCzAD/eGY+K/OQr/urfHYmJ9XaMhPx
+taU5c3hDvTThSGvF/VUA/idGxCEpl5sVzlrGQT/34yastKwE/SIvCkxm70Lts0hE
+=YzpS
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/termcolor/termcolor-1.2.0.ebuild b/dev-ruby/termcolor/termcolor-1.2.0.ebuild
index b6a2d7f41c79..36fc5a9d97d8 100644
--- a/dev-ruby/termcolor/termcolor-1.2.0.ebuild
+++ b/dev-ruby/termcolor/termcolor-1.2.0.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/termcolor-1.2.0.ebuild,v 1.1 2011/11/13 08:21:27 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/termcolor/termcolor-1.2.0.ebuild,v 1.2 2011/11/20 09:30:50 graaff Exp $
 
 EAPI="2"
 #*** Using highline effectively in JRuby requires manually installing the ffi-ncurses gem.
 USE_RUBY="ruby18 ruby19 ree18"
 
 RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
 
 inherit ruby-fakegem
@@ -19,5 +21,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_bdepend dev-ruby/rspec
+ruby_add_bdepend "dev-ruby/rspec:0"
 ruby_add_rdepend ">=dev-ruby/highline-1.5.0"
+
+each_ruby_test() {
+	${RUBY} -S spec spec || die
+}