Fix build with sh=dash, bug 525454

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

5 files changed, 68 insertions, 21 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 8469757c40e5..45fc44150f3e 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.606 2015/01/03 11:30:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.607 2015/01/04 14:41:22 dilfridge Exp $
+
+  04 Jan 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  libreoffice-4.3.5.2.ebuild, libreoffice-4.3.9999.ebuild,
+  +files/libreoffice-4.3.5.2-remove-bashisms.patch:
+  Fix build with sh=dash, bug 525454
 
   03 Jan 2015; Andreas K. Huettel <dilfridge@gentoo.org>
   -libreoffice-4.2.6.3.ebuild, -libreoffice-4.3.4.1.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8b9ec53bfe5d..29fc7662dfc2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -16,6 +16,7 @@ AUX libreoffice-4.3.1.2-implement--with-system-gltf.patch 4983 SHA256 c61e8dd67a
 AUX libreoffice-4.3.1.2-upgrade-to-libgltf-0.0.1.patch 15709 SHA256 22551358fa6e161c2ecdd267bae3de1245fb671eda8b592efa48e7939e9353f2 SHA512 c29b18c5d9b14f2d9a0c08618e274e1fa3bae540b68569fcd0ff216aef4942e7aa5fe89184cadbcb3d6ea04316a5ae9876f3fae085727b13247bb5e0499b10a8 WHIRLPOOL 2d3ee1e39a965cf28e6b633dd5f62dd7aca3dbf4a583aa48cade71cfb8814c93fdfa54099db7774d5db62e2b21d61017dd279fb2cdf1b0fc7633ad3323d2fceb
 AUX libreoffice-4.3.4.1-boost-1.56.0.patch 10696 SHA256 47700e383c40679809cf3577798fd9211458b0814b8b360f49847491c4bc9ca0 SHA512 d8d84a9106aabfb06f64b2101de9d9767828e6349f948732f017d7972d02bd6a64cad1b5dee44fa2fbcaa6b2dc9df9caf77070168091e0798911d07a21550b56 WHIRLPOOL edf37dbd8a6f5858fd3583551cbcdca590122436406a0f6016402c1b7423ed99c26d64a7116ff2575f112e3fdbf698f04357e33daba76016b3c4ef778d4cddef
 AUX libreoffice-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch 2123 SHA256 f424034d9af92f1ca281dc68b484d28503c261705791409f813c2359874b455d SHA512 1621411ad99d9d43abd2363b86ce892f14e25bc236f6b04a55b9765252ec2904af295475d70d09eb3fe9278dda08c8944a08dd9aae81d426da7d6cb0ece47295 WHIRLPOOL 59655dff3ff8491ce7b6a61cc6ca5a5469fcad2e530cfd5c36b50031dce591730ff20dab9eac173c04e09093740341eba86c324f857b19716c8f994272ad9878
+AUX libreoffice-4.3.5.2-remove-bashisms.patch 1180 SHA256 60c9874b724cd0de61578e67a76e53cef5e5ac5fdbdc4360c6b3f4b8f9faa89e SHA512 cf7336dd8a7596f48edb7d73ffb19071f0455456b99e6492f41c78417de01ec2e7e3aad5b1c7e7c7bc431b5d4afe0e2095591f3f62d1a4a1dc221a55711b485c WHIRLPOOL cb90fe2e6b2f94458e5ac70a1716819dbc5942d1648b9db80abd199507ad235e69044d2645cc62fcbca93194169443b71783bfb361f9202c879c39d7a9462b9a
 AUX libreoffice-4.3.5.2-return-IsUserDefined-w-o-negation.patch 1379 SHA256 f64326c3089189520683b8def52dadd73225abf259212ff22cd8e0f5ef183767 SHA512 1366e3914d78ddc22c2dd324b53478c5d76fc8d563f46d02f83b09cceded2e71ea19311e29e6fa23ce230d3bec8f3a56c5ff18572050c6e5a4e03a975d54c38e WHIRLPOOL 2d16b6f90e6bb16de3a53a38e146930eb15685e306558c362e08ffe8c3b410a5124860e22475410f8db6e71fedbed4098b292c8efddfeb8570158046c5736f8a
 AUX libreoffice-4.3.5.2-system-opencollada.patch 5810 SHA256 5ae98f04551520db1118a873a8cb02c0b3306db0d55e3d5b863729e5393c280e SHA512 6749be7d372d2e92ba16697c3bf90be4bdda01d759100a13fcfe89c935e5291715e8556bc42ab8ce5fa47b6dced95f750c7c497051bdf140e8e504e281e2fe58 WHIRLPOOL 47f02ce1e5ca88cef50c75b339206ee0768a0e74862ab37040be7260c35b6c1d5c56a16fe9f2ca077ab457f1bec3b166c8ee031722eb9711cd63e9222e20a33f
 AUX libreoffice-9999-curl-config.patch 2483 SHA256 ae1de898a921089932da214f667d979f7057d7e99c8f8f08fa21b7a827cb8f2e SHA512 ab10307f099368e71684d22a92b70703ebce5755ec618016393df014d1054fa723b5ebed031575ffd8bbbaa2449582c44646ed389bda16adda9c1df90f13f2f9 WHIRLPOOL 4ab824d86abe300c4c863e4162f3646ec499a4b0f519bc3d6a77bc702bd307b5b4b642d24d3921f52c8da6d96613afa85cb5fd6310d0ede61612a6b437eca6b6
@@ -35,26 +36,26 @@ DIST libreoffice-help-4.2.8.2.tar.xz 1855204 SHA256 9cafdc22f0af401dc31bb713e0c4
 DIST libreoffice-help-4.3.5.2.tar.xz 1852412 SHA256 78b586931d8e085aa18d137711e7c878f858ea386a80ee673b0a787953836d92 SHA512 8525cc1bef1ac95a89c3100e137793bdea9ac05a85468e0ec96c6a360ce65baf3dfef7e634d9e8dbc644dec138df2b979cdb8a636ff27cdb7ee652ddee114236 WHIRLPOOL f5bd7d1da705e20def1cc6bff3dd3902ce6d77e2b5fb977860a4fbf9748a6ffec3524fe9ab0e2c539ece015082aadcf9f7392a145862ebb20f4abc117667b25e
 EBUILD libreoffice-4.2.8.2.ebuild 17952 SHA256 47b3d7661bac7965053ccd96368a1ba417f1d172f2faa71ca64f59a8c96b738f SHA512 14d5254340ee2c05426cdd3eb1d0c76c3adc3d226eb424ba6dc1891a676b4e6f2dc8ce742dd99fb592bbc7187427007d0bfd207c279a57b18bec66286c5f5d0f WHIRLPOOL 1de2d1a662a296bc26719fe6d23feaefaa5550c8cdc9b6c175783c1462f0588a71ad0f8d61fe7d725e90366817983890bc41a94157ca666527fd50b11589800d
 EBUILD libreoffice-4.2.9999.ebuild 17981 SHA256 774d36e21f851620fcc31a2fd272a4bafa81994d4c63b537f072a61cfd933151 SHA512 c0ae19f30b8e83436cae409eef364a47ee939b7662802272ad48e04e6f585b9e2ce531ca7fa18d1674571a701dfa0ac49017cf14b8e31528594cf88ce0820199 WHIRLPOOL 2e17fcf69aff5e7872ef127968706b50c3d98bbfb10b0e68a22997ff78ee7d165385a0d72d8d897079e51811bd1b93fdbd3179a9f67f26868b80dc06af85ed7b
-EBUILD libreoffice-4.3.5.2.ebuild 18943 SHA256 fb5016265f2888771f179f902d5ba25511ea16cf98b4c88846a7b50a33b44216 SHA512 debd283ede4ebc64d97cd4b54e5af428afa642301a1c8ce139ef4204d57933beb1906cd5ee0a49952f133e837bc26d4fdca4c76daf2d0e18029ce779dd176b90 WHIRLPOOL 64141c1f78ac945579e4c8313d78ae20c60cb9e07c81b60991b36b79877e7545ab419624353b509a4ed317125a9aef1746c33e191249097402afa102d50fcba2
-EBUILD libreoffice-4.3.9999.ebuild 18848 SHA256 2379bbf1fe8f7b19f83447ccc7c9422c64acc6b19b2b2e809b8f48a8cc8b93a7 SHA512 77a148b6011ecb578bd9538c8b45cac8b6d1612f7bf0be63dfcd8ff685700f9945bdc047768efadbd0e0c9ebe426e852b99f4e619c6580f30fc82d700eec8ab2 WHIRLPOOL d84ad6f53376503b09a3e71e06ec36dfd2f81170033319137f6b99df7e282ecdf9a658fb74b94ad55b31b3f5f1a0da8402d7aed543b765d185d75b9b15efa9f4
+EBUILD libreoffice-4.3.5.2.ebuild 19021 SHA256 6321a2d312bde561441c60b50b4824c720104a9c7dac6a60454cc489a52cbce9 SHA512 ee3aa3ecd1050d190fc93c1f83bd337e32781f43f5bc4ae808bc44bff867d495eff099bb2c2dbd14fc3d897e1f0c4d6dca437c9c43c3bcb2632a50a16c4a747e WHIRLPOOL be1f1ed63e27079192a422d7906ee15700dab6f4d44405e73f482ea95b73c99ee17bd213c8800de1353be2063ddd0cc16e56d30c7174ee3feab06821df3ba580
+EBUILD libreoffice-4.3.9999.ebuild 18926 SHA256 7ce99cde0759f24074db6778a1bcaae560f3b6f9770850ad15c3906124ec4c98 SHA512 f1b7d4f835d9ab1c52c8d1f598d917eae327c96d717ae4d7f9a06a87f2189e1d1db7ccc9ca85f3a45f9aa73932662f3acae4ee0c0dd4e23400d64d9f95e614c8 WHIRLPOOL fb43454b848a7f8777b9b177684f142b485e4c559ad2ccde3493349b389aa2b310102563a95f6e73d24ac7f9355c69c0038c1aa41ec69ed670bc6a4f11ca7970
 EBUILD libreoffice-9999-r2.ebuild 18293 SHA256 60b962a8d3987fd4894fed5f00d3ac21b67e2fc25745c8bfada9aebff3793b2f SHA512 abc4de48c80d7be63c3a0bd66b7d39a468d9155d7a88c76e28398102b65a95cb2fd082823faf9e835d83184de1ced4b4e374c43e95ad33546f4752bbd3fd2109 WHIRLPOOL 096493b4583250939558b3b4dcb3e8a30f1aab9df5532ef429aa8bbb6ba35f973bd0581ae3d7af79f56595b21b62d38de7e7f22d4394bdd73fb7dfedd30f40e8
-MISC ChangeLog 734 SHA256 da634b2ff4b2e274c66a435776d73dda2e68db5be56b27851d61f2ce3787e542 SHA512 d49be8964accdac76f9fe1d5e0be39cb0c29b60672b8c1bc2eabca3d04b71bfa0c0868c5f05af2f7e1f34bc2e27e6b1004b6dce56b9d55ce215a6190d6d0f322 WHIRLPOOL d119403451c077ac5025a3b2357899e0d6d2d77ba76ff788f8ec13a158149230e2d987a228c37d1396e2316c4837b357ddad77da283f1da7dc5898861ad1da7a
+MISC ChangeLog 940 SHA256 77805ce4fb3c9c8c19d836c3606b7908972542d92a84155c8715005394686a98 SHA512 456a75e2c7599fffa267e1d498ea0920ba766651afd7cf1089984e118a96cfc756ed78d55e7fd4a964bde78a27ffca4edbfd92313fd4d80ca6d9f213572d0e75 WHIRLPOOL 02cb0c1d5adc2b9471500a8a68a27e87789c6d0efcf1358e58b84918c5873bfc0697d5a0745659f2a0d0d0956b005eefee57d78fea7f25da8bb58c35d0fd0223
 MISC ChangeLog-2014 109721 SHA256 db62affd74b541212d4043dbc88acf51fb8aa36602d6e5625cab9b0b823a54f7 SHA512 6481d8f26924300ca46f0cd216962167b6ce5d53028558b0128ed4f996a8cf5576182e9e511493e4b57f628189fc127dec9ce62110bc8d3d85c6d4e2a815bf26 WHIRLPOOL 76c87a30a9296f64675baeb5f77a8500b9b1ff25c6edd5a5d0b984dc3cb3b3aecee37938d882194d6be58ef34c8b1925c1d9b8b7a7b786a5d68539fba714e627
 MISC metadata.xml 1354 SHA256 bf91c27f941b42e977112a3ea9465babd4c4d94dde3f8308d6db1ccd56bc65b9 SHA512 636da2f295d3055de61b52b2a1d371a25101efdc55014ba2e5a7446bb55b30dca1bb58cc2a84873fb862e40f60de10122c55dba19ba9e5d058eab36f7c33aad6 WHIRLPOOL 4aa957484052955572b2bdca42a7d32f5a89f3916a646e92cca940ce2f4e5c8dec824c75150bf80455dcbc2e13f550d1158c418ca38cecac5ac3090419a52f5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUp9MdAAoJEJS/30SErRQvyWoP+we0o3S+TCcUoIu8k3dQgGyF
-LeAgxABSyByBbj7erA+JdWesoTs3NCeWHVimbF5YUMNx31W2TQLVUWqG6e5xyc6U
-zmg9SwzFK9nSKpAvs67dqyorki/KUiy87v/505PDN40m8VgtTnOIbrEt9WjVRdrQ
-Bj1dFkIjuiI3qf4yEaWOzeBCeO4yl7iHglOxPNqMe4dycvORytgyQBHVTCaju3/j
-GjLpswuW3z6EHBQlP7OlyeXFIbU0tCmWrF2tkwm89WGDV66YSxgsR6lUg4HkkVTf
-8SJE8JvG12Iz8IOVHSVQmbJAlv+JJQtEaJ36mrkzMRnQ27r4sq//q8qLYHh9KhJz
-zqijS2jyThJhl/dwb4mLfdBGohmvorzdQ/dd93uWdjUFx/DfqI7eBeqiaoupT1ks
-PIwaw9i4r/kQNiD4uLHXKM5puAvWK8dViPh6uGk9PuUI+XBDoRtwsNYwAWP84Kbr
-kfViShNWVyQsVZJZAaAAE6FtV4jg9/ABf/BI9MlZZAvqCzElJtZv7AyKHPlSQ937
-Ak6LfHH8ZQsqwXxFFj3fZIo20ybmQg4fGuhfBJt2Z8WJVwv9uYIDDjbbu9n1bjIT
-kZDdQDjVacjH4ix7kzUcH0Eb9gwAMEUwqoLSEocGyPJudXoMaeYaY56jFMutwsRN
-YuzbKcvG+ZeDk786onif
-=LNi5
+iQIcBAEBCAAGBQJUqVFyAAoJEJS/30SErRQv7qIQAIhj19/8THO85V7nLMdPdIxr
+DcJYsOFr6gbbR3geigBP6NJkw0TLl4CCh6eOFeGh8cc0wT3EiWPHFno3QlthKASM
+QrJ5b7idXBndUyPm42NwurY3CYa7lSDLRwIE9ov8ZRLrr2GpDmitldU/jvD7Z2+c
+cywGQgrAlM0itKXRQvftn+6fnLq0G4TJdxyHnpJqqWYjE7r2vtCLzaiWzrxmzb0q
+DwMXf9IAvxGVE8DbU6d7A3N03olVdSQ0qZummGBjP51lSwUxugOSQqSqVkbCHMJ2
+CTZYzIy5y3ng1to79JI32NJuBljWT2fvw+BoQGtXjASvoyySqgVyfBOgksu/mPOF
+UDmRpjMgnGA3O8Tx+LHO5IQFU3j16lQ12CWQzsnM15R363p/ZOsOynzkDhBZKOvO
+hqq5ffeWVjzwqQduJ5E4qnWmoGssTw3qexQxR91crGWVSMsWWoYCx0QcjaYijxjg
+on3rpbQ9F/3KwHCIavdrA7yroCn3kk3Qpr4Xb4/YF0XsSUi0H4z42E5sk96u2IAh
+CjX4juC0aBA2siwRVcBJ15EgLTZgscQc7TNClBWKy7ojCjVk9V6pDYfLLayxiy8X
+A47SN+kQfcjDj1J8wyZDx/ISmJNGitC2JPZlC41vqw338Mudne3BqyAhmxxPkhgy
+MP+d8SfjptawKiMU/E80
+=cwf4
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
new file mode 100644
index 000000000000..41d513989619
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
@@ -0,0 +1,35 @@
+From d93be02c09575926bc3c4d64a122b81df80c243d Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
+Date: Sun, 4 Jan 2015 15:33:35 +0100
+Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for
+ sh=dash users
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Original patch by Rémi Cardona <remi@gentoo.org>
+
+Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
+Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
+---
+ configure.ac | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa33d0..5dbe640 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11483,9 +11483,8 @@ test_font_map()
+     FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
+ 
+     TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'"
+-    while true ; do
++    while test "$#" -ge 1 ; do
+         MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
+-        test -n "$MAPPING" || break
+         TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
+     done
+     if test $TESTEXPR
+-- 
+2.2.1
+
diff --git a/app-office/libreoffice/libreoffice-4.3.5.2.ebuild b/app-office/libreoffice/libreoffice-4.3.5.2.ebuild
index c3a87397190c..0d4f59e7a664 100644
--- a/app-office/libreoffice/libreoffice-4.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.3.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.5.2.ebuild,v 1.2 2014/12/29 20:05:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.5.2.ebuild,v 1.3 2015/01/04 14:41:22 dilfridge Exp $
 
 EAPI=5
 
@@ -257,6 +257,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch"
 
 	# from master branch
+
+	# submitted
+	"${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
 )
 
 REQUIRED_USE="
diff --git a/app-office/libreoffice/libreoffice-4.3.9999.ebuild b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
index 409a63aefd28..3ce906ae0fff 100644
--- a/app-office/libreoffice/libreoffice-4.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.3.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.10 2014/12/29 20:05:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.3.9999.ebuild,v 1.11 2015/01/04 14:41:22 dilfridge Exp $
 
 EAPI=5
 
@@ -254,6 +254,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.3.5.2-detect-KDE5-fallback-to-KDE4UI.patch"
 
 	# from master branch
+
+	# submitted
+	"${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
 )
 
 REQUIRED_USE="