remove Bashisms from cron file, thanks to Richard Li <admin AT chys DOT info> in bug 293459

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 38 insertions, 8 deletions

diff --git a/sys-apps/mlocate/ChangeLog b/sys-apps/mlocate/ChangeLog
index 6b2247594b2d..f0ea4fe5c9c3 100644
--- a/sys-apps/mlocate/ChangeLog
+++ b/sys-apps/mlocate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/mlocate
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.51 2009/11/18 10:25:00 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.52 2009/11/18 10:29:14 fauli Exp $
+
+*mlocate-0.22.2-r1 (18 Nov 2009)
+
+  18 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
+  -mlocate-0.22.2.ebuild, +mlocate-0.22.2-r1.ebuild, +files/mlocate.cron-r2:
+  remove Bashisms from cron file, thanks to Richard Li <admin AT chys DOT
+  info> in bug 293459
 
   18 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
   -mlocate-0.22.1.ebuild:
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index ccd679c07754..e9e88538298c 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -3,17 +3,18 @@ Hash: SHA1
 
 AUX mlocate-cron.conf 237 RMD160 ab1a0e1a4fb6169bb4ce8ae71af2f9854b97bffb SHA1 893c15f186908b78b67896c4f61d11d92a4d0473 SHA256 97710bbb9d5ff0d1985a2685522789210dd677db22d72e7417bff4645e394655
 AUX mlocate.cron-r1 436 RMD160 d95a0b266b4ac7d82b8fe9308de4887c775fa21c SHA1 85a50d6016754d0d44efb0ba7f1a80a3b6d06a12 SHA256 bed0695a2f281ab1578eaff26bba981fce8ef49ba3ac444ba0db8d287013abd0
+AUX mlocate.cron-r2 431 RMD160 34ee30b7713856bd29917d61d41ddfc793863ad6 SHA1 7a1818e52b2b58d2fc5f98d838b0af219e409979 SHA256 5879c2576db731482fbc6ab31d86c92132545b37d15ba70a2e920fb0cbb46d80
 AUX updatedb.conf 650 RMD160 a6de9490fe4bd2ed81660a2b50e8f429c04a612c SHA1 590b1496d8488f8a04f89d08397d7635cfebcf4d SHA256 180cc37bbe3327ec25dbd8468d3338e6778a82313e1ba63129b2e6a1782d4ebc
 DIST mlocate-0.22.2.tar.bz2 397814 RMD160 9da4459815ef0d5713704602898331f366631400 SHA1 4ea269e81819c664e45c082a75011aed72bd5b46 SHA256 6029f635a50f4578946d27b423d33a1969953cc1dbe5fd78d0db49d765c983cc
 DIST mlocate-0.22.tar.bz2 369417 RMD160 703b32cf431352ea8003bbebf2e2511b128ef25b SHA1 73fb6738d43075422bd84564c166e8e07fadb9aa SHA256 fe168cb906666d493e8d1d42df871e63858816ba3a39b4faa63c1ae92b4d8154
-EBUILD mlocate-0.22.2.ebuild 1351 RMD160 199af65b71f15be081ba5cc92407ce56eedd0c2f SHA1 bae701f0edb8e0db305577e55ad6a6a4c8b1702d SHA256 726354aebf6deea96265fcc7bdb91d943ced8a319ea9b5b1a2ce53f96e7c1ef1
+EBUILD mlocate-0.22.2-r1.ebuild 1354 RMD160 02dac2af6eb4443cf7d62339062f38119d881615 SHA1 34ba29f5bce1287942812e97ae63f49e7f19f4f5 SHA256 3cb740282bc6bc98377bb9774b33911152d0ab789625d2f6309b5aa6c251fdf3
 EBUILD mlocate-0.22.ebuild 1339 RMD160 88b69a35d525eb1262feb2ec6dc412a96318ba64 SHA1 7a3b586ef7483f8ae3681765f742128c9eb82980 SHA256 dbd6b3ae30c652dd22dabab02d099e065163bfed857b664a8fbb48afc4ab82c9
-MISC ChangeLog 6233 RMD160 d471daddb4a10a44e3ff0fa5059070e638da3a7c SHA1 a81a4ecaab6c821ce31c76d30a6ab28403b9b300 SHA256 fde913849e25ff34543b84a6cb8d4b865f8ecd3a791ca5ade014b550ce0d286f
+MISC ChangeLog 6496 RMD160 f71f7f37a29e354bdb8f09a9475671f8a34d320c SHA1 b22130e66a7781279acb00889b6b0d0314efe13c SHA256 8c24aeaf4cf9e639fd2221de6b60a739e98feca23b2ef6863940cdaf28fe88b7
 MISC metadata.xml 269 RMD160 1db2638dff49f3fd7ca729da3e275c5a21019b1f SHA1 a02ae3c5cdfde4f63a1370a7c334d9e72c4887fd SHA256 76fb556342434f4a8ba872bc6dbb7a21f625b5fbd001ee467141d6b710ae82c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksDy4cACgkQNQqtfCuFneNnLwCgkuT4MfBq590/xPFKdTbKdash
-9CoAnAif/Ne70wDOEuQ2ddDr13MOoNHn
-=2Sn1
+iEYEARECAAYFAksDzIUACgkQNQqtfCuFneMC5gCdGg3sXK8Kr6/wWe5DlA8XyK6k
+Da0An2ZDT8/9HY3fo0T/3PpjKFrI3BH7
+=qYw1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/mlocate/files/mlocate.cron-r2 b/sys-apps/mlocate/files/mlocate.cron-r2
new file mode 100644
index 000000000000..3074f132aaa7
--- /dev/null
+++ b/sys-apps/mlocate/files/mlocate.cron-r2
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+if [ -x /usr/bin/updatedb ]
+then
+	if [ -f /etc/updatedb.conf ]
+	then
+	    args=""
+	else
+	    args="-f proc"
+	fi
+
+	if [ -f /etc/mlocate-cron.conf ]
+	then
+		. /etc/mlocate-cron.conf
+	fi
+
+	# run on active process in case ionice isnt installed, or
+	# system is really old and ionice doesnt work ...
+	ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} -p $$ 2>/dev/null
+
+	nice -n ${NICE:-10} /usr/bin/updatedb ${args}
+fi
diff --git a/sys-apps/mlocate/mlocate-0.22.2.ebuild b/sys-apps/mlocate/mlocate-0.22.2-r1.ebuild
index cbcc237c53ee..6d5caef79c05 100644
--- a/sys-apps/mlocate/mlocate-0.22.2.ebuild
+++ b/sys-apps/mlocate/mlocate-0.22.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.22.2.ebuild,v 1.1 2009/10/24 14:43:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.22.2-r1.ebuild,v 1.1 2009/11/18 10:29:14 fauli Exp $
 
 inherit eutils
 
@@ -38,7 +38,7 @@ src_install() {
 	fperms 0644 /etc/mlocate-cron.conf
 
 	insinto /etc/cron.daily
-	newins "${FILESDIR}/mlocate.cron-r1" mlocate
+	newins "${FILESDIR}/mlocate.cron-r2" mlocate
 	fperms 0755 /etc/cron.daily/mlocate
 
 	fowners 0:locate /usr/bin/locate