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.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 12 insertions, 60 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/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"