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 3C9C21395E2 for ; Sun, 13 Nov 2016 20:41:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E525E0B16; Sun, 13 Nov 2016 20:41:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC3C3E0B16 for ; Sun, 13 Nov 2016 20:41:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB6B6341666 for ; Sun, 13 Nov 2016 20:41:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1327024BB for ; Sun, 13 Nov 2016 20:41:38 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1479069667.f63eff117b81a6703e670bd65596d1f7d843ca0c.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/apache-tools/apache-tools-2.4.20.ebuild app-admin/apache-tools/apache-tools-2.4.23.ebuild X-VCS-Directories: app-admin/apache-tools/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: f63eff117b81a6703e670bd65596d1f7d843ca0c X-VCS-Branch: master Date: Sun, 13 Nov 2016 20:41:38 +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-Archives-Salt: 5290f441-8314-4540-9200-c5e8217c5809 X-Archives-Hash: 845b2e91a073f6227aedc5d564d00f2e commit: f63eff117b81a6703e670bd65596d1f7d843ca0c Author: Mike Gilbert gentoo org> AuthorDate: Sun Nov 13 20:36:46 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Nov 13 20:41:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f63eff11 app-admin/apache-tools: fix pcre-config wrapper script Thanks to Robert Förster for noticing the error. Bug: https://bugs.gentoo.org/597868 Package-Manager: portage-2.3.2_p5 app-admin/apache-tools/apache-tools-2.4.20.ebuild | 13 ++++++++++--- app-admin/apache-tools/apache-tools-2.4.23.ebuild | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app-admin/apache-tools/apache-tools-2.4.20.ebuild b/app-admin/apache-tools/apache-tools-2.4.20.ebuild index 574e9a8..c39a87e 100644 --- a/app-admin/apache-tools/apache-tools-2.4.20.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.20.ebuild @@ -39,9 +39,16 @@ src_prepare() { # This package really should upgrade to using pcre's .pc file. cat <<-\EOF >"${T}"/pcre-config - #!/bin/sh - [ "${flag}" = "--version" ] && set -- --modversion - exec ${PKG_CONFIG} libpcre "$@" + #!/bin/bash + flags=() + for flag; do + if [[ ${flag} == "--version" ]]; then + flags+=( --modversion ) + else + flags+=( "${flag}" ) + fi + done + exec ${PKG_CONFIG} libpcre "${flags[@]}" EOF chmod a+x "${T}"/pcre-config } diff --git a/app-admin/apache-tools/apache-tools-2.4.23.ebuild b/app-admin/apache-tools/apache-tools-2.4.23.ebuild index b0a673d..e52b5cf 100644 --- a/app-admin/apache-tools/apache-tools-2.4.23.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.23.ebuild @@ -39,9 +39,16 @@ src_prepare() { # This package really should upgrade to using pcre's .pc file. cat <<-\EOF >"${T}"/pcre-config - #!/bin/sh - [ "${flag}" = "--version" ] && set -- --modversion - exec ${PKG_CONFIG} libpcre "$@" + #!/bin/bash + flags=() + for flag; do + if [[ ${flag} == "--version" ]]; then + flags+=( --modversion ) + else + flags+=( "${flag}" ) + fi + done + exec ${PKG_CONFIG} libpcre "${flags[@]}" EOF chmod a+x "${T}"/pcre-config }