gentoo resync : 14.04.2018

3 files changed, 54 insertions, 13 deletions

diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index dfb09cc73124..bc3366b3a523 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1,6 +1,7 @@
 AUX redis-3.2.1-local-redis-server.patch 1710 BLAKE2B 8ade0ba31d4d4466e6f874e2303bfb661d4773346f8bc2ac2144ecb8466da4173289d57d9c71f9e90daf4b560724aaf4a854f623c9f09f098f45498c16f08c6e SHA512 e10f59dfb7249874b0e882b888904901fa780ad1687b5000dc73851fe53e5bd2319c4418847ecca4e22efac404a4a283e108755a03f0615d76e0f23583602576
-DIST redis-rb-3.3.3.tar.gz 88495 BLAKE2B 5fe905cfeaae584c52a07914b7a95473a9b61038b9786a39a405fd733e79080ec5faaaf617adc7e743aedf1baf479e8873a2e79f754c10c00d63a77102a5695e SHA512 5090e9a5793c3d8faef2d1a253098213964ef052ad22829dffef831973cbfaad56c9e37a735c46ead7597ed1f3e8330283404a8f5fc30b38d3954ab942de59fa
+AUX redis-4.0.1-local-redis-server.patch 1273 BLAKE2B 108c8baef8beea68327c3b9bce8e56d133ff6357068407db08e93b70305726cd061585ec62ae28f8450ccb29b950eb20495c890234c738890aa0228591e97d79 SHA512 0eef2e7535ce06c4f0a86fe3118d12b95ea36f968fdc015fd68faa410041911eb62ace26155fb628751a3e3d264a1fad41890095cbadeb230630c64009b273a0
 DIST redis-rb-3.3.5.tar.gz 88500 BLAKE2B a06e0e08dba211edb6393dd85f7957e56ad928bbd3be105ddeb6ad4f2cfa1d354289ad67f3c8c27d5fd9f8560167708a6937e2950ae12ee0d42d3321940d1e85 SHA512 b79f535b6dff26ae2b0213dd77d53b952fd877ef5193c8bf0f6e5cd0da1934d79711bf611b839ce8b97d7cf145e7e912d2956087501a2f841d42775dc0105a0c
-EBUILD redis-3.3.3.ebuild 1136 BLAKE2B ba12913e9f625f751e853b466946eb34347f27e9c8d37fb235e03fd652eca6b0da69e6c233b00b090b4f1ff2a9388f3ab09e33b981ef761aa3c50bd02f5afdf0 SHA512 0b7fe8a6adbe37338e4abaf07eee1077ac4cc7f4d6f6bd3d3773e8af8f381fed833e7d20fa523bf47a7aab105e0758ee5189df36ddace38975244b16f4efa9c5
+DIST redis-rb-4.0.1.tar.gz 87859 BLAKE2B c53f9a4ae96195eeab9f8fd0eae1ec8bcfeee7b717faf5b85c127ff90a88fbf9a0cfcef9d4c002ef7ee07f12a8e813bfd3e4d284a616d8637029d51a6c067f34 SHA512 c377512e0103a1aadb4aef3e64983fd4b20a26d67320ff0c500b7617c8b3bd5b4ba2240488a7d55be1301bb0b926398835f5c242ae97afe9141b3499da358eb9
 EBUILD redis-3.3.5.ebuild 1111 BLAKE2B 9cda0e7a6bee91133d9277b28ffa16a719ebbf1c297000961172d2d7feb1087e97344010c18c77f45f2337bc8679c21d1ece2266f7c4e0c8565e1a6a3e4deaa8 SHA512 df503eafb017f582f34e233b9ea8d167ebf15afd68edc5c89697a2871eba400612b72d5cff39399813deeb26ad8e2c11c4a1a013298b7f7008960a8ca5ebe1f3
+EBUILD redis-4.0.1.ebuild 865 BLAKE2B 4ecdf94e28f8c2a83d9fe5905d77b92e5f6ef3769d5bd7abeb4f8391616a1377c1d6ef337e97b512319fc4d4c6c2e4981cdbc8537feaa6b34c4a85f493ef6ea0 SHA512 1823730c4ada0a1234ea590de9c6f43dc7f2e6fe38802c9fc9af8b2404e3cbbc1f3034e42623bf6d55e92cb55fe186b869b16d2eaace3ae2231d78a7c42546ff
 MISC metadata.xml 340 BLAKE2B 5b94605ef889ee35d161b2dd31d4b5b6c2411522c448d6e937b278ecac5fdc0b07c20956359809a78f27a9da0f0991f4b7be121bb13bd783914fd8d87a977510 SHA512 ea208ef15e2354cac75844869a922aaf69c7db9c0776984c4282fecda4ee8003504bbf013c29f008d616aff92cccc74bb157bf7d7f8c44777cf9dee7f15ce149
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/redis-3.3.3.ebuild b/dev-ruby/redis/redis-4.0.1.ebuild
index 84608f7bb6ce..e74cfcf17fb7 100644
--- a/dev-ruby/redis/redis-3.3.3.ebuild
+++ b/dev-ruby/redis/redis-4.0.1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+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="yard"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
 
 inherit ruby-fakegem
 
@@ -18,7 +17,7 @@ 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"
+SLOT="4"
 KEYWORDS="~amd64"
 IUSE="doc test"
 
@@ -26,14 +25,15 @@ 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"
+}
 
-	# 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"
+each_ruby_test() {
+	RUBY=${RUBY} emake test
 }