clean up

Package-Manager: portage-2.2.7/cvs/Linux i686
Manifest-Sign-Key: 0x2B859DE3

3 files changed, 10 insertions, 82 deletions

diff --git a/sys-apps/mlocate/ChangeLog b/sys-apps/mlocate/ChangeLog
index 25d83ca6d354..2b69a6cf430b 100644
--- a/sys-apps/mlocate/ChangeLog
+++ b/sys-apps/mlocate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/mlocate
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.117 2013/09/05 05:14:13 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.118 2014/01/08 22:45:47 fauli Exp $
+
+  08 Jan 2014; Christian Faulhammer <fauli@gentoo.org> -mlocate-0.25.ebuild:
+  clean up
 
   05 Sep 2013; Mike Frysinger <vapier@gentoo.org> mlocate-0.26.ebuild:
   Add m68k/s390/sh keywords #338426 by SpanKY.
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index bd25705cdf4a..a8188d442a86 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -4,26 +4,14 @@ Hash: SHA256
 AUX mlocate-cron.conf 237 SHA256 856c1ab465b3e7ffdf752ba323bea9867ac902297fc4247ae15a575419b279c7 SHA512 ab055b052980783b5c63c716d7c12dcb19961a9f990c077e4f8c9bef4ca591bd281ac3941f872659a558a18b81c014dbc0655ff0a1872310670d8efc1d27cb00 WHIRLPOOL f7974d6514f52727c1b5213ded5f2050067afcc1eb9666da55a07845eab06fccfb27d100be102c0169b95b12c0244d0d62019d35d4596fc672216e5b152f3150
 AUX mlocate.cron-r2 1297 SHA256 dfceec061a018f2976f18b8ba874dc152cd9ee4595a6f9a25a6ef5307aeacae9 SHA512 d2f3790a52b426df0482836f15632e46d3e651aa64bf60f2048339723e01007bf59002b900e5d4137fb8e4c5d4d9df1c4351741f6600cc9784e347561093f691 WHIRLPOOL d107c2080ed22cf5107ce55312cc839fa6d252788fdb954ffb823378b02cf7684ce791bb9b764114d65ea63c76be4fabe04e8c8cf89d37dac951e893322db145
 AUX updatedb.conf 967 SHA256 afa4b1f5e7617f288ca83cfab3e8553b1ba92cb878f0f15a6f4817f31bfe9f66 SHA512 8702b452734b6d149544c4f8d55e3efd8d4aec39874cb48fb4c68144992fbde35312fa0d8abb6de4981746a420681af13c2637687a7bcc42003a8f8a032a33f6 WHIRLPOOL 6642d44b988a1cafc218b4196cdc2ef6b36c1009e541d07e1d115bb6d9e0d1ad9d1ba1b5536ce8ec159826e4b8d198b34b7f3e876df141d05697e437985ad779
-DIST mlocate-0.25.tar.xz 355900 SHA256 ab95c111f9dba35b5690896180dd0a7639dbf07d70b862fcb0731264d9273951 SHA512 14cf6b3244fad63c9cc3a546b07570aa914740801d5f97a619b8dca79e1ff77e01b6debd920bfb95d36de5fc445f0f915eab972598b424a94cd018a93b47a2eb WHIRLPOOL 3d8052d41b37ee75aa807665744df79d39c648c8b0ffc0846ae29f216ba35072224faa8861983fc17816d7799afe3b6c7eee7b89f127e97647fcb05e427b925e
 DIST mlocate-0.26.tar.xz 359204 SHA256 3063df79fe198fb9618e180c54baf3105b33d88fe602ff2d8570aaf944f1263e SHA512 b1207047e30a551cba39e70812439b554def567ebe9b8b81fed6f26435bb575beafe4875a21cd72876eadd85da4e7bfc942eb28b17c430b537c351690364837f WHIRLPOOL 7f0a2df135ce2ec74f2a113e7f88b29f3964aa53fff1c47eb9aa44df4447d7b41b59615571a7626a3b7395208df75641d407b7a9456e590338962cde85093129
-EBUILD mlocate-0.25.ebuild 1683 SHA256 8789e890d7222bc77958883f39bc5e5bb5bb125e8ebce05950d1242c06fd6e59 SHA512 f98ef790498b1824e58018b57f45693a9b2af24cf4330aafae8891c9ca40f3c32b8ab1d5c6e1faf9894cfe67f32dab207ef8a33f371925215938f7bc9b77e47f WHIRLPOOL e27c76add5d03cadb764f044237e80b9e048b6ab58987225109a9905e1e2251bf2b1bb4f96a55a2380f8c72b3465891123aa1a2cc6d4b1d4198fe8ea785151c4
 EBUILD mlocate-0.26.ebuild 1729 SHA256 84cbfecb4f55c1b846c776608ff321cddff6269edf03a3ea5a3d0fc1886c878e SHA512 7019e7507aa92447a05398bbb3574e8c5da394601f40750f2cc4f8d995f87d08ab7bd588b2a7ee4e0784b49e5a6f0dfbb06f30693ed60f390072cc2e5f4ef998 WHIRLPOOL 2f40bba5f599799b4bd7b519f342b8bef0cd9e17d80b3535dd311d90db1387f587c25b62f585ca96838446ef43a26442b17a2a5b1530c3c8cc4a15836236901e
-MISC ChangeLog 14380 SHA256 d014c68230ec95e25df383f402da1e99cdbe9a78c12d04ca011359a08d48ca26 SHA512 166fc02c3bed49f6f1f434be04587442704f9c2ab37adb140492626cfea1979cb0d68a3b4a003233d5803d2e72d271d4f65eeeb47053715ee46029bf8da75589 WHIRLPOOL 9f5e9ab9dc8d49981e46b05b1400975eb81c62bbf8849b936a5c3af82fb4601a97ee5cc985f3a8dca6b4c3828ef640ffcb93ba7b978a88ee703946714a0c1270
+MISC ChangeLog 14468 SHA256 ce4dd03dd16fbe57737ccf5f1d22caa2d001eb9ff5f5d4637a45344680c3b2ef SHA512 67c27f61ed7268a69bf7b6b9d8d2f0c6449cdc16c5c6a072f66110008c316619f60194b98ae03db13c2371345949cde30905b37b21e2ecca1e347a3cb3364e88 WHIRLPOOL a5e4c6e852d95e4a386242294aff011256f67769a8e2a731134a005f1ea43d125b4d8125f3b50c66c41ce9740d50fb45164a0662c29b7b5ecc437d35be8556b4
 MISC metadata.xml 269 SHA256 76fb556342434f4a8ba872bc6dbb7a21f625b5fbd001ee467141d6b710ae82c6 SHA512 45237b40e8f574dd054749e552b73a1f980a34583ff1972eaef603cc4cfba56dee59a7dc2566afa3fe8f663225b0eb666ab3fc088b22220103a397809c2c9f72 WHIRLPOOL 691a8f0df73feb0f318622e083147e6ca05b203dc6aa26a4aa787f9b84050800077c6474d9ef2b667bfc94a138712a13c716ca7ffab3efe10122781e41510e77
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSKBMtAAoJELEHsLL7fEFWVGMP/1BBnUR7I9vLbidF+AtWUnGL
-7oHUxLZ5JRLj6T6VWPdWw5OTGeAZfgKC8HvGs+GLDzedq8zXFiBt4u0CBJJemSfQ
-XOyAuB++48Ih1y8/M6xkmtp8lg0ct9YVOb1/ApFEzEx9Nx88Q4UgTPIVLhafUJhS
-F125OG8UahiTXyQj8XBvY3z+68esm9psZ0P85zfG+nTzb4GxtiYVMeiYwX4JpBK6
-kzj5x20cS34+xY6GdmHHQl7Q1RSAUS4qOEYekZhngoRpv6Hwe0efiBMPsIKgWKba
-bSHJN/h+oS3raZoCQWLqhxM72yinkvbsoYimnEBnopc9o4or/T+6p76B1DzR4VBN
-81fur20qe+a/fZ9DhXPflxVb/37/z+/BXO8xfDn8slaP5X40T5iI2HzT5jk/Zuhp
-2SRMxYkmkRgJTjxHg+zWVqNW4miqlp8xtYEqBk/yaU8czLI5ecMN4o5p+2HjydsM
-T1wXCLVNpM3E9MxMjtSVPBoYdOAAJdO5J3W14diIp6xgJ1lbLzGMi3/eXThqXNcX
-HZo4HrdDAMJt8m4jInaCuCjyaOQGl1xxCpt1hmAuXx09K9CobvvR5xiQLjOTRDaq
-wO50/loI6nooKWK1AJqm2iXM/WjLVa24YaqKGk6wINsYlFKbKMdH47OEYVJf/MpC
-5BNrliMHntvdaoopE8HR
-=IvrR
+iEYEAREIAAYFAlLN1YQACgkQNQqtfCuFneNl+ACfaRClhmx0CNeVOHttGx69x8d9
+t4QAn3HJyzMMCYFDLauwnhky5L60W9lX
+=bLX4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/mlocate/mlocate-0.25.ebuild b/sys-apps/mlocate/mlocate-0.25.ebuild
deleted file mode 100644
index 0e7c29d8cb91..000000000000
--- a/sys-apps/mlocate/mlocate-0.25.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.25.ebuild,v 1.9 2012/08/19 16:56:06 armin76 Exp $
-
-EAPI=4
-inherit eutils user
-
-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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="nls selinux"
-
-RDEPEND="!sys-apps/slocate
-	!sys-apps/rlocate
-	selinux? ( sec-policy/selinux-slocate )"
-DEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )
-	selinux? ( sec-policy/selinux-slocate )"
-
-pkg_setup() {
-	enewgroup locate
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_compile() {
-	emake groupname=locate
-}
-
-src_install() {
-	emake groupname=locate DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README NEWS
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-	doins "${FILESDIR}"/mlocate-cron.conf
-	fperms 0644 /etc/{updatedb,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
-
-	keepdir /var/lib/mlocate
-	chown -R 0:locate "${ED}"/var/lib/mlocate
-	fperms 0750 /var/lib/mlocate
-}
-
-pkg_postinst() {
-	elog "The database for the locate command is generated daily by a cron job,"
-	elog "if you install for the first time you can run the updatedb command manually now."
-	elog
-	elog "Note that the /etc/updatedb.conf file is generic,"
-	elog "please customize it to your system requirements."
-}