gentoo resync : 27.03.2021

3 files changed, 29 insertions, 22 deletions

diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 9c6eddce81b6..7ba1857c8d39 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -3,6 +3,6 @@ AUX hiredis-0.14.1-honor-AR.patch 441 BLAKE2B efbb4c544b6418f689789c2c4147bf45e6
 AUX hiredis-1.0.0-disable-network-tests.patch 1760 BLAKE2B 9e2837834e0e7b0411ad4349a16c89d060c6b77552c98c11c03048f3f9ebbc16c47de3d9428ea3fa83da8878d1404eea8d9cd62b6e561104ec81c155507fd75b SHA512 d7d24991d29712e697ee22716933ea0c78e743d1689a452dab13d0d7e1a865ba479c08b17d4a743d05880e22d652c97f7b5fb4250841f14040696fdbd1e86390
 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
 DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa66281f26c28c3f80ab4593679122fd59430b2d5f04d20126b4459fc75af0a1fd67f1ee1db691d8db575debad2b61 SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
-EBUILD hiredis-0.14.1.ebuild 1891 BLAKE2B 6a726c09ee27e8fe8a1aa11ec7f3ddbfb107dcb6921173999025db849124f63f72943ded24d31a1d419cbc829bd17b07e82239fa8f191e18e353177d6d37855b SHA512 9f0049bf99a2968dbcb122d4ad67b65ce27e0993a47bf26d8928b40f01889de4d3c725ab92b32b1bbab697fddbc08f4563091585dcdd4d1c0f292a061195f43c
-EBUILD hiredis-1.0.0.ebuild 1908 BLAKE2B 6f415c7c8e2723722cfdd0a425bab7a311966cdc90a2370dd8b19cfea1214649db5bcf10e944c19a9c728f7e392412d8a6e2d192230b44fafbe6b0294eb764ea SHA512 3036ed40a03d1c77a3b082abad14ec7dc2e221832af1b8a221a2fdd251a205d221efa8ef15ecd758c4d8b86772cbbb0cb91222f51c592dd9d6601045c8158353
+EBUILD hiredis-0.14.1.ebuild 1896 BLAKE2B bcd029d45988f3d9062c5a04280c3f32411675b11cddae223a5cf23131200449d0a0fbe671bf309d14a946d92cdb3a05dbe25ba8b22c4ae31d39e2b3b6ff92bd SHA512 d77e215352c7916fdaa6d48971b3996bed7cf11f9b8ce24269d1172387a368af582bf65b3f8943d92412e8943133751df5778aa96985deabf6ec1c0177b021c6
+EBUILD hiredis-1.0.0.ebuild 1920 BLAKE2B e9e52cfae8466badb34ab305bf3eae01bed4c0f2949305d7180f240b4b25ddab617ad652fc1d469210b4406b8930740532d879f01bc882a23dc8e4883b5a8395 SHA512 f8322d09b80a8e674859f6a2b3163fc89a15c2ae1173d8909ee4e6cf24d6f189f9d4cd604e6d3932d727dc232c21482c22f031d4eddb01d226f2df5cd028c326
 MISC metadata.xml 403 BLAKE2B 77095f90219f95263b17fa5413af441651aa6a56e8bb4f5a4c763ffa7d0524f1ecf2c2fa0819f214fd519fc783071da31cff6d2c329b36befa9cbac64ccd9072 SHA512 08e5981022c6e6b88243dca594b48733707d12ebbeefd3f41d7818d2bd46c362dc0869aad5757b8909d292493f4732834bec1e34cc438e401d57ee871421192a
diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild
index d3827b66b401..81bbbb4420c3 100644
--- a/dev-libs/hiredis/hiredis-0.14.1.ebuild
+++ b/dev-libs/hiredis/hiredis-0.14.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -17,11 +17,12 @@ RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-db/redis )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.3-disable-network-tests.patch
+	"${FILESDIR}"/${PN}-0.14.1-honor-AR.patch
+)
+
 src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.13.3-disable-network-tests.patch
-		"${FILESDIR}"/${PN}-0.14.1-honor-AR.patch
-	)
 	default
 
 	# use GNU ld syntax on Solaris
@@ -58,17 +59,18 @@ src_test() {
 
 	_build hiredis-test
 
-	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
 	./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK}
 	local ret=$?
 
 	kill "$(<"${REDIS_PID}")" || die
-	[ ${ret} != "0" ] && die "tests failed"
+	[[ ${ret} != "0" ]] && die "tests failed"
 }
 
 src_install() {
 	_build PREFIX="${ED}/usr" install
-	if ! use static-libs; then
+
+	if ! use static-libs ; then
 		find "${ED}" -name '*.a' -delete || die
 	fi
 
diff --git a/dev-libs/hiredis/hiredis-1.0.0.ebuild b/dev-libs/hiredis/hiredis-1.0.0.ebuild
index 20d56c4f2ebd..b9046749771f 100644
--- a/dev-libs/hiredis/hiredis-1.0.0.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -17,12 +17,14 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	ssl? ( dev-libs/openssl )
-	test? ( dev-db/redis )"
+	test? ( dev-db/redis )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-disable-network-tests.patch
+)
 
 src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-1.0.0-disable-network-tests.patch"
-	)
 	default
 
 	# use GNU ld syntax on Solaris
@@ -52,25 +54,28 @@ src_test() {
 	local REDIS_PID="${T}"/hiredis.pid
 	local REDIS_SOCK="${T}"/hiredis.sock
 	local REDIS_PORT=56379
-	local REDIS_TEST_CONFIG="daemonize yes
+	local REDIS_TEST_CONFIG="
+		daemonize yes
 		pidfile ${REDIS_PID}
 		port ${REDIS_PORT}
 		bind 127.0.0.1
-		unixsocket //${REDIS_SOCK}"
+		unixsocket //${REDIS_SOCK}
+	"
 
 	_build hiredis-test
 
-	/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${REDIS_TEST_CONFIG}" || die
 	./hiredis-test -h 127.0.0.1 -p ${REDIS_PID} -s ${REDIS_SOCK}
 	local ret=$?
 
 	kill "$(<"${REDIS_PID}")" || die
-	[ ${ret} != "0" ] && die "tests failed"
+	[[ ${ret} != "0" ]] && die "tests failed"
 }
 
 src_install() {
 	_build PREFIX="${ED}/usr" install
-	if ! use static-libs; then
+
+	if ! use static-libs ; then
 		find "${ED}" -name '*.a' -delete || die
 	fi