Fix initscript to be sh compilant. Per bug #238552.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

3 files changed, 22 insertions, 9 deletions

diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog
index 577660ad2d45..7d758d525cc2 100644
--- a/x11-apps/xfs/ChangeLog
+++ b/x11-apps/xfs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xfs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.63 2009/06/28 17:56:55 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.64 2009/08/21 09:16:53 scarabeus Exp $
+
+  21 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/xfs.start:
+  Fix initscript to be sh compilant. Per bug #238552.
 
 *xfs-1.1.0-r1 (28 Jun 2009)
 
diff --git a/x11-apps/xfs/Manifest b/x11-apps/xfs/Manifest
index 2dc521b5ae2c..528b5c8bf104 100644
--- a/x11-apps/xfs/Manifest
+++ b/x11-apps/xfs/Manifest
@@ -1,6 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xfs.conf.d 577 RMD160 8456dd8edbc6f96788155172cf98f28c2d423d8c SHA1 f0caa87674b257803cacbf0b4734c695d4a019e5 SHA256 1fd57f91542bad494d0e4959b23397969603ba590d7ebe37bdadfa53b2a4dce2
 AUX xfs.config 1117 RMD160 832f8de8aa2643bb39bff5384a870d3f7e30d5ac SHA1 4bf214473fccad56c936040836249ee1cbd3f77e SHA256 3a1b8b5f7e40ee34f314acbf8fe612162c81974f8333f8ccae66ccb740c70092
-AUX xfs.start 7819 RMD160 852983cfdbd014daf9cb96778364cceaf46b0b88 SHA1 d8b72eb132e180227b37abc6509aed77726944bd SHA256 ccf58bdc0858339758bfc6af0613821cd5ad74e4ead0e47ece9c9b8458990c7f
+AUX xfs.start 7837 RMD160 5438c1fef7fdf0e0601ee53c8bce928a63c2755e SHA1 8fbc68d004928efc073f2c7a307663de34049f12 SHA256 64deabadc9a1b313d4252dde3e5cbb58c3e1ab65db370733825ddd4ba6cae08b
 DIST xfs-1.0.5.tar.bz2 152131 RMD160 9e95f914e1813c9a1b78e19608ac5c0bab61784d SHA1 3b5d0a6f86415148124762c780d50d81b73f405c SHA256 f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9
 DIST xfs-1.0.8.tar.bz2 161279 RMD160 f22fb56afd29b0f5460df5271155f6f355064f9f SHA1 87a4f791b940cdc129891ce0f7033b3db4d40420 SHA256 34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482
 DIST xfs-1.1.0.tar.bz2 196532 RMD160 044fac33f02a242280d7e627249bd3aab092e9be SHA1 040dee6ff7628c192874447fb178a965c744eea9 SHA256 47bad4bbcd0488a8e573aa6efe3438076c4d27c498d6f642f3aa27262eb95f6d
@@ -8,5 +11,12 @@ EBUILD xfs-1.0.5.ebuild 1000 RMD160 9c9d67448410b63a7ff562d2e05dd895fa5e51a6 SHA
 EBUILD xfs-1.0.8.ebuild 1001 RMD160 d70622f6d729d3ed70c9e6ea7a179b0d7be55e08 SHA1 8025c5714344421b29b0f60e4bd32b583cf2d707 SHA256 b482914e96708cb0defd1509a4f3da4c1af977234995930c41bd4d00609b8cdf
 EBUILD xfs-1.1.0-r1.ebuild 982 RMD160 faab6f4af937ab42087c2909cb8946d7c0971fae SHA1 6069e6026437a28046559edafbfc15e8a5d4c90e SHA256 e1a39f2fa5cb4cfbb91310ffd5956868d78e34df6bf412f16569ab265be03530
 EBUILD xfs-1.1.0.ebuild 822 RMD160 659d347b83515e91079ceaaa8af520ac972211e1 SHA1 5e2a0bdc3a4239a19aed1ab346309c58e1142070 SHA256 74744d0b2625eb9c457536ef22d26afab480891682b9618bd0635621580fc44e
-MISC ChangeLog 7719 RMD160 309c2ec33f83340ebba9453640fc698425b798d4 SHA1 faba85cfcfb1b286f5cc33ec1fefb770760dff02 SHA256 8e204855e3d62d18b139777630ce77e066e25ad24855d28eaf26b576214bd815
+MISC ChangeLog 7851 RMD160 9efc6a18ae4e39b8cccafc52103718f7acd8899b SHA1 364596b9bef28386ba4d7a9273451894fc9e9f90 SHA256 f2ca8d723b5a3e2f2a1c907620a4388e936bf5c605581330f584bcde74669383
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqOZhMACgkQHB6c3gNBRYeEDACgisMweS8zwmKSRk39KAR6llie
+OkAAoK2tcP86WJbXj7yQc8GyTALV54nE
+=lLd1
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xfs/files/xfs.start b/x11-apps/xfs/files/xfs.start
index ca3b456548ce..51624d99f46f 100755
--- a/x11-apps/xfs/files/xfs.start
+++ b/x11-apps/xfs/files/xfs.start
@@ -2,7 +2,7 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.4 2008/04/17 04:23:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.5 2009/08/21 09:16:52 scarabeus Exp $
 
 #NB: Config is in /etc/conf.d/xfs
 
@@ -238,7 +238,7 @@ setup_font_dirs() {
 			# NOTE: ttmkfdir does NOT work on type1 fonts (#53753)
 			# Also, there is no way to regenerate Speedo/CID fonts.scale
 			# <spyderous@gentoo.org> 2 August 2004
-			if [ "${x/encodings}" = "${x}" -a \
+			if [ "${x%*encodings*}" = "${x}" -a \
 			     -n "$(find ${x} -iname '*.tt[cf]' -print)" ]
 			then
 				/usr/bin/ttmkfdir -x 2 \
@@ -254,7 +254,7 @@ setup_font_dirs() {
 				fi
 
 			# Next type1 and opentype (pfa,pfb,otf,otc)
-			elif [ "${x/encodings}" = "${x}" -a \
+			elif [ "${x%*encodings*}" = "${x}" -a \
 				-n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]
 			then
 				/usr/bin/mkfontscale \
@@ -263,7 +263,7 @@ setup_font_dirs() {
 			fi
           
 		  	# Now generate fonts.dir files ...
-			if [ "${x/encodings}" = "${x}" ]
+			if [ "${x%*encodings*}" = "${x}" ]
 			then
 				/usr/bin/mkfontdir \
 					-e /usr/share/fonts/encodings \
@@ -271,7 +271,7 @@ setup_font_dirs() {
 					-- ${x} > /dev/null
 			fi
 
-			if [ "${x/encodings}" = "${x}" -a -x /usr/bin/xftcache ] && \
+			if [ "${x%*encodings*}" = "${x}" -a -x /usr/bin/xftcache ] && \
 			   [ -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
 			then
 				# xftcache is broken, but run it anyhow ...
@@ -313,7 +313,7 @@ start() {
 			# See discussion at http://freedesktop.org/bugzilla/show_bug.cgi?id=306
 			rm -rf /tmp/.font-unix
 			mkdir -m 1777 /tmp/.font-unix
-			((sanity+=1))
+			sanity=$((sanity+1))
 			if [ ${sanity} -gt 1000 ] ; then
 				eend 1 "i give up"
 				return 1