[gentoo-commits] repo/gentoo:master commit in: dev-ruby/redis/, dev-ruby/redis/files/

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/redis/, dev-ruby/redis/files/

[Hans de Graaff]

commit:     a9cb2bed4060c3f69f8374f3c1c09163fcf8eab8
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Jul  4 09:35:28 2022 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 09:21:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9cb2bed

dev-ruby/redis: add 4.7.1

- EAPI bump to 8
- Remove test_subscribe_past_a_timeout sed, redis-rb does not use nc
  command since version 3.2.0, see upstream commit d97779c3d028 ("Use
  pure ruby to send a TCP message")
- It is now required to set VERBOSE env in order to have verbose output
  of tests since version 4.2.0, see upstream commit 287276c2633d
  ("Disable travis-ci")
- This version does not support redis-7 but all other versions available
  in ::gentoo work.

Bug: https://bugs.gentoo.org/841407
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-ruby/redis/Manifest                            |  1 +
 .../files/redis-4.7.1-local-redis-server.patch     | 42 ++++++++++++++++++
 dev-ruby/redis/redis-4.7.1.ebuild                  | 50 ++++++++++++++++++++++
 3 files changed, 93 insertions(+)

diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index a2b3ac6d0de1..23fc9578407a 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1 +1,2 @@
 DIST redis-rb-4.1.4.tar.gz 125556 BLAKE2B c1a9e7a365bb12c4aaacfdaff776e370c715a594a05c4270c2dfe85bdc540e915f797fbfa1dc87e10fb03faa56ff572b7e24f7a1244166ea1e1b611900bf22bb SHA512 6c12a75832e8493891ba50ca452960b5748593334287a93c40f117b0e522d483ca0af9a6510271c19f306dfb89a71dd9a7d02c1c8ad3ad82e1d4b31f0b51adad
+DIST redis-rb-4.7.1.tar.gz 142130 BLAKE2B 12c9bdafe32e80e2c8f515a437f44a3673381ee6257bf4eb95395e7229134e54706a1c7eefa880397e3b2a10cce6c70856b30108f1c941fc9ee6307989ba4be1 SHA512 33aba308a501593b9d442f346d5654a734a889a45ee581092684b9aba5eccfd4efb790c8dcbb73a83e626b8b2da07d2a4535d698fd2d2696efb217ac522ccd89

diff --git a/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
new file mode 100644
index 000000000000..e220d62e35db
--- /dev/null
+++ b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
@@ -0,0 +1,42 @@
+diff --git a/makefile b/makefile
+index c803066..d50ee93 100644
+--- a/makefile
++++ b/makefile
+@@ -1,16 +1,15 @@
+ REDIS_BRANCH       ?= 6.2
+-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
+ HA_GROUP_NAME      := master1
+ SENTINEL_PORTS     := 6400 6401 6402
+ SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS}))
+@@ -32,11 +31,11 @@ stop_all: stop_sentinel stop_slave stop stop_cluster
+ ${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.7.1.ebuild b/dev-ruby/redis/redis-4.7.1.ebuild
new file mode 100644
index 000000000000..92366326e8aa
--- /dev/null
+++ b/dev-ruby/redis/redis-4.7.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="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 ~arm64"
+IUSE="doc test"
+
+DEPEND="test? ( <dev-db/redis-7 )"
+
+RUBY_S="${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.1-local-redis-server.patch" )
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest
+	dev-ruby/mocha
+)"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files --/echo/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/test_connection_timeout/askip "requires network"' test/internals_test.rb || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true VERBOSE=true emake -j1 all
+	einfo "Wait 5 seconds for servers to stop"
+	sleep 5
+}