Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/redis/files/, dev-ruby/redis/
Date: Sat, 09 May 2020 09:20:58
Message-Id: 1589016041.15c37fd8d6a86ec2509f18921bfc8f9ac570cf41.graaff@gentoo
1 commit: 15c37fd8d6a86ec2509f18921bfc8f9ac570cf41
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 9 07:07:19 2020 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Sat May 9 09:20:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c37fd8
7
8 dev-ruby/redis: add 4.1.4
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
12
13 dev-ruby/redis/Manifest | 1 +
14 .../files/redis-4.1.4-local-redis-server.patch | 40 +++++++++++++++++++
15 dev-ruby/redis/redis-4.1.4.ebuild | 46 ++++++++++++++++++++++
16 3 files changed, 87 insertions(+)
17
18 diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
19 index 6cc25c079ef..713ba569087 100644
20 --- a/dev-ruby/redis/Manifest
21 +++ b/dev-ruby/redis/Manifest
22 @@ -1,2 +1,3 @@
23 DIST redis-rb-3.3.5.tar.gz 88500 BLAKE2B a06e0e08dba211edb6393dd85f7957e56ad928bbd3be105ddeb6ad4f2cfa1d354289ad67f3c8c27d5fd9f8560167708a6937e2950ae12ee0d42d3321940d1e85 SHA512 b79f535b6dff26ae2b0213dd77d53b952fd877ef5193c8bf0f6e5cd0da1934d79711bf611b839ce8b97d7cf145e7e912d2956087501a2f841d42775dc0105a0c
24 DIST redis-rb-4.0.1.tar.gz 87859 BLAKE2B c53f9a4ae96195eeab9f8fd0eae1ec8bcfeee7b717faf5b85c127ff90a88fbf9a0cfcef9d4c002ef7ee07f12a8e813bfd3e4d284a616d8637029d51a6c067f34 SHA512 c377512e0103a1aadb4aef3e64983fd4b20a26d67320ff0c500b7617c8b3bd5b4ba2240488a7d55be1301bb0b926398835f5c242ae97afe9141b3499da358eb9
25 +DIST redis-rb-4.1.4.tar.gz 125556 BLAKE2B c1a9e7a365bb12c4aaacfdaff776e370c715a594a05c4270c2dfe85bdc540e915f797fbfa1dc87e10fb03faa56ff572b7e24f7a1244166ea1e1b611900bf22bb SHA512 6c12a75832e8493891ba50ca452960b5748593334287a93c40f117b0e522d483ca0af9a6510271c19f306dfb89a71dd9a7d02c1c8ad3ad82e1d4b31f0b51adad
26
27 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
28 new file mode 100644
29 index 00000000000..b9db61a0a6a
30 --- /dev/null
31 +++ b/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
32 @@ -0,0 +1,40 @@
33 +--- a/makefile 2019-06-29 08:02:02.519804948 +0200
34 ++++ b/makefile 2019-06-29 08:03:43.125559643 +0200
35 +@@ -1,16 +1,15 @@
36 + REDIS_BRANCH ?= 5.0
37 +-TMP := tmp
38 + BUILD_DIR := ${TMP}/cache/redis-${REDIS_BRANCH}
39 + TARBALL := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
40 +-BINARY := ${BUILD_DIR}/src/redis-server
41 +-REDIS_CLIENT := ${BUILD_DIR}/src/redis-cli
42 ++BINARY := /usr/sbin/redis-server
43 ++REDIS_CLIENT := /usr/bin/redis-cli
44 + REDIS_TRIB := ${BUILD_DIR}/src/redis-trib.rb
45 +-PID_PATH := ${BUILD_DIR}/redis.pid
46 +-SOCKET_PATH := ${BUILD_DIR}/redis.sock
47 ++PID_PATH := ${TMP}/redis.pid
48 ++SOCKET_PATH := ${TMP}/redis.sock
49 + PORT := 6381
50 + SLAVE_PORT := 6382
51 +-SLAVE_PID_PATH := ${BUILD_DIR}/redis_slave.pid
52 +-SLAVE_SOCKET_PATH := ${BUILD_DIR}/redis_slave.sock
53 ++SLAVE_PID_PATH := ${TMP}/redis_slave.pid
54 ++SLAVE_SOCKET_PATH := ${TMP}/redis_slave.sock
55 + SENTINEL_PORTS := 6400 6401 6402
56 + SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS}))
57 + CLUSTER_PORTS := 7000 7001 7002 7003 7004 7005
58 +@@ -43,11 +43,11 @@
59 + ${TMP}:
60 + @mkdir -p $@
61 +
62 +-${BINARY}: ${TMP}
63 +- @bin/build ${REDIS_BRANCH} $<
64 ++#${BINARY}: ${TMP}
65 ++# @bin/build ${REDIS_BRANCH} $<
66 +
67 + test:
68 +- @env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
69 ++ @env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
70 +
71 + stop:
72 + @$(call kill-redis,${PID_PATH})
73
74 diff --git a/dev-ruby/redis/redis-4.1.4.ebuild b/dev-ruby/redis/redis-4.1.4.ebuild
75 new file mode 100644
76 index 00000000000..aa4fab3d7f0
77 --- /dev/null
78 +++ b/dev-ruby/redis/redis-4.1.4.ebuild
79 @@ -0,0 +1,46 @@
80 +# Copyright 1999-2020 Gentoo Authors
81 +# Distributed under the terms of the GNU General Public License v2
82 +
83 +EAPI=7
84 +
85 +USE_RUBY="ruby24 ruby25 ruby26 ruby27"
86 +
87 +MY_P="redis-rb-${PV}"
88 +
89 +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
90 +
91 +RUBY_FAKEGEM_BINWRAP=""
92 +
93 +RUBY_FAKEGEM_GEMSPEC="redis.gemspec"
94 +
95 +inherit ruby-fakegem
96 +
97 +DESCRIPTION="A Ruby client library for Redis"
98 +HOMEPAGE="https://github.com/redis/redis-rb"
99 +SRC_URI="https://github.com/redis/redis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
100 +
101 +LICENSE="MIT"
102 +SLOT="4"
103 +KEYWORDS="~amd64"
104 +IUSE="doc test"
105 +
106 +DEPEND="test? ( >=dev-db/redis-3.2.0 )"
107 +
108 +RUBY_S="${MY_P}"
109 +
110 +PATCHES=( "${FILESDIR}/${PN}-4.1.4-local-redis-server.patch" )
111 +
112 +all_ruby_prepare() {
113 + # call me impatient, but this way we don't need netcat
114 + sed -i \
115 + -e '/test_subscribe_past_a_timeout/,+18d' \
116 + test/publish_subscribe_test.rb || die "sed failed"
117 +
118 + sed -i -e 's/git ls-files --/echo/' ${RUBY_FAKEGEM_GEMSPEC} || die
119 +}
120 +
121 +each_ruby_test() {
122 + RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true emake -j1 all
123 + einfo "Wait 5 seconds for servers to stop"
124 + sleep 5
125 +}