From f63eff117b81a6703e670bd65596d1f7d843ca0c Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 13 Nov 2016 15:36:46 -0500
Subject: [PATCH] app-admin/apache-tools: fix pcre-config wrapper script
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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 574e9a80bc82..c39a87e9d435 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 b0a673ddcd4d..e52b5cf954ad 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
 }
-- 
2.26.2