commit: eef1771ede8cf78a4fd21a7565039c528987c667 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> AuthorDate: Mon Jul 4 12:28:57 2022 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> CommitDate: Sun Jul 10 09:22:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef1771e
dev-ruby/redis: drop 4.1.4 Closes: 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.1.4-local-redis-server.patch | 40 ----------------- dev-ruby/redis/redis-4.1.4.ebuild | 52 ---------------------- 3 files changed, 93 deletions(-) diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest index 23fc9578407a..36f297fa7819 100644 --- a/dev-ruby/redis/Manifest +++ b/dev-ruby/redis/Manifest @@ -1,2 +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.1.4-local-redis-server.patch deleted file mode 100644 index b9db61a0a6a7..000000000000 --- a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 deleted file mode 100644 index 18843a889001..000000000000 --- a/dev-ruby/redis/redis-4.1.4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# 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 ~arm64" -IUSE="doc test" - -DEPEND="test? ( =dev-db/redis-5* )" - -RUBY_S="${MY_P}" - -PATCHES=( "${FILESDIR}/${PN}-4.1.4-local-redis-server.patch" ) - -ruby_add_bdepend "test? ( 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 - - sed -i -e '/bundler/ s:^:#:' Rakefile || 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 -}
