Fix tests when Rails 3 components are installed.

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

4 files changed, 70 insertions, 6 deletions

diff --git a/dev-ruby/cerberus/ChangeLog b/dev-ruby/cerberus/ChangeLog
index fab2e4885f90..cc43eeab2a1e 100644
--- a/dev-ruby/cerberus/ChangeLog
+++ b/dev-ruby/cerberus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/cerberus
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cerberus/ChangeLog,v 1.13 2010/11/06 09:57:31 graaff Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cerberus/ChangeLog,v 1.14 2011/01/24 18:38:31 graaff Exp $
+
+*cerberus-0.7.8-r1 (24 Jan 2011)
+
+  24 Jan 2011; Hans de Graaff <graaff@gentoo.org> +cerberus-0.7.8-r1.ebuild,
+  +files/cerberus-0.7.8-rails3.patch:
+  Fix tests when Rails 3 components are installed.
 
   06 Nov 2010; Hans de Graaff <graaff@gentoo.org> cerberus-0.7.8.ebuild:
   Add missing indirect dependency on dev-ruby/json, fixing bug 319241.
diff --git a/dev-ruby/cerberus/Manifest b/dev-ruby/cerberus/Manifest
index 630bd39d4237..6d13e8d50344 100644
--- a/dev-ruby/cerberus/Manifest
+++ b/dev-ruby/cerberus/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cerberus-0.7.8-rails3.patch 635 RMD160 97f9a7f7116bdee52fcb133535cc9ed9613cef04 SHA1 ac1cfb9dba0e3d47d491d7ec4cbb8e6048d8c3e7 SHA256 c0fce500ce3b1c6230beca17930105668355b0ef3bb7c1a4b077e5aab8d5a751
 DIST cerberus-0.7.6.gem 254464 RMD160 cb9b3d0065c72bf99d8bab80ea062b6d4baaa420 SHA1 c839fe10c75443f9699240041c2e8c2b33737357 SHA256 6ff85294921a8e0ec3665dcbb91169ea3d810d272551c299643270ea50b80568
 DIST cerberus-0.7.8.gem 387072 RMD160 00905189d923cfba956b37ed8babdbf298d787d1 SHA1 4910ef8eec36f328a958b42084219001f0e4056a SHA256 c6a79fda47e52ee81e9102036702d79f8160374509923817fcf703fab9111516
 EBUILD cerberus-0.7.6.ebuild 957 RMD160 fd6b2278558c6c876b3543abd866ee5dbade9f60 SHA1 9524d66bde9a25c3635d930df86a5353678b5eb0 SHA256 9119d10ec11f75562c014e1b9cc3c3cf1c595d37e1ef2d9fa560cba81232aaf5
+EBUILD cerberus-0.7.8-r1.ebuild 1112 RMD160 d7beea87859c60618a8efbb13eef5ffd525d89c0 SHA1 0aa0278e146860e7512d3bbb2bfa4501b92e3bf4 SHA256 66ea0ecb3bfc463e00618af8865b92faa39ea9dcff4fe2c7b2a0fd28963369fd
 EBUILD cerberus-0.7.8.ebuild 1038 RMD160 d3e283aaf81aa4353789ad574b8e3f66856e9b59 SHA1 bf76d014fed7130c41d7103828e048fb21970d70 SHA256 c342307bd2a24972e00cd1192eca49c525c8c23f5e112d0df1a4567d9e8fca19
-MISC ChangeLog 1883 RMD160 b9e584e4f7a77343334b5c01c67356f33c5905b4 SHA1 c0f93f65d47023e79518716d6dc970443cffafec SHA256 4b2723092c27e667580f6dbbafaf31f5736d0c294c39c32c5ec79d04ff6917d1
+MISC ChangeLog 2084 RMD160 0f7c15300c7a9eecfcae5330fd9a2d98d9db226a SHA1 c518fb21d99ce9c9474ee9cd20b77e1f0c7e536d SHA256 d56c5036ecd79711913755b1f797b5117863e50091f5cb925f11f90b126233b9
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkzVJpYACgkQZihJkut28SuA+AD/aUOQLBaU5MNS9+fAthYQZ7OI
-amh0N0RaLeokxwoZ/58BAKwfaf2NdTPzZt1y2yN1AFjZoUf67UXnmz+iRFdYz9+E
-=Y6hS
+iF4EAREIAAYFAk09xywACgkQrnu0mw69JkrZsQD/bV6sZH+3zMagi6+93J6oEYLA
+IM+XSNnhhrXF3dZ8eFYA/RDTPoQbh1D72KZAJVKukev323j2+04JnOTZldGXfV9a
+=j/Dz
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/cerberus/cerberus-0.7.8-r1.ebuild b/dev-ruby/cerberus/cerberus-0.7.8-r1.ebuild
new file mode 100644
index 000000000000..9824889da9e4
--- /dev/null
+++ b/dev-ruby/cerberus/cerberus-0.7.8-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/cerberus/cerberus-0.7.8-r1.ebuild,v 1.1 2011/01/24 18:38:31 graaff Exp $
+
+EAPI="2"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Authors.txt Changelog.txt Readme.markdown"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Continuous Integration tool for ruby projects"
+HOMEPAGE="http://rubyforge.org/projects/cerberus"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# The json dependency is indirect via the vendored twitter code.
+ruby_add_rdepend "=dev-ruby/actionmailer-2*
+	=dev-ruby/activesupport-2*
+	>=dev-ruby/rake-0.7.3
+	dev-ruby/json"
+
+ruby_add_bdepend "test? ( virtual/ruby-test-unit dev-ruby/rubyzip )"
+
+DEPEND="${DEPEND} test? ( dev-vcs/subversion )"
+RDEPEND="${RDEPEND}"
+
+# TODO: cerberus bundles several packages: addressable, shout-bot,
+# tinder, twitter, and xmpp4r. Some of these are very
+# version-dependant, so it is not easy to determine whether they can
+# be unbundeled.
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-rails3.patch )
diff --git a/dev-ruby/cerberus/files/cerberus-0.7.8-rails3.patch b/dev-ruby/cerberus/files/cerberus-0.7.8-rails3.patch
new file mode 100644
index 000000000000..af517bdc0e0b
--- /dev/null
+++ b/dev-ruby/cerberus/files/cerberus-0.7.8-rails3.patch
@@ -0,0 +1,19 @@
+--- test/functional_test.rb.~1~	2011-01-24 19:17:41.810305565 +0100
++++ test/functional_test.rb	2011-01-24 19:21:52.210621962 +0100
+@@ -2,6 +2,7 @@
+ require 'mock/marshmallow'
+ require 'cerberus/cli'
+ 
++gem 'actionmailer', '~> 2.0' 
+ require 'action_mailer'
+ 
+ class FunctionalTest < Test::Unit::TestCase
+--- lib/cerberus/publisher/mail.rb.~1~	2011-01-24 19:23:12.330407808 +0100
++++ lib/cerberus/publisher/mail.rb	2011-01-24 19:24:49.131814237 +0100
+@@ -1,4 +1,6 @@
+ require 'rubygems'
++gem 'activesupport', '~>2.0'
++gem 'actionpack', '~>2.0'
+ gem 'actionmailer', '~> 2.0' 
+ require 'action_mailer'
+ require 'cerberus/publisher/base'