gentoo auto-resync : 10:07:2022 - 13:27:24

4 files changed, 21 insertions, 21 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 3a4d2932eadb..c69d0ba3211f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index 076d8d83337e..dbe1a400568e 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1,4 +1,4 @@
-AUX redis-4.1.4-local-redis-server.patch 1454 BLAKE2B cfbb707109cac75fb38a614c41b3cd0cb9b9f70bc9e62a2fcdcf9208e7b1b0c3709101d788d1158b0cc3c4e47f9817a82e88ea2165b85304474f47cd1d1cdac6 SHA512 903d186c9a834208f89b06c4ea2ae2d8e8559e0d8d5d0e71a0c7ab8ffd212463e34b1da551b5ad1267a3283eb4c735fb85a94b696d403399368d3d97a2b50abb
-DIST redis-rb-4.1.4.tar.gz 125556 BLAKE2B c1a9e7a365bb12c4aaacfdaff776e370c715a594a05c4270c2dfe85bdc540e915f797fbfa1dc87e10fb03faa56ff572b7e24f7a1244166ea1e1b611900bf22bb SHA512 6c12a75832e8493891ba50ca452960b5748593334287a93c40f117b0e522d483ca0af9a6510271c19f306dfb89a71dd9a7d02c1c8ad3ad82e1d4b31f0b51adad
-EBUILD redis-4.1.4.ebuild 1243 BLAKE2B 0ecf01be3d4fed5e69d23bcbc4aa142141649f8a545b7b900fe0eea26480f431f4a9fad81ea028a9bf528ce2b6fe01b3fb661318c6da2d190eb913e9862aa01a SHA512 930a2c96ed342c158dd2b090bb2bede4cf79823ca10db3ec0ee3a7781daa4f7091cdad6662250896605a2bacada0610b75245a6cd7d0b153e159a035bfbc9f80
+AUX redis-4.7.1-local-redis-server.patch 1475 BLAKE2B 46a5703b463372ef30184a1108b3128672bcd2bb7c77b9b268ae336199d113ccdd439718ede4ec066f1659d262ad2404f2c01419efec08c214a2c045f68ac118 SHA512 6271610c96a006c26e2e1a4a7ea272ff3feac94f86538ee206e83ed8fde5082334b8c8a0decf584084a38b31551456ab80fd6b8ae1cc5ad3660e6a447f70878e
+DIST redis-rb-4.7.1.tar.gz 142130 BLAKE2B 12c9bdafe32e80e2c8f515a437f44a3673381ee6257bf4eb95395e7229134e54706a1c7eefa880397e3b2a10cce6c70856b30108f1c941fc9ee6307989ba4be1 SHA512 33aba308a501593b9d442f346d5654a734a889a45ee581092684b9aba5eccfd4efb790c8dcbb73a83e626b8b2da07d2a4535d698fd2d2696efb217ac522ccd89
+EBUILD redis-4.7.1.ebuild 1109 BLAKE2B 3091c263e18078f17253a7f43203c77ed368e455ed7145c2d69a4e062db07775fedb77162cb3671a9cfa0478eae1b7840569b9f0a0ecfb25343be79add53e8fc SHA512 94c9f0d9860f74951216b378a610d77484b9c3a435b50c2d0503ef787ac1a8c15954d1aecdfbb29b97b10a857f429220c6efdbc88a424e5bc99d6915f1297c18
 MISC metadata.xml 341 BLAKE2B 2a18679e5570f1b5ef6e1fd5d449a75872c223d2e228bba1ee6390d90136f2156f964e77380d722f71d0c2334dc17b490b9b45b452ae7ada2609dab0543e1591 SHA512 faea0064c473d0ef90303d9299d5ea9dd91fd7ce4be7e28a28bee9f5d8bf25d5a880f6cd3990c2c6c7d183a43aa1a26050e360fdd1ffcbc086bd81a45c51258f
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
 }