Version bump by Peter Wilmott in the ruby overlay.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

4 files changed, 131 insertions, 3 deletions

diff --git a/dev-ruby/redis/ChangeLog b/dev-ruby/redis/ChangeLog
index b5aed9ecd26d..489b3a319009 100644
--- a/dev-ruby/redis/ChangeLog
+++ b/dev-ruby/redis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/redis
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redis/ChangeLog,v 1.1 2013/12/26 21:59:46 mrueg Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redis/ChangeLog,v 1.2 2014/01/21 19:05:09 graaff Exp $
+
+*redis-3.0.6 (21 Jan 2014)
+
+  21 Jan 2014; Hans de Graaff <graaff@gentoo.org> +redis-3.0.6.ebuild,
+  +files/redis-3.0.6-local-redis-server.patch:
+  Version bump by Peter Wilmott in the ruby overlay.
 
 *redis-3.0.5 (26 Dec 2013)
 
diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index 6e52e0e3bce2..4aeb9537c7ba 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX redis-3.0.6-local-redis-server.patch 1610 SHA256 cd12cf912da42671277f5102e90f3d775b754b7b7d00bec09eb78db1de4c7c52 SHA512 e50ce8472356b20327d97cc41718f4e8080616e09bd87abc36075cf234c6314233df0e195bf10c15b2d7ebefb9dc130fb5829c5072e90a47766ebb1c54d2ce2f WHIRLPOOL 16e64df50186915a2374bf6f504b2fb08324edcb1d28e737ebdd74987849c3af1380d086ea18ec5adf756379c726ac4b22f982243b4c143016f30ef46e05101e
 DIST redis-rb-3.0.5.tar.gz 59798 SHA256 fb00ecf1859abf393c6965200fa994203f0fddb61bf07dff956669c358877f7d SHA512 a889ab22b04ff557254b7f7408a4a23222062d3fee3acbaf7b4e999ff4eba5977e7be46fdd7c7e93fe6953e6923eebaace2face7c2376da8bf8b844884fadb9b WHIRLPOOL facd93cb1c4c5b49f5c5ff9b147ff60371ebe4ba550b5d46e3b0e7cfe39e7d521712f0e6f20227e0ce1cc1cd723315a47c4b01786ae518a2719b5a9dc98afa65
+DIST redis-rb-3.0.6.tar.gz 62335 SHA256 06cad67fdfd6955112a65d05e0fff62b003439404f20d8b926ce92f6c5eabe4b SHA512 966a2b9bf5d3af51020015e8b066b728b0632093eedcf1ca41f82b3340d54b0bffb305a0aa7ec5c8534db0a71cd6de006a943a0ebef234a4f93204ea41a431b1 WHIRLPOOL cdeec7ccbe3dd6a4c4ea6e9e786c072cab436abacc48538501234cd58f8bb21bc8a43ad8a4db68b607c5ee9313daffe9e1eb0255057e6306db2c55d920673609
 EBUILD redis-3.0.5.ebuild 940 SHA256 0897aa6c53d3a7884aaa2f2b2e0f2992cc00f689ea3506abacc54f9bcb9bd18d SHA512 02121adbca0014a50676cfc18f523467cb20a14e414362e2ef2505c31cb91de288903932d6075f20f69121b3e236171174ee579e1d44f97c6120509ebc41893f WHIRLPOOL 05ac09d8472e8f3b765dc4ed0db152968eddf83bb00a07424980e0c1c814e2479d53f37d891b499806df04b6048844d26411a618bb5319934f7f025469d3e8d9
-MISC ChangeLog 369 SHA256 4a4ca5a9314f16313ed77f764ae3b339fb6addd14d1ce917fd7ffcc7915f7252 SHA512 c5cb3f9206b98fbbf4e4ea032638c4390cb9f2671623527aabcb3cc0c680bf4a9f7e5023ea1efdf32c3569f7b80a8dfa39fdfeff412f74e2a0d669186a723ba7 WHIRLPOOL 37c1aa165c1d318f18a494882c889e2e4db400f15e2df707069da1c2e09ced550fed902b4013a7bff30f93c1aff783ce1968351454c217a6bcc8546db64fa229
+EBUILD redis-3.0.6.ebuild 1215 SHA256 e1d3fd2ba34cfbfd722d02987e112235545c8f1ab8b8c8cbacc1631ace183f63 SHA512 bbb515e7d810e137a7524844df56852626848243894a2c5177cb1a1924dc6f6cbeaa5a5178a0cf8f5ab8999ff14775b6c77e69e0fb8b6a4f84783d11ed18489c WHIRLPOOL 2040e7d1eb395fbcc3475495606060e17e12d36bc3173e3fa0476f3862d0b5003d4f87447ab4f743e01be2c8ab94c0ae449d4033070d807b8e97416a50564690
+MISC ChangeLog 570 SHA256 c971db20366eab64ec5fb202beb01ccbe853ec87f63c9fd1e5814f924951d87c SHA512 0a1f23adcd381f99094967ebcaef0165bfd9e04ea9b37a93ce56e2b0f60c07193e9a532117fa6ad226529ea78ace809cf8a91a0e1baebb710510b20df6f9439b WHIRLPOOL 97e53ee88007e3507a6050ba3be0f146c3875199168dd07e9a94dfeab94b6b9d827ad4ec0fdcf0e7ad5d124d5c495e27d0ad9a4785c1775b5e170af8694d242f
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlLexOoACgkQiIP6VqMIqNf1RAD/SuuwKtgeBNQBZT3VKh8PLRzY
+jzMierxknW2I1ozXFrUA/A0I30UzkhvuGdGV5PnmO/gvA30IT4P1domaRd81SWKj
+=A8C6
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..243cb6cbe6d0
--- /dev/null
+++ b/dev-ruby/redis/files/redis-3.0.6-local-redis-server.patch
@@ -0,0 +1,69 @@
+--- a/Rakefile	1970-01-01 01:00:00.000000000 +0100
++++ b/Rakefile	2014-01-04 00:19:25.206135726 +0000
+@@ -2,15 +2,12 @@
+ require 'rubygems/package_task'
+ require 'rake/testtask'
+ 
+-ENV["REDIS_BRANCH"] ||= "unstable"
+-
+ $:.unshift File.join(File.dirname(__FILE__), 'lib')
+ require 'redis/version'
+ 
+ REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
+ REDIS_CNF = File.join(REDIS_DIR, "test.conf")
+ REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
+-BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
+ 
+ task :default => :run
+ 
+@@ -18,9 +15,7 @@
+ task :run => [:start, :test, :stop]
+ 
+ desc "Start the Redis server"
+-task :start => BINARY do
+-  sh "#{BINARY} --version"
+-
++task :start do
+   redis_running = \
+   begin
+     File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i)
+@@ -30,8 +25,14 @@
+   end
+ 
+   unless redis_running
+-    unless system("#{BINARY} #{REDIS_CNF}")
+-      abort "could not start redis-server"
++    unless system("which redis-server")
++      STDERR.puts "redis-server not in PATH"
++      exit 1
++    end
++
++    unless system("redis-server #{REDIS_CNF}")
++      STDERR.puts "could not start redis-server"
++      exit 1
+     end
+   end
+ end
+@@ -44,21 +45,9 @@
+   end
+ end
+ 
+-file BINARY do
+-  branch = ENV.fetch("REDIS_BRANCH")
+-
+-  sh <<-SH
+-  mkdir -p tmp;
+-  cd tmp;
+-  wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz;
+-  tar xf #{branch}.tar.gz;
+-  cd redis-#{branch};
+-  make
+-  SH
+-end
+-
+ Rake::TestTask.new do |t|
+   t.options = "-v"
++  t.libs << "test"
+   t.test_files = FileList["test/*_test.rb"]
+ end
+ 
diff --git a/dev-ruby/redis/redis-3.0.6.ebuild b/dev-ruby/redis/redis-3.0.6.ebuild
new file mode 100644
index 000000000000..a2676f1f2f18
--- /dev/null
+++ b/dev-ruby/redis/redis-3.0.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/redis/redis-3.0.6.ebuild,v 1.1 2014/01/21 19:05:09 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+MY_P="redis-rb-${PV}"
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_TASK_TEST="run"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client library for Redis"
+HOMEPAGE="https://github.com/redis/redis-rb"
+SRC_URI="https://github.com/redis/redis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="test? ( dev-db/redis )"
+
+RUBY_S="${MY_P}"
+
+all_ruby_prepare() {
+	# call me impatient, but this way we don't need netcat
+	sed -i \
+		-e '/test_subscribe_past_a_timeout/,+18d' \
+		test/publish_subscribe_test.rb || die "sed failed"
+
+	# Version 3.0.6 downloads and compiles redis-server to test against.
+	# This patch reverts it to the way 3.0.5 does it, using the local server.
+	# https://github.com/redis/redis-rb/commit/351a1294fe33f79c23495b7568045e9f484918f2
+	epatch "${FILESDIR}/${P}-local-redis-server.patch"
+}