Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/moneta/files/
Date: Mon, 31 Oct 2016 12:10:07
Message-Id: 1477915211.ba9e52e8e8cca88f1133533c1c9a7484a009a93b.monsieurp@gentoo
1 commit: ba9e52e8e8cca88f1133533c1c9a7484a009a93b
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Sep 26 16:20:24 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 31 12:00:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba9e52e8
7
8 dev-ruby/moneta: remove unused patch.
9
10 Closes: https://github.com/gentoo/gentoo/pull/2417
11
12 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
13
14 .../files/moneta-0.6.0-optional-memcache.patch | 30 ----------------------
15 1 file changed, 30 deletions(-)
16
17 diff --git a/dev-ruby/moneta/files/moneta-0.6.0-optional-memcache.patch b/dev-ruby/moneta/files/moneta-0.6.0-optional-memcache.patch
18 deleted file mode 100644
19 index 382d073..00000000
20 --- a/dev-ruby/moneta/files/moneta-0.6.0-optional-memcache.patch
21 +++ /dev/null
22 @@ -1,30 +0,0 @@
23 -commit f24e8010e01449648f1d1e28cb325bde21bfdaed
24 -Author: Hans de Graaff <hans@××××××××.org>
25 -Date: Thu Jul 8 20:37:26 2010 +0200
26 -
27 - Fix case where both memcached and memcache are not present.
28 -
29 - The second require attempt will also generate a LoadError if memcache is not
30 - present, so this requires an extra block to rescue that error.
31 -
32 -diff --git a/lib/moneta/memcache.rb b/lib/moneta/memcache.rb
33 -index 5cf8c02..4e2f9d6 100644
34 ---- a/lib/moneta/memcache.rb
35 -+++ b/lib/moneta/memcache.rb
36 -@@ -2,10 +2,12 @@ begin
37 - require "memcached"
38 - MemCache = Memcached
39 - rescue LoadError
40 -- require "memcache"
41 --rescue
42 -- puts "You need either the `memcached` or `memcache-client` gem to use the Memcache moneta store"
43 -- exit
44 -+ begin
45 -+ require "memcache"
46 -+ rescue LoadError
47 -+ puts "You need either the `memcached` or `memcache-client` gem to use the Memcache moneta store"
48 -+ exit
49 -+ end
50 - end
51 -
52 - module Moneta