1 |
commit: 44fb1eb978c92d1855bcd1086fcea5b733be1486 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Sep 15 18:10:30 2020 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 16 06:20:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44fb1eb9 |
7 |
|
8 |
dev-ruby/redis: remove unused patch |
9 |
|
10 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
13 |
|
14 |
.../files/redis-3.2.1-local-redis-server.patch | 68 ---------------------- |
15 |
1 file changed, 68 deletions(-) |
16 |
|
17 |
diff --git a/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch b/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch |
18 |
deleted file mode 100644 |
19 |
index 3c6b351db48..00000000000 |
20 |
--- a/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch |
21 |
+++ /dev/null |
22 |
@@ -1,68 +0,0 @@ |
23 |
---- a/Rakefile 2015-08-11 22:16:04.474139810 +0100 |
24 |
-+++ b/Rakefile 2015-08-11 22:19:01.024398679 +0100 |
25 |
-@@ -1,14 +1,11 @@ |
26 |
- require "rake/testtask" |
27 |
- |
28 |
--ENV["REDIS_BRANCH"] ||= "unstable" |
29 |
-- |
30 |
- REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__) |
31 |
- REDIS_CNF = File.join(REDIS_DIR, "test.conf") |
32 |
- REDIS_CNF_TEMPLATE = File.join(REDIS_DIR, "test.conf.erb") |
33 |
- REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid") |
34 |
- REDIS_LOG = File.join(REDIS_DIR, "db", "redis.log") |
35 |
- REDIS_SOCKET = File.join(REDIS_DIR, "db", "redis.sock") |
36 |
--BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server" |
37 |
- |
38 |
- task :default => :run |
39 |
- |
40 |
-@@ -16,9 +13,7 @@ |
41 |
- task :run => [:start, :test, :stop] |
42 |
- |
43 |
- desc "Start the Redis server" |
44 |
--task :start => [BINARY, REDIS_CNF] do |
45 |
-- sh "#{BINARY} --version" |
46 |
-- |
47 |
-+task :start => [REDIS_CNF] do |
48 |
- redis_running = \ |
49 |
- begin |
50 |
- File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i) |
51 |
-@@ -27,10 +22,14 @@ |
52 |
- false |
53 |
- end |
54 |
- |
55 |
-- unless redis_running |
56 |
-- unless system("#{BINARY} #{REDIS_CNF}") |
57 |
-- abort "could not start redis-server" |
58 |
-- end |
59 |
-+ unless system("which redis-server") |
60 |
-+ STDERR.puts "redis-server not in PATH" |
61 |
-+ exit 1 |
62 |
-+ end |
63 |
-+ |
64 |
-+ unless system("redis-server #{REDIS_CNF}") |
65 |
-+ STDERR.puts "could not start redis-server" |
66 |
-+ exit 1 |
67 |
- end |
68 |
- |
69 |
- at_exit do |
70 |
-@@ -52,20 +51,6 @@ |
71 |
- FileUtils.rm_f(REDIS_CNF) |
72 |
- end |
73 |
- |
74 |
--file BINARY do |
75 |
-- branch = ENV.fetch("REDIS_BRANCH") |
76 |
-- |
77 |
-- sh <<-SH |
78 |
-- mkdir -p tmp; |
79 |
-- cd tmp; |
80 |
-- rm -rf redis-#{branch}; |
81 |
-- wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz; |
82 |
-- tar xf #{branch}.tar.gz; |
83 |
-- cd redis-#{branch}; |
84 |
-- make |
85 |
-- SH |
86 |
--end |
87 |
-- |
88 |
- file REDIS_CNF => [REDIS_CNF_TEMPLATE, __FILE__] do |t| |
89 |
- require 'erb' |
90 |
- |