From ecdac123787b96ce6649f0f91da12ea6458cc2b1 Mon Sep 17 00:00:00 2001 From: Palica Date: Tue, 23 Jun 2020 22:35:08 +0200 Subject: Updating liguros repo --- dev-ruby/redis/Manifest | 3 + .../files/redis-3.2.1-local-redis-server.patch | 68 ++++++++++++++++++++++ .../files/redis-4.0.1-local-redis-server.patch | 40 +++++++++++++ .../files/redis-4.1.4-local-redis-server.patch | 40 +++++++++++++ dev-ruby/redis/metadata.xml | 12 ++++ dev-ruby/redis/redis-3.3.5.ebuild | 39 +++++++++++++ dev-ruby/redis/redis-4.0.1.ebuild | 39 +++++++++++++ dev-ruby/redis/redis-4.1.4.ebuild | 48 +++++++++++++++ 8 files changed, 289 insertions(+) create mode 100644 dev-ruby/redis/Manifest create mode 100644 dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch create mode 100644 dev-ruby/redis/files/redis-4.0.1-local-redis-server.patch create mode 100644 dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch create mode 100644 dev-ruby/redis/metadata.xml create mode 100644 dev-ruby/redis/redis-3.3.5.ebuild create mode 100644 dev-ruby/redis/redis-4.0.1.ebuild create mode 100644 dev-ruby/redis/redis-4.1.4.ebuild (limited to 'dev-ruby/redis') diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest new file mode 100644 index 000000000000..713ba569087b --- /dev/null +++ b/dev-ruby/redis/Manifest @@ -0,0 +1,3 @@ +DIST redis-rb-3.3.5.tar.gz 88500 BLAKE2B a06e0e08dba211edb6393dd85f7957e56ad928bbd3be105ddeb6ad4f2cfa1d354289ad67f3c8c27d5fd9f8560167708a6937e2950ae12ee0d42d3321940d1e85 SHA512 b79f535b6dff26ae2b0213dd77d53b952fd877ef5193c8bf0f6e5cd0da1934d79711bf611b839ce8b97d7cf145e7e912d2956087501a2f841d42775dc0105a0c +DIST redis-rb-4.0.1.tar.gz 87859 BLAKE2B c53f9a4ae96195eeab9f8fd0eae1ec8bcfeee7b717faf5b85c127ff90a88fbf9a0cfcef9d4c002ef7ee07f12a8e813bfd3e4d284a616d8637029d51a6c067f34 SHA512 c377512e0103a1aadb4aef3e64983fd4b20a26d67320ff0c500b7617c8b3bd5b4ba2240488a7d55be1301bb0b926398835f5c242ae97afe9141b3499da358eb9 +DIST redis-rb-4.1.4.tar.gz 125556 BLAKE2B c1a9e7a365bb12c4aaacfdaff776e370c715a594a05c4270c2dfe85bdc540e915f797fbfa1dc87e10fb03faa56ff572b7e24f7a1244166ea1e1b611900bf22bb SHA512 6c12a75832e8493891ba50ca452960b5748593334287a93c40f117b0e522d483ca0af9a6510271c19f306dfb89a71dd9a7d02c1c8ad3ad82e1d4b31f0b51adad diff --git a/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch b/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch new file mode 100644 index 000000000000..3c6b351db485 --- /dev/null +++ b/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch @@ -0,0 +1,68 @@ +--- a/Rakefile 2015-08-11 22:16:04.474139810 +0100 ++++ b/Rakefile 2015-08-11 22:19:01.024398679 +0100 +@@ -1,14 +1,11 @@ + require "rake/testtask" + +-ENV["REDIS_BRANCH"] ||= "unstable" +- + REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__) + REDIS_CNF = File.join(REDIS_DIR, "test.conf") + REDIS_CNF_TEMPLATE = File.join(REDIS_DIR, "test.conf.erb") + REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid") + REDIS_LOG = File.join(REDIS_DIR, "db", "redis.log") + REDIS_SOCKET = File.join(REDIS_DIR, "db", "redis.sock") +-BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server" + + task :default => :run + +@@ -16,9 +13,7 @@ + task :run => [:start, :test, :stop] + + desc "Start the Redis server" +-task :start => [BINARY, REDIS_CNF] do +- sh "#{BINARY} --version" +- ++task :start => [REDIS_CNF] do + redis_running = \ + begin + File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i) +@@ -27,10 +22,14 @@ + false + end + +- unless redis_running +- unless system("#{BINARY} #{REDIS_CNF}") +- abort "could not start redis-server" +- end ++ unless system("which redis-server") ++ STDERR.puts "redis-server not in PATH" ++ exit 1 ++ end ++ ++ unless system("redis-server #{REDIS_CNF}") ++ STDERR.puts "could not start redis-server" ++ exit 1 + end + + at_exit do +@@ -52,20 +51,6 @@ + FileUtils.rm_f(REDIS_CNF) + end + +-file BINARY do +- branch = ENV.fetch("REDIS_BRANCH") +- +- sh <<-SH +- mkdir -p tmp; +- cd tmp; +- rm -rf redis-#{branch}; +- wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz; +- tar xf #{branch}.tar.gz; +- cd redis-#{branch}; +- make +- SH +-end +- + file REDIS_CNF => [REDIS_CNF_TEMPLATE, __FILE__] do |t| + require 'erb' + diff --git a/dev-ruby/redis/files/redis-4.0.1-local-redis-server.patch b/dev-ruby/redis/files/redis-4.0.1-local-redis-server.patch new file mode 100644 index 000000000000..3bd1b03f494a --- /dev/null +++ b/dev-ruby/redis/files/redis-4.0.1-local-redis-server.patch @@ -0,0 +1,40 @@ +--- a/makefile.~1~ 2017-09-28 18:11:35.000000000 +0200 ++++ b/makefile 2018-04-10 20:45:58.307407705 +0200 +@@ -3,7 +3,7 @@ +-TMP := tmp ++TMP := ${T} + BUILD_DIR := ${TMP}/redis-${REDIS_BRANCH} + TARBALL := ${TMP}/redis-${REDIS_BRANCH}.tar.gz +-BINARY := ${BUILD_DIR}/src/redis-server ++BINARY := /usr/sbin/redis-server +-PID_PATH := ${BUILD_DIR}/redis.pid ++PID_PATH := ${TMP}/redis.pid +-SOCKET_PATH := ${BUILD_DIR}/redis.sock ++SOCKET_PATH := ${TMP}/redis.sock + PORT := 6381 +@@ -11,7 +11,7 @@ + test: ${TEST_FILES} + make start + env SOCKET_PATH=${SOCKET_PATH} \ +- ruby -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e '' ++ ${RUBY} -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e '' + make stop + + ${TMP}: +@@ -20,11 +20,11 @@ + ${TARBALL}: ${TMP} + wget https://github.com/antirez/redis/archive/${REDIS_BRANCH}.tar.gz -O $@ + +-${BINARY}: ${TARBALL} ${TMP} +- rm -rf ${BUILD_DIR} +- mkdir -p ${BUILD_DIR} +- tar xf ${TARBALL} -C ${TMP} +- cd ${BUILD_DIR} && make ++# ${BINARY}: ${TARBALL} ${TMP} ++# rm -rf ${BUILD_DIR} ++# mkdir -p ${BUILD_DIR} ++# tar xf ${TARBALL} -C ${TMP} ++# cd ${BUILD_DIR} && make + + stop: + (test -f ${PID_PATH} && (kill $$(cat ${PID_PATH}) || true) && rm -f ${PID_PATH}) || true 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 new file mode 100644 index 000000000000..b9db61a0a6a7 --- /dev/null +++ b/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch @@ -0,0 +1,40 @@ +--- 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/metadata.xml b/dev-ruby/redis/metadata.xml new file mode 100644 index 000000000000..841a931687b9 --- /dev/null +++ b/dev-ruby/redis/metadata.xml @@ -0,0 +1,12 @@ + + + + + ruby@gentoo.org + Gentoo Ruby Project + + + redis/redis-rb + + gentoo-staging + diff --git a/dev-ruby/redis/redis-3.3.5.ebuild b/dev-ruby/redis/redis-3.3.5.ebuild new file mode 100644 index 000000000000..21dfc6a7a708 --- /dev/null +++ b/dev-ruby/redis/redis-3.3.5.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +MY_P="redis-rb-${PV}" +RUBY_FAKEGEM_RECIPE_TEST="rake" +RUBY_FAKEGEM_TASK_TEST="run" +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" + +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="0" +KEYWORDS="~amd64" +IUSE="doc test" + +DEPEND="test? ( >=dev-db/redis-3.2.0 )" + +RUBY_S="${MY_P}" + +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" + + # Version 3.0.6 downloads and compiles redis-server to test against. + # This patch reverts it to the way 3.0.5 does it, using the local server. + # https://github.com/redis/redis-rb/commit/351a1294fe33f79c23495b7568045e9f484918f2 + epatch "${FILESDIR}/${PN}-3.2.1-local-redis-server.patch" +} diff --git a/dev-ruby/redis/redis-4.0.1.ebuild b/dev-ruby/redis/redis-4.0.1.ebuild new file mode 100644 index 000000000000..e74cfcf17fb7 --- /dev/null +++ b/dev-ruby/redis/redis-4.0.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +MY_P="redis-rb-${PV}" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" + +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" +IUSE="doc test" + +DEPEND="test? ( >=dev-db/redis-3.2.0 )" + +RUBY_S="${MY_P}" + +PATCHES=( "${FILESDIR}/${P}-local-redis-server.patch" ) + +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" +} + +each_ruby_test() { + RUBY=${RUBY} emake test +} diff --git a/dev-ruby/redis/redis-4.1.4.ebuild b/dev-ruby/redis/redis-4.1.4.ebuild new file mode 100644 index 000000000000..ad182165d50d --- /dev/null +++ b/dev-ruby/redis/redis-4.1.4.ebuild @@ -0,0 +1,48 @@ +# 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" +IUSE="doc test" + +DEPEND="test? ( >=dev-db/redis-3.2.0 )" + +RUBY_S="${MY_P}" + +PATCHES=( "${FILESDIR}/${PN}-4.1.4-local-redis-server.patch" ) + +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 +} + +each_ruby_test() { + RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true emake -j1 all + einfo "Wait 5 seconds for servers to stop" + sleep 5 +} -- cgit v1.3