commit:     15c37fd8d6a86ec2509f18921bfc8f9ac570cf41
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 07:07:19 2020 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat May  9 09:20:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c37fd8

dev-ruby/redis: add 4.1.4

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-ruby/redis/Manifest                            |  1 +
 .../files/redis-4.1.4-local-redis-server.patch     | 40 +++++++++++++++++++
 dev-ruby/redis/redis-4.1.4.ebuild                  | 46 ++++++++++++++++++++++
 3 files changed, 87 insertions(+)

diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index 6cc25c079ef..713ba569087 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1,2 +1,3 @@
 DIST redis-rb-3.3.5.tar.gz 88500 BLAKE2B 
a06e0e08dba211edb6393dd85f7957e56ad928bbd3be105ddeb6ad4f2cfa1d354289ad67f3c8c27d5fd9f8560167708a6937e2950ae12ee0d42d3321940d1e85
 SHA512 
b79f535b6dff26ae2b0213dd77d53b952fd877ef5193c8bf0f6e5cd0da1934d79711bf611b839ce8b97d7cf145e7e912d2956087501a2f841d42775dc0105a0c
 DIST redis-rb-4.0.1.tar.gz 87859 BLAKE2B 
c53f9a4ae96195eeab9f8fd0eae1ec8bcfeee7b717faf5b85c127ff90a88fbf9a0cfcef9d4c002ef7ee07f12a8e813bfd3e4d284a616d8637029d51a6c067f34
 SHA512 
c377512e0103a1aadb4aef3e64983fd4b20a26d67320ff0c500b7617c8b3bd5b4ba2240488a7d55be1301bb0b926398835f5c242ae97afe9141b3499da358eb9
+DIST redis-rb-4.1.4.tar.gz 125556 BLAKE2B 
c1a9e7a365bb12c4aaacfdaff776e370c715a594a05c4270c2dfe85bdc540e915f797fbfa1dc87e10fb03faa56ff572b7e24f7a1244166ea1e1b611900bf22bb
 SHA512 
6c12a75832e8493891ba50ca452960b5748593334287a93c40f117b0e522d483ca0af9a6510271c19f306dfb89a71dd9a7d02c1c8ad3ad82e1d4b31f0b51adad

diff --git a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch 
b/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
new file mode 100644
index 00000000000..b9db61a0a6a
--- /dev/null
+++ b/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
@@ -0,0 +1,40 @@
+--- a/makefile 2019-06-29 08:02:02.519804948 +0200
++++ b/makefile 2019-06-29 08:03:43.125559643 +0200
+@@ -1,16 +1,15 @@
+ REDIS_BRANCH       ?= 5.0
+-TMP                := tmp
+ BUILD_DIR          := ${TMP}/cache/redis-${REDIS_BRANCH}
+ TARBALL            := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
+-BINARY             := ${BUILD_DIR}/src/redis-server
+-REDIS_CLIENT       := ${BUILD_DIR}/src/redis-cli
++BINARY             := /usr/sbin/redis-server
++REDIS_CLIENT       := /usr/bin/redis-cli
+ REDIS_TRIB         := ${BUILD_DIR}/src/redis-trib.rb
+-PID_PATH           := ${BUILD_DIR}/redis.pid
+-SOCKET_PATH        := ${BUILD_DIR}/redis.sock
++PID_PATH           := ${TMP}/redis.pid
++SOCKET_PATH        := ${TMP}/redis.sock
+ PORT               := 6381
+ SLAVE_PORT         := 6382
+-SLAVE_PID_PATH     := ${BUILD_DIR}/redis_slave.pid
+-SLAVE_SOCKET_PATH  := ${BUILD_DIR}/redis_slave.sock
++SLAVE_PID_PATH     := ${TMP}/redis_slave.pid
++SLAVE_SOCKET_PATH  := ${TMP}/redis_slave.sock
+ SENTINEL_PORTS     := 6400 6401 6402
+ SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix 
.pid,${SENTINEL_PORTS}))
+ CLUSTER_PORTS      := 7000 7001 7002 7003 7004 7005
+@@ -43,11 +43,11 @@
+ ${TMP}:
+       @mkdir -p $@
+ 
+-${BINARY}: ${TMP}
+-      @bin/build ${REDIS_BRANCH} $<
++#${BINARY}: ${TMP}
++#     @bin/build ${REDIS_BRANCH} $<
+ 
+ test: 
+-      @env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
++      @env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
+ 
+ stop:
+       @$(call kill-redis,${PID_PATH})

diff --git a/dev-ruby/redis/redis-4.1.4.ebuild 
b/dev-ruby/redis/redis-4.1.4.ebuild
new file mode 100644
index 00000000000..aa4fab3d7f0
--- /dev/null
+++ b/dev-ruby/redis/redis-4.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+MY_P="redis-rb-${PV}"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="redis.gemspec"
+
+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="4"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="test? ( >=dev-db/redis-3.2.0 )"
+
+RUBY_S="${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.1.4-local-redis-server.patch" )
+
+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"
+
+       sed -i -e 's/git ls-files --/echo/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+       RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true emake -j1 all
+       einfo "Wait 5 seconds for servers to stop"
+       sleep 5
+}

Reply via email to