gentoo auto-resync : 24:12:2022 - 14:02:21

3 files changed, 102 insertions, 0 deletions

diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index dbe1a400568e..aa767f9b3fa6 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1,4 +1,7 @@
 AUX redis-4.7.1-local-redis-server.patch 1475 BLAKE2B 46a5703b463372ef30184a1108b3128672bcd2bb7c77b9b268ae336199d113ccdd439718ede4ec066f1659d262ad2404f2c01419efec08c214a2c045f68ac118 SHA512 6271610c96a006c26e2e1a4a7ea272ff3feac94f86538ee206e83ed8fde5082334b8c8a0decf584084a38b31551456ab80fd6b8ae1cc5ad3660e6a447f70878e
+AUX redis-4.8.0-local-redis-server.patch 1720 BLAKE2B e0142b0ee528a5e7ce82340802d6bb17b4ddb6dd7d191cb751a01532fbd9a76279294bf6bbdbee3e629506140d7c66d1a7da6f928cf77b9582e7fc14d18cc14d SHA512 09cc4678a5af4638dc694c9d2a2ab0b3a153e74a1bcf5f9289498a90bc1769d0c547bfe04ab5f78c353e8fffd1b23e5c2ebf45c94edd9e0cb1ef0f2052c28de4
 DIST redis-rb-4.7.1.tar.gz 142130 BLAKE2B 12c9bdafe32e80e2c8f515a437f44a3673381ee6257bf4eb95395e7229134e54706a1c7eefa880397e3b2a10cce6c70856b30108f1c941fc9ee6307989ba4be1 SHA512 33aba308a501593b9d442f346d5654a734a889a45ee581092684b9aba5eccfd4efb790c8dcbb73a83e626b8b2da07d2a4535d698fd2d2696efb217ac522ccd89
+DIST redis-rb-4.8.0.tar.gz 143136 BLAKE2B 6d70985d5e2a749b931e5bf1f74f04d1e748a9b65cc1b1e644d9ecfa633978bef9c6418308425b6996779ff65fbbb66cacbf464cdf6d00e2736b20089aa0889c SHA512 e9d454d0416091d0c5629b6ed826e70879ea2f93501bae7db19570bfbf4bdae2ed36b357390afcfca427531d997acc7f5ae004d55d0e87ddb67c909db2b181d5
 EBUILD redis-4.7.1.ebuild 1109 BLAKE2B 3091c263e18078f17253a7f43203c77ed368e455ed7145c2d69a4e062db07775fedb77162cb3671a9cfa0478eae1b7840569b9f0a0ecfb25343be79add53e8fc SHA512 94c9f0d9860f74951216b378a610d77484b9c3a435b50c2d0503ef787ac1a8c15954d1aecdfbb29b97b10a857f429220c6efdbc88a424e5bc99d6915f1297c18
+EBUILD redis-4.8.0.ebuild 1109 BLAKE2B a42d164f377ff616cc73663eaddbc271a57752d872ea5aa65b51805fe29fe033adf543723dd1bc853ce5d07200eb3b5c8c18032b1c89c440837a8cf507ef334a SHA512 11fa785610b65a202ceed9082bfd8cf7524aa258ac57498f5c30814ed5cb5846fd453200d87ca473ed0a9f51f13ad51d21e448cce833392572906d8bb3638f33
 MISC metadata.xml 341 BLAKE2B 2a18679e5570f1b5ef6e1fd5d449a75872c223d2e228bba1ee6390d90136f2156f964e77380d722f71d0c2334dc17b490b9b45b452ae7ada2609dab0543e1591 SHA512 faea0064c473d0ef90303d9299d5ea9dd91fd7ce4be7e28a28bee9f5d8bf25d5a880f6cd3990c2c6c7d183a43aa1a26050e360fdd1ffcbc086bd81a45c51258f
diff --git a/dev-ruby/redis/files/redis-4.8.0-local-redis-server.patch b/dev-ruby/redis/files/redis-4.8.0-local-redis-server.patch
new file mode 100644
index 000000000000..faf382ac5aee
--- /dev/null
+++ b/dev-ruby/redis/files/redis-4.8.0-local-redis-server.patch
@@ -0,0 +1,49 @@
+Gentoo specific patch adapted from redis-4.7.1-local-redis-server.patch
+
+diff --git a/makefile b/makefile
+index df25e4b..57bc941 100644
+--- a/makefile
++++ b/makefile
+@@ -1,18 +1,17 @@
+ REDIS_BRANCH       ?= 7.0
+ ROOT_DIR           :=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+-TMP                := tmp
+ CONF               := ${ROOT_DIR}/test/support/conf/redis-${REDIS_BRANCH}.conf
+ 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
++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}))
+@@ -31,14 +30,8 @@ start_all: start start_slave start_sentinel wait_for_sentinel start_cluster crea
+ 
+ stop_all: stop_sentinel stop_slave stop stop_cluster
+ 
+-${TMP}:
+-	@mkdir -p $@
+-
+-${BINARY}: ${TMP}
+-	@bin/build ${REDIS_BRANCH} $<
+-
+ test:
+-	@env REDIS_SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
++	@env REDIS_SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
+ 
+ stop:
+ 	@$(call kill-redis,${PID_PATH});\
+-- 
+2.35.1
+
diff --git a/dev-ruby/redis/redis-4.8.0.ebuild b/dev-ruby/redis/redis-4.8.0.ebuild
new file mode 100644
index 000000000000..b96872982fca
--- /dev/null
+++ b/dev-ruby/redis/redis-4.8.0.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="ruby27 ruby30 ruby31"
+
+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.8.0-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/redis/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
+}