summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-02-15 21:41:12 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-02-15 21:41:12 +0000
commit7a6a737aa7cb1f74a6fa2218bdbbb34585619de1 (patch)
treee0bbf55729f299c0db8f74fb2aedb8ff1c2093d8 /dev-ruby/bacon
parentadded warning, removed unnecessary quotes (diff)
downloadhistorical-7a6a737aa7cb1f74a6fa2218bdbbb34585619de1.tar.gz
historical-7a6a737aa7cb1f74a6fa2218bdbbb34585619de1.tar.bz2
historical-7a6a737aa7cb1f74a6fa2218bdbbb34585619de1.zip
Add patch from upstream git to fix tests with Ruby 1.9.2 (closes bug #332879).
Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/bacon')
-rw-r--r--dev-ruby/bacon/ChangeLog9
-rw-r--r--dev-ruby/bacon/Manifest15
-rw-r--r--dev-ruby/bacon/bacon-1.1.0-r1.ebuild6
-rw-r--r--dev-ruby/bacon/files/bacon-1.1.0+ruby-1.9.2.patch21
4 files changed, 45 insertions, 6 deletions
diff --git a/dev-ruby/bacon/ChangeLog b/dev-ruby/bacon/ChangeLog
index 1e2ea9140427..03d724b6dcc2 100644
--- a/dev-ruby/bacon/ChangeLog
+++ b/dev-ruby/bacon/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-ruby/bacon
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bacon/ChangeLog,v 1.4 2010/10/02 17:40:48 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bacon/ChangeLog,v 1.5 2011/02/15 21:41:12 flameeyes Exp $
+
+ 15 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org> bacon-1.1.0-r1.ebuild,
+ +files/bacon-1.1.0+ruby-1.9.2.patch:
+ Add patch from upstream git to fix tests with Ruby 1.9.2 (closes bug
+ #332879).
02 Oct 2010; Raúl Porcel <armin76@gentoo.org> bacon-1.1.0-r1.ebuild:
Add ~ia64/~sparc wrt #338013
diff --git a/dev-ruby/bacon/Manifest b/dev-ruby/bacon/Manifest
index a46d733a61e9..faa7dc817b39 100644
--- a/dev-ruby/bacon/Manifest
+++ b/dev-ruby/bacon/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bacon-1.1.0+ruby-1.9.2.patch 631 RMD160 e79b7e2beb31c580f4d8c6183ecd36439004b2aa SHA1 7cb2df288b16c7b1295f8818560db1f1cbfe3f29 SHA256 bd23385776c1993a92b1f69e5da1500aef222c06ff14364cf75b778bf6248b2d
DIST bacon-1.1.0.gem 16384 RMD160 9fd6c78b2ba9b2bf2ccb8b6bd086e1341a46172c SHA1 42299aba12599640847b391c779bf222a22fafd2 SHA256 1546f5a2f428fb34b3d6c445883c1490d1fe6ef198cd1ac895fad572af5b20dd
-EBUILD bacon-1.1.0-r1.ebuild 529 RMD160 d5d50fdb982a69551a68b2d65a13cbb9aa67e887 SHA1 22f68dfa5de3fdb0fabac9c9412a492113840435 SHA256 c86145f4ce012c5b72d5a1fd9f60dbfb753741e3d3633b5fa154335017b5ebfa
+EBUILD bacon-1.1.0-r1.ebuild 581 RMD160 2e46cdc2b108c37c1dc92036c34216206e76f997 SHA1 034550e129ae3ee23da0ca752955c2bb7307da03 SHA256 d5b663409f63a9e076979c6e0a5518d4fa163bed5cdff02ce622cf4a8c7a5b26
EBUILD bacon-1.1.0.ebuild 509 RMD160 f7a4e7cc040cc7519be3c3cbee719066af284c75 SHA1 7d761d91a392447a573fc13d1c7b74d368342e97 SHA256 33828e2c37b7f965c29fc646836f2d71de6e9a5e4afea8e2721ddc6098ebffe2
-MISC ChangeLog 771 RMD160 1ef2135819ab22f569934f949a1e2da958f47cdc SHA1 84f4a91679a737ff6d05a772d54f9997046aba3a SHA256 2a30c60441c14e159f447fc5d9b5cb257e219a751a9932888350495afeff5bf4
+MISC ChangeLog 975 RMD160 68923c354a7f3a760af3fc5a837d4784d7a3888e SHA1 531d75888783e7a17c9aca169991d5731257c381 SHA256 348f82eeac09a68ec8120ec91717870e442432d654c8b138132843711bf6966f
MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1a8xoACgkQAiZjviIA2XjUeACg3CGVYrarZkyaksRy1yYMRJLn
+u/0AoMIfZdTsoonxISb/PNH+HEnkAnkO
+=M/FI
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/bacon/bacon-1.1.0-r1.ebuild b/dev-ruby/bacon/bacon-1.1.0-r1.ebuild
index 8765a1ba8a86..886bed6f00f8 100644
--- a/dev-ruby/bacon/bacon-1.1.0-r1.ebuild
+++ b/dev-ruby/bacon/bacon-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bacon/bacon-1.1.0-r1.ebuild,v 1.2 2010/10/02 17:40:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bacon/bacon-1.1.0-r1.ebuild,v 1.3 2011/02/15 21:41:12 flameeyes Exp $
EAPI=2
USE_RUBY="ruby18 ruby19 ree18 jruby"
@@ -17,3 +17,5 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
IUSE=""
+
+RUBY_PATCHES="${FILESDIR}/${P}+ruby-1.9.2.patch"
diff --git a/dev-ruby/bacon/files/bacon-1.1.0+ruby-1.9.2.patch b/dev-ruby/bacon/files/bacon-1.1.0+ruby-1.9.2.patch
new file mode 100644
index 000000000000..36f7c7919738
--- /dev/null
+++ b/dev-ruby/bacon/files/bacon-1.1.0+ruby-1.9.2.patch
@@ -0,0 +1,21 @@
+Filtered from upstream commit bc0df844c7b20f30e456c493e086a9a871471550
+Author: Eloy Duran <eloy.de.enige@gmail.com>
+Date: Mon Aug 31 23:36:56 2009 +0200
+
+--- a/test/spec_bacon.rb
++++ b/test/spec_bacon.rb
+@@ -1,5 +1,5 @@
+ $-w,w = nil, $-w
+-require File.join(File.dirname(__FILE__), '../lib/bacon')
++require File.expand_path('../../lib/bacon', __FILE__)
+ $-w = w
+
+ # Hooray for meta-testing.
+--- a/test/spec_should.rb
++++ b/test/spec_should.rb
+@@ -1,4 +1,4 @@
+-require File.join(File.dirname(__FILE__), '../lib/bacon')
++require File.expand_path('../../lib/bacon', __FILE__)
+
+ describe "#should shortcut for #it('should')" do
+