Revision bump with perserved stable keywords. Fix typo in cronfile that prevented cronjob to operate per bug #353122. Drop older affected version to ensure everyone upgrade.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 15 insertions, 65 deletions

diff --git a/sys-apps/mlocate/ChangeLog b/sys-apps/mlocate/ChangeLog
index ab48f0185b64..ae09305f484e 100644
--- a/sys-apps/mlocate/ChangeLog
+++ b/sys-apps/mlocate/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/mlocate
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.83 2011/01/24 12:39:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.84 2011/01/30 13:16:50 scarabeus Exp $
+
+*mlocate-0.23.1-r1 (30 Jan 2011)
+
+  30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> -mlocate-0.22.4.ebuild,
+  -mlocate-0.23.1.ebuild, +mlocate-0.23.1-r1.ebuild, files/mlocate.cron-r2:
+  Revision bump with perserved stable keywords. Fix typo in cronfile that
+  prevented cronjob to operate per bug #353122. Drop older affected version to
+  ensure everyone upgrade.
 
   24 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> files/mlocate.cron-r2,
   files/mlocate-cron.conf, files/updatedb.conf:
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index 0e7c1a2ba2a5..94dad99d3c0e 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -1,9 +1,7 @@
 AUX mlocate-cron.conf 237 RMD160 9cf92cb5bd0071f75b644fc336697176f71cabea SHA1 bf712392e377686d4d11c144e188eb09499bef59 SHA256 856c1ab465b3e7ffdf752ba323bea9867ac902297fc4247ae15a575419b279c7
-AUX mlocate.cron-r2 1257 RMD160 546c931ffcdf056bcf8b52d8b90eaa7e98806349 SHA1 44121f278a42c2a429511f2a457b4319c614a19b SHA256 469b473f67e2084eec8bba9f2d1905a4730cc7e53579eb78b49199fdc6b83bb7
+AUX mlocate.cron-r2 1260 RMD160 7df658cf3804ad7a10b10f17c841c5da066116c5 SHA1 90570f9449104bc174f25cf44d45adfe24655439 SHA256 ab3d378494c0488820e158ae2128b1548c46397d68ad1fdd8b026f0ce0030875
 AUX updatedb.conf 967 RMD160 5b6dd3fe1ed0ab872608859fdedf40d69b706b53 SHA1 12e952e74e7f25d165e100e88f033a98d3848178 SHA256 afa4b1f5e7617f288ca83cfab3e8553b1ba92cb878f0f15a6f4817f31bfe9f66
-DIST mlocate-0.22.4.tar.xz 336512 RMD160 dc579d0bc1e7a70d618e0a6c115abb2797745f2c SHA1 6ce3caf02ac89f15c3c44f6eda7030708aa8b1ad SHA256 f6c26fd1a6739ac8ee36018a6b54551440257e8606082272cb3e43c69a56897e
 DIST mlocate-0.23.1.tar.xz 347960 RMD160 d124b2f67a1a6ad1731cc3414febd8429228c88d SHA1 1c8d10a6ae8185b8e7c88091d383563650e69ece SHA256 cec92e2fd946f14d236d5e85570bddb5c487b3e1d8a6f1a2691bb1f07d696ff7
-EBUILD mlocate-0.22.4.ebuild 1375 RMD160 2ef5c187c64889025b6290f55e16e6268ca3bbd4 SHA1 d576ce437f792c66def62bff0f9a59bf5f6b4ff9 SHA256 9f2689dc92a1b053b670e3fe63441f0ac271962e50beeb173c5d83098d9f7468
-EBUILD mlocate-0.23.1.ebuild 1542 RMD160 2bc0ae6cdaf79ec8d24e9960b9e84a00113a6ea7 SHA1 567c96bd36f3dc31f16523ff4ab96e5a64f13c43 SHA256 e66614ab0da944072288fc27eecced04a2c4004a108e3695f7d07bcdfb755209
-MISC ChangeLog 10144 RMD160 20e7176257a678e852534d86f108e58de03305e8 SHA1 7a76aad57b3650d50aa6e2f38ab679582eaab6c3 SHA256 af1bef75cffd8487bdf20a2b0ef60cc48bf4214b376407cf294a3dbf3db8003e
+EBUILD mlocate-0.23.1-r1.ebuild 1548 RMD160 2c5db339bbbe907085993108ec199c2956bba27d SHA1 2919e5ac0b574ac41a9d3b8ef4db8af1f400ea98 SHA256 59e4653910a64b1d98915395b1b823b4afe9e53be321f8d2930d8289230e9a92
+MISC ChangeLog 10514 RMD160 6ecc6c724415921e7b3de73a2be88a73997cffea SHA1 6fbccdc9282f4fd4228da2505f53ee111d6cd9d2 SHA256 cf029dd7327b93c53777cd49dad69110f96c6dfe8039118f42d3064855644c59
 MISC metadata.xml 269 RMD160 1db2638dff49f3fd7ca729da3e275c5a21019b1f SHA1 a02ae3c5cdfde4f63a1370a7c334d9e72c4887fd SHA256 76fb556342434f4a8ba872bc6dbb7a21f625b5fbd001ee467141d6b710ae82c6
diff --git a/sys-apps/mlocate/files/mlocate.cron-r2 b/sys-apps/mlocate/files/mlocate.cron-r2
index 20b2ba7d6ab3..6babee2eae2d 100644
--- a/sys-apps/mlocate/files/mlocate.cron-r2
+++ b/sys-apps/mlocate/files/mlocate.cron-r2
@@ -35,6 +35,7 @@ fi
 # alter the priority of the updatedb process
 if [ -x /usr/bin/renice ]; then
 	/usr/bin/renice +${NICE:-19} -p $$ > /dev/null 2>&1
+fi
 if [ -x /usr/bin/ionice ] && /usr/bin/ionice -c3 true 2>/dev/null; then
 	/usr/bin/ionice -c${IONICE_CLASS:-2} -n${IONICE_PRIORITY:-7} -p $$ > /dev/null 2>&1
 fi
diff --git a/sys-apps/mlocate/mlocate-0.22.4.ebuild b/sys-apps/mlocate/mlocate-0.22.4.ebuild
deleted file mode 100644
index 12ba33510c1a..000000000000
--- a/sys-apps/mlocate/mlocate-0.22.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.22.4.ebuild,v 1.10 2010/10/05 18:49:32 jer Exp $
-
-EAPI=3
-
-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.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!sys-apps/slocate
-	!sys-apps/rlocate"
-DEPEND="app-arch/xz-utils"
-
-pkg_setup() {
-	enewgroup locate
-}
-
-src_compile() {
-	emake groupname=locate || die
-}
-
-src_install() {
-	emake groupname=locate DESTDIR="${D}" install || die
-	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-r2" 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
-}
-
-pkg_postinst() {
-	elog "Note that the /etc/updatedb.conf file is generic"
-	elog "Please customize it to your system requirements"
-}
diff --git a/sys-apps/mlocate/mlocate-0.23.1.ebuild b/sys-apps/mlocate/mlocate-0.23.1-r1.ebuild
index bbfcd8d2a6e1..dd42e956ed8f 100644
--- a/sys-apps/mlocate/mlocate-0.23.1.ebuild
+++ b/sys-apps/mlocate/mlocate-0.23.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.23.1.ebuild,v 1.13 2010/11/21 14:57:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.23.1-r1.ebuild,v 1.1 2011/01/30 13:16:50 scarabeus Exp $
 
 EAPI="3"