enable usage of ionice to keep annoyance during database update down, thanks to Daniel Pielmeier <daniel DOT pielmeier AT googlemail DOT com> in bug 231203; also get updatedb.conf in sync with slocate's version

Package-Manager: portage-2.1.4.4

6 files changed, 114 insertions, 8 deletions

diff --git a/sys-apps/mlocate/ChangeLog b/sys-apps/mlocate/ChangeLog
index 5f5dad658171..d8158d074655 100644
--- a/sys-apps/mlocate/ChangeLog
+++ b/sys-apps/mlocate/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/mlocate
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.26 2008/08/12 08:39:44 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.27 2008/09/07 02:12:10 opfer Exp $
+
+*mlocate-0.21-r1 (07 Sep 2008)
+
+  07 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/mlocate.cron-r1, +files/mlocate-cron.conf, files/updatedb.conf,
+  +mlocate-0.21-r1.ebuild:
+  enable usage of ionice to keep annoyance during database update down,
+  thanks to Daniel Pielmeier <daniel DOT pielmeier AT googlemail DOT com> in
+  bug 231203; also get updatedb.conf in sync with slocate's version
 
   12 Aug 2008; Christian Faulhammer <opfer@gentoo.org> -mlocate-0.20.ebuild:
   clean up
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index 3a84bc5c17c5..c6f51aacd174 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mlocate-cron.conf 237 RMD160 ab1a0e1a4fb6169bb4ce8ae71af2f9854b97bffb SHA1 893c15f186908b78b67896c4f61d11d92a4d0473 SHA256 97710bbb9d5ff0d1985a2685522789210dd677db22d72e7417bff4645e394655
 AUX mlocate.cron 152 RMD160 bc5c48ff209516873ac858f1ee9f88b635507fb9 SHA1 3566c291ec0644051029e2c6b75e15957ab1e8a0 SHA256 2d682a0938a7d855b9dfff40c4fa31acd587c298c758be274a761ab9cc0a9e0f
-AUX updatedb.conf 614 RMD160 c73d6f483328b70be392006194b9fdd344ac2963 SHA1 9554b06fabcf42da28292dcddba29d583755d630 SHA256 f70702b5fc46d494e0044619a29a18356a19a15cb1e3acf009ae05366fd898e0
+AUX mlocate.cron-r1 436 RMD160 d95a0b266b4ac7d82b8fe9308de4887c775fa21c SHA1 85a50d6016754d0d44efb0ba7f1a80a3b6d06a12 SHA256 bed0695a2f281ab1578eaff26bba981fce8ef49ba3ac444ba0db8d287013abd0
+AUX updatedb.conf 639 RMD160 906b0abbd8cce804303fa17766bd9f67a90cd0de SHA1 74414db7d4f08ca26b4ed824fe87c32a1701f861 SHA256 f79c606e26df96c009cf831396590c2256ee8ab268862b708ee95431ab4a5d82
 DIST mlocate-0.21.tar.bz2 343807 RMD160 adcd416f9bd895955a803a284d5fdae73ed8e900 SHA1 af734e149f1a936028d2680c067921c40eab7230 SHA256 d9018db360d02964d5137aff285fcf2ce8de45bd724a1a26b85cdc4bc745cf67
+EBUILD mlocate-0.21-r1.ebuild 1623 RMD160 3a005db8d1a8982a0bbe14fda2db245661f9bf7b SHA1 cf558bbc7e48af76d821b2870940f9f3a3c3933a SHA256 93f6767a52b3f37a9a5010d1430824c3f25e0789d1b552caa9b42ccad1ff4e65
 EBUILD mlocate-0.21.ebuild 1525 RMD160 8479c8e3eb90f5d9a1a540350b0c68a17344db16 SHA1 88804fc556ba385a2af1c313d14bf9157a2b0fe0 SHA256 fea1f332013a987e16e006771c0e56570814531d0345d635806c6dd94b2fc409
-MISC ChangeLog 3118 RMD160 b87008ea1a7e59351d00ce878f85fd5c0b425edc SHA1 fc5141bee86654f7bd264f10ba024b0a94eec3f0 SHA256 6c26362e5627ce3ede52afba6c407c6e1cfa4e9b1da0f6a71f07406633db144c
+MISC ChangeLog 3523 RMD160 439aa9272efc207241c5477c6607c9e1051afde2 SHA1 4f6863571642ca0919ad8096861f943be84e2354 SHA256 ac23faf66fde422ca2576e7bca025f04d19bd6f7a4255ebaca2dec8b9978c919
 MISC metadata.xml 269 RMD160 cbb67f1fbbd755cd836fc0585dc2008fe659f7cf SHA1 761df8ba5b64d20b9f77784eed2fb896d881b445 SHA256 56bef26b1756d2cf3cc512c816b63cf0b97fa629d5bda01b51c3c63436ef3a9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkihTHwACgkQNQqtfCuFneNmBACbBNkwvOPU8LBhwYwiIy5Q0rs0
-fnsAn3COINHFKLN+wDyCUjSGtpQm6aNY
-=7Lzx
+iEYEARECAAYFAkjDOIIACgkQNQqtfCuFnePY5ACePN+q2rRBq+RkqSWO+h5f7Hsb
+Y9MAnRwvUMc1lvY3KTevtH+154d89gY4
+=wOYX
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/mlocate/files/mlocate-cron.conf b/sys-apps/mlocate/files/mlocate-cron.conf
new file mode 100644
index 000000000000..886a984c8a56
--- /dev/null
+++ b/sys-apps/mlocate/files/mlocate-cron.conf
@@ -0,0 +1,9 @@
+# nice value to run at: see -n in nice(1)
+NICE="10"
+
+# ionice class to run at: see -c in ionice(1)
+# you have to install sys-apps/util-linux manually
+IONICE_CLASS="2"
+
+# ionice priority to run at: see -n in ionice(1)
+IONICE_PRIORITY="7"
diff --git a/sys-apps/mlocate/files/mlocate.cron-r1 b/sys-apps/mlocate/files/mlocate.cron-r1
new file mode 100644
index 000000000000..e26daa667bac
--- /dev/null
+++ b/sys-apps/mlocate/files/mlocate.cron-r1
@@ -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
+		source /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/files/updatedb.conf b/sys-apps/mlocate/files/updatedb.conf
index 0c7668153aaf..dba67c05fc19 100644
--- a/sys-apps/mlocate/files/updatedb.conf
+++ b/sys-apps/mlocate/files/updatedb.conf
@@ -1,11 +1,11 @@
 # /etc/updatedb.conf: config file for slocate
-# $Id: updatedb.conf,v 1.1 2007/07/08 10:26:09 opfer Exp $
+# $Id: updatedb.conf,v 1.2 2008/09/07 02:12:11 opfer Exp $
 
 # This file sets variables that are used by updatedb.
 # For more info, see the updatedb.conf(5) manpage.
 
 # Filesystems that are pruned from updatedb database
-PRUNEFS="afs auto autofs cifs devfs devpts eventpollfs futexfs hugetlbfs iso9660 mqueue ncpfs nfs NFS nfsd nnpfs pipefs proc ramfs rpc_pipefs sfs shfs smbfs sockfs subfs supermount sysfs tmpfs udf usbfs vperfctrfs"
+PRUNEFS="afs auto autofs cifs devfs devpts eventpollfs futexfs gfs hugetlbfs iso9660 mqueue ncpfs nfs NFS nfs4 nfsd nnpfs pipefs proc ramfs rpc_pipefs selinuxfs sfs shfs smbfs sockfs spufs subfs supermount sysfs tmpfs udf usbfs vperfctrfs"
 
 # Paths which are pruned from updatedb database
 PRUNEPATHS="/tmp /var/tmp /root/.ccache"
diff --git a/sys-apps/mlocate/mlocate-0.21-r1.ebuild b/sys-apps/mlocate/mlocate-0.21-r1.ebuild
new file mode 100644
index 000000000000..9d8da4cd9ead
--- /dev/null
+++ b/sys-apps/mlocate/mlocate-0.21-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.21-r1.ebuild,v 1.1 2008/09/07 02:12:10 opfer Exp $
+
+inherit eutils
+
+DESCRIPTION="Merging locate is an utility to index and quickly search for files"
+HOMEPAGE="https://fedorahosted.org/mlocate/"
+SRC_URI="https://fedorahosted.org/releases/m/l/mlocate/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!sys-apps/slocate
+	!sys-apps/rlocate"
+
+pkg_setup() {
+	enewgroup locate
+}
+
+src_compile() {
+	econf || die "econf failed"
+	emake groupname=locate || die "emake failed"
+}
+
+src_install() {
+	emake groupname=locate DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README NEWS
+
+	insinto /etc
+	doins "${FILESDIR}/updatedb.conf"
+	fperms 0644 /etc/updatedb.conf
+
+	insinto /etc
+	doins "${FILESDIR}/mlocate-cron.conf"
+	fperms 0644 /etc/mlocate-cron.conf
+
+	insinto /etc/cron.daily
+	newins "${FILESDIR}/mlocate.cron-r1" mlocate
+	fperms 0755 /etc/cron.daily/mlocate
+
+	fowners 0:locate /usr/bin/locate
+	fperms go-r,g+s /usr/bin/locate
+
+	chown -R 0:locate "${D}/var/lib/mlocate"
+	fperms 0750 /var/lib/mlocate
+	keepdir /var/lib/mlocate
+}
+
+src_test() {
+	if has userpriv ${FEATURES} && ! has usersandbox ${FEATURES}; then
+		make check-local || die "test suite failed"
+	else
+		ewarn "Activate FEATURES=userpriv and deactivate FEATURES=usersandbox to run testsuite."
+	fi
+}
+
+pkg_postinst() {
+	elog "Note that the /etc/updatedb.conf file is generic"
+	elog "Please customize it to your system requirements"
+}