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

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 574e9a80bc82e4c3e895f302d25a7be94efbaccd..c39a87e9d43562802f2cabb0d2226e6d4526f6d0 100644 (file)
--- 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 b0a673ddcd4d99b679b56f40dd617093eb2d2ba2..e52b5cf954adfaf438b1442dd3ed0c7f781e18ee 100644 (file)
--- 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
 }