From: Hans de Graaff Date: Mon, 19 Sep 2011 18:33:51 +0000 (+0000) Subject: Frob build system so that we don't need rspec just to build the documentation. Fixes... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=966df0ab77433c4b356be44831a6a9f75f18655a;p=gentoo.git Frob build system so that we don't need rspec just to build the documentation. Fixes bug 383611. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- diff --git a/dev-ruby/addressable/ChangeLog b/dev-ruby/addressable/ChangeLog index b61d3e152193..c333499a5e94 100644 --- a/dev-ruby/addressable/ChangeLog +++ b/dev-ruby/addressable/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/addressable # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/addressable/ChangeLog,v 1.18 2011/09/19 18:25:18 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/addressable/ChangeLog,v 1.19 2011/09/19 18:33:51 graaff Exp $ + + 19 Sep 2011; Hans de Graaff addressable-2.2.6.ebuild: + Frob build system so that we don't need rspec just to build the + documentation. Fixes bug 383611. 19 Sep 2011; Hans de Graaff -addressable-2.2.4.ebuild, -addressable-2.2.5.ebuild: diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest index 770a80139b21..3c26e9b622d9 100644 --- a/dev-ruby/addressable/Manifest +++ b/dev-ruby/addressable/Manifest @@ -2,13 +2,13 @@ Hash: SHA256 DIST addressable-2.2.6.gem 97792 RMD160 52df9776570df16e4014f3add8799269ed506c0c SHA1 0b46d26336521fdc1843a5efc515b8102ef8a60c SHA256 c12fc812b582cc11f54da1fbee366d5fa944359ce1e9ad5d3098b57ab883b23f -EBUILD addressable-2.2.6.ebuild 918 RMD160 aed08f0c6ef99e68a4e13f23efef5c47d2268360 SHA1 f3240887b93d52335ca21a195167289d3b890478 SHA256 f0109e268fc075310087f5ddd56b08e71d9a9b598eb5460d1aa9db6322e1028a -MISC ChangeLog 2805 RMD160 63abaf4d9a292c1e23175d58890715c29f457034 SHA1 d30405181edb2a86053404ce032342659d76b12d SHA256 d381180b6bdca1b9f6cdd400e192f62b240577388959c0abbea1ab6f70c04206 +EBUILD addressable-2.2.6.ebuild 1159 RMD160 e6fa4789c0243da95263f3cdbef36fec17196286 SHA1 7dad689b2a273f3177f641df815c0d81582d2800 SHA256 9d2010f5e178040da15e0db83034e39912ffb3e5d9d6848999fe6ed8bdb5f704 +MISC ChangeLog 2983 RMD160 afdc09b5778c1bb3eeb5635f8260b79df89eedce SHA1 6cb7b966538c6173acb397bfffdda5cd7bcb46ae SHA256 b7aeb0da3697cfdd591b2a742b338d325abfea0c30b4c9d43a553f878c77847c MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk53iRkACgkQiIP6VqMIqNfa9AEAkwIxAytYxIc4wXB+tWzgjvlI -DDLJraJ9s75/DZuxZnwA/0VinOtGuU7buFId3xBbzkh8OHsRwRF+EF3w34QwiOsM -=HGwT +iF4EAREIAAYFAk53ixUACgkQiIP6VqMIqNd3bQEAlqp+4zgMc9HyV9xHoIki+dHs +fPMncOU8hn1lQUZf+2kA/jZguy9y2Fm7trDOcm8o1OrK5zLH3LJ7VLksJXB0KfIv +=K/32 -----END PGP SIGNATURE----- diff --git a/dev-ruby/addressable/addressable-2.2.6.ebuild b/dev-ruby/addressable/addressable-2.2.6.ebuild index ce5e2c4da58e..821651e78269 100644 --- a/dev-ruby/addressable/addressable-2.2.6.ebuild +++ b/dev-ruby/addressable/addressable-2.2.6.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/addressable/addressable-2.2.6.ebuild,v 1.1 2011/05/13 06:25:34 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/addressable/addressable-2.2.6.ebuild,v 1.2 2011/09/19 18:33:51 graaff Exp $ EAPI=2 USE_RUBY="ruby18 ruby19 jruby ree18" @@ -24,13 +24,20 @@ IUSE="" ruby_add_bdepend "test? ( dev-ruby/rspec:0 )" +all_ruby_prepare() { + # Remove spec-related tasks so that we don't need to require rspec + # just to build the documentation, bug 383611. + sed -i -e '/spectask/d' Rakefile || die + rm tasks/spec.rake || die +} + each_ruby_test() { case ${RUBY} in *jruby) ewarn "Tests disabled because they crash jruby." ;; *) - each_fakegem_test + ${RUBY} -I lib -S spec spec || die "Tests failed." ;; esac }