clean up

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 5 insertions, 78 deletions

diff --git a/sys-apps/mlocate/ChangeLog b/sys-apps/mlocate/ChangeLog
index 7cf22ce97c9b..cad0b888c927 100644
--- a/sys-apps/mlocate/ChangeLog
+++ b/sys-apps/mlocate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/mlocate
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.65 2010/07/11 17:24:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.66 2010/07/11 19:47:38 fauli Exp $
+
+  11 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  -mlocate-0.22.2-r1.ebuild, -files/mlocate.cron-r1:
+  clean up
 
   11 Jul 2010; Raúl Porcel <armin76@gentoo.org> mlocate-0.22.4.ebuild:
   sparc stable wrt #325059
diff --git a/sys-apps/mlocate/files/mlocate.cron-r1 b/sys-apps/mlocate/files/mlocate.cron-r1
deleted file mode 100644
index e26daa667bac..000000000000
--- a/sys-apps/mlocate/files/mlocate.cron-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /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/mlocate-0.22.2-r1.ebuild b/sys-apps/mlocate/mlocate-0.22.2-r1.ebuild
deleted file mode 100644
index 4ce49da4fcde..000000000000
--- a/sys-apps/mlocate/mlocate-0.22.2-r1.ebuild
+++ /dev/null
@@ -1,55 +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.2-r1.ebuild,v 1.5 2010/04/05 19:24:27 hwoarang 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 ~ia64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="!sys-apps/slocate
-	!sys-apps/rlocate"
-
-pkg_setup() {
-	enewgroup locate
-}
-
-src_compile() {
-	econf || die
-	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"
-}