Adding metadata

3 files changed, 19 insertions, 19 deletions

diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index a2b3ac6d0de1..36f297fa7819 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1 +1 @@
-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.1.4-local-redis-server.patch b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
index b9db61a0a6a7..e220d62e35db 100644
--- a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
+++ b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch
@@ -1,7 +1,9 @@
---- a/makefile	2019-06-29 08:02:02.519804948 +0200
-+++ b/makefile	2019-06-29 08:03:43.125559643 +0200
+diff --git a/makefile b/makefile
+index c803066..d50ee93 100644
+--- a/makefile
++++ b/makefile
 @@ -1,16 +1,15 @@
- REDIS_BRANCH       ?= 5.0
+ REDIS_BRANCH       ?= 6.2
 -TMP                := tmp
  BUILD_DIR          := ${TMP}/cache/redis-${REDIS_BRANCH}
  TARBALL            := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
@@ -20,10 +22,10 @@
 -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}))
- CLUSTER_PORTS      := 7000 7001 7002 7003 7004 7005
-@@ -43,11 +43,11 @@
+@@ -32,11 +31,11 @@ stop_all: stop_sentinel stop_slave stop stop_cluster
  ${TMP}:
  	@mkdir -p $@
  
@@ -32,7 +34,7 @@
 +#${BINARY}: ${TMP}
 +#	@bin/build ${REDIS_BRANCH} $<
  
- test: 
+ test:
 -	@env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
 +	@env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
  
diff --git a/dev-ruby/redis/redis-4.1.4.ebuild b/dev-ruby/redis/redis-4.7.1.ebuild
index 18843a889001..723a96dd0e6e 100644
--- a/dev-ruby/redis/redis-4.1.4.ebuild
+++ b/dev-ruby/redis/redis-4.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 MY_P="redis-rb-${PV}"
 
@@ -24,20 +24,18 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm64"
 IUSE="doc test"
 
-DEPEND="test? ( =dev-db/redis-5* )"
+DEPEND="test? ( <dev-db/redis-7 )"
 
 RUBY_S="${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.1.4-local-redis-server.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.7.1-local-redis-server.patch" )
 
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
+ruby_add_bdepend "test? (
+	dev-ruby/minitest
+	dev-ruby/mocha
+)"
 
 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
 
 	sed -i -e '/test_connection_timeout/askip "requires network"' test/internals_test.rb || die
@@ -46,7 +44,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_test() {
-	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true emake -j1 all
+	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true VERBOSE=true emake -j1 all
 	einfo "Wait 5 seconds for servers to stop"
 	sleep 5
 }