From c31170adedb4414c06b846a68d3f6e701c25fdbd Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Wed, 30 Jun 2010 19:17:22 +0000 Subject: [PATCH] Fix tests by adding a dependency on dev-ruby/erubis, bug 326303. Restrict tests in haml-3.0.13 and fix them in -r1. Drop ppc, ppc64 keywords for -r1 due to new dependency: bug 326353. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- dev-ruby/haml/ChangeLog | 10 ++++++- dev-ruby/haml/Manifest | 11 ++++---- dev-ruby/haml/haml-3.0.13-r1.ebuild | 41 +++++++++++++++++++++++++++++ dev-ruby/haml/haml-3.0.13.ebuild | 4 ++- 4 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 dev-ruby/haml/haml-3.0.13-r1.ebuild diff --git a/dev-ruby/haml/ChangeLog b/dev-ruby/haml/ChangeLog index 1c02f6f0e696..9ce380a69b80 100644 --- a/dev-ruby/haml/ChangeLog +++ b/dev-ruby/haml/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-ruby/haml # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.44 2010/06/25 20:06:29 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/ChangeLog,v 1.45 2010/06/30 19:17:22 graaff Exp $ + +*haml-3.0.13-r1 (30 Jun 2010) + + 30 Jun 2010; Hans de Graaff haml-3.0.13.ebuild, + +haml-3.0.13-r1.ebuild: + Fix tests by adding a dependency on dev-ruby/erubis, bug 326303. Restrict + tests in haml-3.0.13 and fix them in -r1. Drop ppc, ppc64 keywords for -r1 + due to new dependency: bug 326353. *haml-3.0.13 (25 Jun 2010) diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest index adf00d581831..16ef69d614d7 100644 --- a/dev-ruby/haml/Manifest +++ b/dev-ruby/haml/Manifest @@ -4,13 +4,14 @@ Hash: SHA256 DIST haml-2.2.24.gem 155136 RMD160 012d918ca6e46842e71419623785c4cf4d17fe6b SHA1 2f1a689ea66935342d90df3b80ffeabcaaae891b SHA256 cdea73e3ed3c65d68b6431bfc80765c88c4c2bfe21516ff895f284eeb98c0bf9 DIST haml-3.0.13.gem 516608 RMD160 f6010befb1fda9579a760a470baed42313289433 SHA1 bdd5a1cd25f61706362cf6b38e7b3930711b4c5f SHA256 6c0194f495208b5764606fe39b743bfad398eaf13cb825f9dd330c5ffe227b4c EBUILD haml-2.2.24.ebuild 1135 RMD160 0cce30570efc32cc183008c0ca12b9e745a114c5 SHA1 e3770c88e9007517dae2a8f04ed87af042136168 SHA256 8921e8e475395b4642c25b13bf2d05b3b39801e2c7991f08d0adb18fc3f4a96b -EBUILD haml-3.0.13.ebuild 923 RMD160 4c8928679db44780809061c3df1e3aa830c6f33c SHA1 31054d97b97e6798e08c9d000b383681f2f3e537 SHA256 07a11e3c34a68350020abaa25caad50b0f2732ccbf291caaabc775b9f3d50ea0 -MISC ChangeLog 6171 RMD160 4ee4bdaf63db1dfcf2baaaaec06e8839bc34cf0d SHA1 9d6651fea9001299706d197337d13f36b1bb0d6a SHA256 d0149bbb410794f9368d5c7099af8eb357aa0ef196143c5e93a5cd53d84406cd +EBUILD haml-3.0.13-r1.ebuild 932 RMD160 3c4e4dfa23189ef10b75feed2e104eb3a6150203 SHA1 4d617ec89a26538759f86b99f18fc7a9aead3e9a SHA256 b7818c16a2b24bca90862d6996a990a003ddba01b673ae8deb5cef075fea7199 +EBUILD haml-3.0.13.ebuild 940 RMD160 8562a6e407870b9275df224c0ef32e56f11023e1 SHA1 91e58b552722b81a422daddf0ffa05d1a54db832 SHA256 034d9477d4838b688dda89bd675e699bb980c445e1cd1b06110d96f23384e1a0 +MISC ChangeLog 6489 RMD160 256fd1917dd0af413fc09f97a768581e26b98182 SHA1 e7d87cb07b96bcafb78fa9694cb60cb9f868886e SHA256 cd7940a166bf267dad0ea739bdb173b3862baf104d3969a837382ca2ffff7b9a MISC metadata.xml 219 RMD160 c4f05e85bd9645a64124d3847da25522de568428 SHA1 13b624bb74ad54c50dd466cb811f39ed171fe913 SHA256 670b7642b3830f31d24a317577d842b3499592b6e9a6283312b89c59397a2932 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iF4EAREIAAYFAkwlDEoACgkQZihJkut28St0JAD/X5G6GucxLFSljOoXKaHAVrLJ -fHDhHtuGIYGiQ7hq4X4A/A9OAVT+PKc7qWsGY+NbVGnkZzJcXnoURL9vaQf52ifd -=+muG +iF4EAREIAAYFAkwrmEgACgkQZihJkut28Su4awEAwi1NR3nHceMW+xeF8s1CcZg8 +MaE4CYQrKa1murZUp2EBANNJmqRiN+scptfaXwbOv2Uoi1aEcY2teGVAyKJaPxoY +=iT9Z -----END PGP SIGNATURE----- diff --git a/dev-ruby/haml/haml-3.0.13-r1.ebuild b/dev-ruby/haml/haml-3.0.13-r1.ebuild new file mode 100644 index 000000000000..c4fb3ef8cbc7 --- /dev/null +++ b/dev-ruby/haml/haml-3.0.13-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-3.0.13-r1.ebuild,v 1.1 2010/06/30 19:17:22 graaff Exp $ + +EAPI=2 + +USE_RUBY="ruby18" + +RUBY_FAKEGEM_TASK_DOC="doc" + +RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING README.md" +RUBY_FAKEGEM_DOCDIR="doc" + +RUBY_FAKEGEM_EXTRAINSTALL="init.rb VERSION VERSION_NAME" + +inherit ruby-fakegem + +DESCRIPTION="HAML - a ruby web page templating engine" +HOMEPAGE="http://haml.hamptoncatlin.com/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# TODO: haml has some emacs modes that it could be installing, in case +IUSE="" + +# The html engine requires hpricot +ruby_add_rdepend dev-ruby/hpricot + +# It could use merb during testing as well, but it's not mandatory +ruby_add_bdepend " + test? ( + virtual/ruby-test-unit + dev-ruby/erubis + dev-ruby/actionpack + ) + doc? ( + dev-ruby/yard + dev-ruby/maruku + )" diff --git a/dev-ruby/haml/haml-3.0.13.ebuild b/dev-ruby/haml/haml-3.0.13.ebuild index 6a704d0aac31..cc18094d6586 100644 --- a/dev-ruby/haml/haml-3.0.13.ebuild +++ b/dev-ruby/haml/haml-3.0.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-3.0.13.ebuild,v 1.1 2010/06/25 20:06:29 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/haml/haml-3.0.13.ebuild,v 1.2 2010/06/30 19:17:22 graaff Exp $ EAPI=2 @@ -25,6 +25,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" # TODO: haml has some emacs modes that it could be installing, in case IUSE="" +RESTRICT="test" + # The html engine requires hpricot ruby_add_rdepend dev-ruby/hpricot -- 2.26.2