From b144265659d86a90e4c1965fd5634d960e8f7edc Mon Sep 17 00:00:00 2001
From: Hans de Graaff <graaff@gentoo.org>
Date: Mon, 28 Nov 2011 19:24:33 +0000
Subject: Remove RDoc tests due to compatibility issues. Add nokogiri
 dependency for tests, fixing bug 351448.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
---
 dev-ruby/tilt/ChangeLog         |  6 +++++-
 dev-ruby/tilt/Manifest          | 10 +++++-----
 dev-ruby/tilt/tilt-1.3.2.ebuild | 10 ++++++++--
 3 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'dev-ruby/tilt')

diff --git a/dev-ruby/tilt/ChangeLog b/dev-ruby/tilt/ChangeLog
index 8b2618159af2..e7ffa0fdafb3 100644
--- a/dev-ruby/tilt/ChangeLog
+++ b/dev-ruby/tilt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/tilt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.15 2011/11/28 19:16:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.16 2011/11/28 19:24:33 graaff Exp $
+
+  28 Nov 2011; Hans de Graaff <graaff@gentoo.org> tilt-1.3.2.ebuild:
+  Remove RDoc tests due to compatibility issues. Add nokogiri dependency for
+  tests, fixing bug 351448.
 
   28 Nov 2011; Hans de Graaff <graaff@gentoo.org> -tilt-1.3.ebuild,
   -tilt-1.3.1.ebuild:
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index ea3a0992aa8c..e6ebd18b41f4 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -5,13 +5,13 @@ AUX tilt-1.3.2-thread_id.patch 830 RMD160 8cec792f32ca7352ccb210c2cf96d2a267ff73
 DIST tilt-1.2.2.gem 28672 RMD160 cbb16b94f1aabc6cdc9d2a60cd1af4294d748ddf SHA1 2ed7f6a5ecdf9ec0108e1e8145e67cd26f82ebd3 SHA256 3eb7036985b2a1ee9b27401cbe3b3723e48d092563f212dcd712d4b8e2198eac
 DIST tilt-1.3.2.gem 34304 RMD160 a6fd229332676ced3f9810ee2b9c5b1e4295248b SHA1 afe9478c001f9d193c54fd254d3214bc940bc2cc SHA256 c7e69202794bdfde34395f596023309a3a45725bb292b4c04dba69a5f32f7071
 EBUILD tilt-1.2.2.ebuild 781 RMD160 433422bf543405a6a0a929c9fd2606a7b83ee00d SHA1 7307a0932d31e6b99d4717a180b56ff349e2e479 SHA256 c7b5d1116f361fee3e03b6660da2337acd43b835b4996ec2279ad0b428897666
-EBUILD tilt-1.3.2.ebuild 862 RMD160 674892804cce049b4a4d308f124aaec92dc9434a SHA1 2834431c6caab0d166cbfe8ecd354ff8fc6b022e SHA256 470aa1a9176c8b524a4028899469135a3ad073283b88df8ae9cf696de53c0f43
-MISC ChangeLog 2042 RMD160 9a5487f5bf7dcb3f8982537a4c5c2ae9e9061767 SHA1 4594e04f56b0569a5773a47ef1390d97367b6a4b SHA256 07fd891647cc2bcda18464d5af88b077d3fcdee0b3336a927c2c37132547de57
+EBUILD tilt-1.3.2.ebuild 1036 RMD160 fb378e135e825f850d4d99a65ffee29ed02d574d SHA1 b377fb89289eab573fa0e3a4c9241b88ccce9600 SHA256 2b98594deabbc89a7783436ffc602c66f786501ddecc6a4ae6b01a218c203760
+MISC ChangeLog 2217 RMD160 5b9f92987f64fd22b9fc303a9dfd64f4fc1ed797 SHA1 b53debc8b512b42c2972ab879db76685a59db067 SHA256 40bbb1939f1d47f046727a00fd65b4ff25145191dfe0c5ed759dbec0b3c93f95
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7T3fYACgkQiIP6VqMIqNdBVAD+LIEpsGqJvdDA287lwwKl2jqI
-y4yAGqCqn1xH4pcEJtkA/1UFQxJMAvk1KbDDodFkXVvh8H2eAQ/uV0ZmVuUczG0e
-=Zmr0
+iF4EAREIAAYFAk7T3/YACgkQiIP6VqMIqNcjrAD/aDaa5RTe/yF/Hmu39pw89nYG
+9D6RcV/To5+IrKx8B60A/iCZIngTQ89zHi1u0rVz2VAH4fQvpfzUOaUuF6dakI39
+=3MkT
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/tilt/tilt-1.3.2.ebuild b/dev-ruby/tilt/tilt-1.3.2.ebuild
index 1fe216c93eb8..4a915191a845 100644
--- a/dev-ruby/tilt/tilt-1.3.2.ebuild
+++ b/dev-ruby/tilt/tilt-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.3.2.ebuild,v 1.4 2011/08/07 14:28:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.3.2.ebuild,v 1.5 2011/11/28 19:24:33 graaff Exp $
 
 EAPI=2
 
@@ -22,9 +22,15 @@ IUSE=""
 
 RUBY_PATCHES=( "${P}-thread_id.patch" )
 
-ruby_add_bdepend "test? ( virtual/ruby-test-unit )"
+ruby_add_bdepend "test? ( virtual/ruby-test-unit dev-ruby/nokogiri )"
 ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
 
 # Tests fail when markaby is not new enough, but it's optional.
 DEPEND="${DEPEND} !!<dev-ruby/markaby-0.6.9-r1"
 RDEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	# Remove rdoc template tests since these are no longer compatible
+	# with newer versions.
+	rm test/tilt_rdoctemplate_test.rb || die
+}
-- 
cgit v1.2.3-65-gdbad