clean up

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

diff --git a/sys-apps/mlocate/ChangeLog b/sys-apps/mlocate/ChangeLog
index 7cf22ce97c9bb647551d164c03210165654d033f..cad0b888c927756f77bb9468db128a2ba5dc2a92 100644 (file)
--- 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/Manifest b/sys-apps/mlocate/Manifest
index e71a88993dacfdb97cecaa6fc007b70125a171cd..31e25b55a9a06dd60b166c5158407d7a12e4bd8d 100644 (file)
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.4.tar.xz 336512 RMD160 dc579d0bc1e7a70d618e0a6c115abb2797745f2c SHA1 6ce3caf02ac89f15c3c44f6eda7030708aa8b1ad SHA256 f6c26fd1a6739ac8ee36018a6b54551440257e8606082272cb3e43c69a56897e
-EBUILD mlocate-0.22.2-r1.ebuild 1353 RMD160 fdcbe9fd70df559e256ac769d923186b2c89fa30 SHA1 afb1bf6fe726974b47b6f9ddd9f7452389b25e18 SHA256 e443a2fa8d87ab25bebeceae07874ca153390a3d1d2927c093e0c7086b70ae10
 EBUILD mlocate-0.22.4.ebuild 1369 RMD160 e143abb8342e25b4df2802a38c951ff9b90ea1c0 SHA1 83121495ec90a760aa9e35e8adaa3dfd89560d02 SHA256 b43bda53f3c03f4b4af7369f8e1c07e060101db073ffc6b16adf4c8feecf35ed
-MISC ChangeLog 7857 RMD160 770e9704915df59f2d31af7781007dc75e62357e SHA1 52f5f9ba8838057207597baedf46bfdabd840c0e SHA256 4b779a46bdda6a7eeb82430415f7b0cad48996edee0bb4f2ce7e40c3f4dab310
+MISC ChangeLog 7975 RMD160 944444cb6ea0fb0328908fbc26ac888da1e8c5df SHA1 ba7f2f48baf9b7c671b8d1e698a2abcbab175b1e SHA256 1df3856bf891326cff068a3ed28b764cd3d8a3b2b76c8d632869ee25dc3b5e43
 MISC metadata.xml 269 RMD160 1db2638dff49f3fd7ca729da3e275c5a21019b1f SHA1 a02ae3c5cdfde4f63a1370a7c334d9e72c4887fd SHA256 76fb556342434f4a8ba872bc6dbb7a21f625b5fbd001ee467141d6b710ae82c6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkw6IE8ACgkQNQqtfCuFneP2yQCfVvRH3vUmpyBtgy0p0dH4bz4t
+eC8AniwpGo+fx0gG99V/r38R1Dw6PzEA
+=s3Ag
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/mlocate/files/mlocate.cron-r1 b/sys-apps/mlocate/files/mlocate.cron-r1
deleted file mode 100644 (file)
index e26daa6..0000000
--- 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 (file)
index 4ce49da..0000000
--- 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"
-}