From a753ca6fb13122cc86689601affb927dc3742b19 Mon Sep 17 00:00:00 2001
From: Hans de Graaff <graaff@gentoo.org>
Date: Sat, 16 Jun 2012 05:59:23 +0000
Subject: Don't run memcache tests, bug 332919. Add ree18.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
---
 dev-ruby/moneta/ChangeLog              |  7 +++++--
 dev-ruby/moneta/Manifest               | 12 ++++++------
 dev-ruby/moneta/moneta-0.6.0-r1.ebuild | 16 +++++++++++-----
 3 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'dev-ruby/moneta')

diff --git a/dev-ruby/moneta/ChangeLog b/dev-ruby/moneta/ChangeLog
index 0afb5e2972af..8e7455a054c2 100644
--- a/dev-ruby/moneta/ChangeLog
+++ b/dev-ruby/moneta/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/moneta
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/moneta/ChangeLog,v 1.4 2010/10/09 08:42:23 graaff Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/moneta/ChangeLog,v 1.5 2012/06/16 05:59:23 graaff Exp $
+
+  16 Jun 2012; Hans de Graaff <graaff@gentoo.org> moneta-0.6.0-r1.ebuild:
+  Don't run memcache tests, bug 332919. Add ree18.
 
   09 Oct 2010; Hans de Graaff <graaff@gentoo.org> moneta-0.6.0-r1.ebuild:
   Depend on rspec-1.
diff --git a/dev-ruby/moneta/Manifest b/dev-ruby/moneta/Manifest
index a256c91b8823..2f22fa18e047 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 AUX moneta-0.6.0-optional-memcache.patch 918 RMD160 3ba2aeba309da2c8f1a243ba3c873461ebb40c19 SHA1 f2d5b141904a9986c2683cc6c613b9ec30e06439 SHA256 9db9c349b2e7dcbdbf5c49a9315ab3df3f54d6169829478fdd4c1fe1e9888037
 DIST moneta-0.6.0.tgz 13721 RMD160 996ec677d6f5969cde8007da8d0e6b4efb31d31f SHA1 dbc69578dcb9b05001e86fbc4242ccef9d2318e1 SHA256 a0bd0b18b1b3ce0580f06c1f5abe3c944f2eaea7043793e77b77d7a883878464
-EBUILD moneta-0.6.0-r1.ebuild 749 RMD160 ecfec14e2b4e61fb1a0b415952351a4c1e9f89ce SHA1 b300892778c09d5b58c8ce40a43bbafcc1035c6a SHA256 f8a856d57bc9468d7801203745316d26b8a63e918c54561e85dbda4badc92af3
-MISC ChangeLog 746 RMD160 49302d3ff1a2311565cf68dd71fb2afaadea9c23 SHA1 95458d1719520ef9d2fbd99915572afac4a4ebf9 SHA256 f55cc300a72ecc13b8f861d514a4aa5a4486f163a5465c9157cd64d17a83e2de
+EBUILD moneta-0.6.0-r1.ebuild 941 RMD160 c8f5d47fa88454158b49e44e4b5ea7c1801bb67a SHA1 1d59490e33a3788e302ae6c1e6314bff0b0287c8 SHA256 2a4e659c152e5814a38be5392c57d3a05ed45f7a2706838230d482f14e84bae9
+MISC ChangeLog 872 RMD160 2644c598248f2140073aa69fc84f9e1bc5120e15 SHA1 3a67f28402d2f30fc096caa584af7b8728335fe7 SHA256 ec834bf3b3a9629d0ec514bb669b6f7d07af965cb61a6feb0c023e27ce018bb5
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAkywKvUACgkQZihJkut28StKDAD6A+f+pXCakiYA97k82NGQ6oUu
-10ZplBnio7ams3irlCgA/3aBE3g9ebWjDh9hh6EyctWPjl2zDhLq1qJKVY65dTIl
-=dGrG
+iF4EAREIAAYFAk/cIMEACgkQiIP6VqMIqNcPGAD+JCAp3YuIeAwzdYqBqyQDa84w
+x2ZoRBJgsM0ywgFU36gA/iHRruNU6SEvMh7QepGybZcLf3Dy36QiNY/4ku6XYidJ
+=Z7Ih
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/moneta/moneta-0.6.0-r1.ebuild b/dev-ruby/moneta/moneta-0.6.0-r1.ebuild
index 6afaf3e85cfa..78daf6d6a853 100644
--- a/dev-ruby/moneta/moneta-0.6.0-r1.ebuild
+++ b/dev-ruby/moneta/moneta-0.6.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/moneta/moneta-0.6.0-r1.ebuild,v 1.2 2010/10/09 08:42:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/moneta/moneta-0.6.0-r1.ebuild,v 1.3 2012/06/16 05:59:23 graaff Exp $
 
-EAPI="2"
-USE_RUBY="ruby18"
+EAPI="4"
+USE_RUBY="ruby18 ree18"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST="spec"
@@ -23,8 +23,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-S="${WORKDIR}/${GITHUB_USER}-${PN}-*"
+RUBY_S="${GITHUB_USER}-${PN}-*"
 
 RUBY_PATCHES=( "${P}-optional-memcache.patch" )
 
 ruby_add_bdepend "test? ( dev-ruby/rspec:0 )"
+
+all_ruby_prepare() {
+	# Remove non-optional memcache spec because we cannot guarantee that
+	# a memcache will be running to test against, bug 332919
+	rm spec/moneta_memcache_spec.rb || die
+}
-- 
cgit v1.2.3-65-gdbad