Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/redis/files/
Date: Fri, 11 Aug 2017 05:40:37
Message-Id: 1502429873.a2ba31950c992b2cd09e55f5d65c853ef495fd2d.graaff@gentoo
1 commit: a2ba31950c992b2cd09e55f5d65c853ef495fd2d
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 11 05:37:53 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 11 05:37:53 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ba3195
7
8 dev-ruby/redis: remove unused files
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 .../files/redis-3.0.6-local-redis-server.patch | 69 ----------------------
13 1 file changed, 69 deletions(-)
14
15 diff --git a/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch b/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch
16 deleted file mode 100644
17 index 243cb6cbe6d..00000000000
18 --- a/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch
19 +++ /dev/null
20 @@ -1,69 +0,0 @@
21 ---- a/Rakefile 1970-01-01 01:00:00.000000000 +0100
22 -+++ b/Rakefile 2014-01-04 00:19:25.206135726 +0000
23 -@@ -2,15 +2,12 @@
24 - require 'rubygems/package_task'
25 - require 'rake/testtask'
26 -
27 --ENV["REDIS_BRANCH"] ||= "unstable"
28 --
29 - $:.unshift File.join(File.dirname(__FILE__), 'lib')
30 - require 'redis/version'
31 -
32 - REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
33 - REDIS_CNF = File.join(REDIS_DIR, "test.conf")
34 - REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
35 --BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
36 -
37 - task :default => :run
38 -
39 -@@ -18,9 +15,7 @@
40 - task :run => [:start, :test, :stop]
41 -
42 - desc "Start the Redis server"
43 --task :start => BINARY do
44 -- sh "#{BINARY} --version"
45 --
46 -+task :start do
47 - redis_running = \
48 - begin
49 - File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i)
50 -@@ -30,8 +25,14 @@
51 - end
52 -
53 - unless redis_running
54 -- unless system("#{BINARY} #{REDIS_CNF}")
55 -- abort "could not start redis-server"
56 -+ unless system("which redis-server")
57 -+ STDERR.puts "redis-server not in PATH"
58 -+ exit 1
59 -+ end
60 -+
61 -+ unless system("redis-server #{REDIS_CNF}")
62 -+ STDERR.puts "could not start redis-server"
63 -+ exit 1
64 - end
65 - end
66 - end
67 -@@ -44,21 +45,9 @@
68 - end
69 - end
70 -
71 --file BINARY do
72 -- branch = ENV.fetch("REDIS_BRANCH")
73 --
74 -- sh <<-SH
75 -- mkdir -p tmp;
76 -- cd tmp;
77 -- wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz;
78 -- tar xf #{branch}.tar.gz;
79 -- cd redis-#{branch};
80 -- make
81 -- SH
82 --end
83 --
84 - Rake::TestTask.new do |t|
85 - t.options = "-v"
86 -+ t.libs << "test"
87 - t.test_files = FileList["test/*_test.rb"]
88 - end
89 -