From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 609AE1382C5 for ; Tue, 23 Mar 2021 04:53:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56C66E085B; Tue, 23 Mar 2021 04:53:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31C90E0864 for ; Tue, 23 Mar 2021 04:53:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE6A63406C2 for ; Tue, 23 Mar 2021 04:53:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D977F634 for ; Tue, 23 Mar 2021 04:53:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1616474925.6b6515f9da372efc0899614f2d1abcba2382b4bb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/hiredis/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/hiredis/hiredis-0.14.1.ebuild dev-libs/hiredis/hiredis-1.0.0.ebuild X-VCS-Directories: dev-libs/hiredis/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6b6515f9da372efc0899614f2d1abcba2382b4bb X-VCS-Branch: master Date: Tue, 23 Mar 2021 04:53:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d3ef037b-d321-4aca-ade1-d803c7ed128b X-Archives-Hash: 844c5af93cdb3fc21cb94464e8a9f16c commit: 6b6515f9da372efc0899614f2d1abcba2382b4bb Author: Sam James gentoo org> AuthorDate: Mon Mar 22 22:34:48 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 23 04:48:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6515f9 dev-libs/hiredis: style changes * Don't quote EAPI * Use Bash tests, not POSIX * Define PATCHES in global scope * sam-style semicolons Signed-off-by: Sam James gentoo.org> dev-libs/hiredis/hiredis-0.14.1.ebuild | 20 +++++++++++--------- dev-libs/hiredis/hiredis-1.0.0.ebuild | 27 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild index d3827b66b40..81bbbb4420c 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 20d56c4f2eb..b9046749771 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