[gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/

[Mike Gilbert]

commit:     f63eff117b81a6703e670bd65596d1f7d843ca0c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 20:36:46 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> 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
 }