Version bump to latest. Remove older. Fixes bug#437144.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 36 insertions, 22 deletions

diff --git a/sys-apps/mlocate/ChangeLog b/sys-apps/mlocate/ChangeLog
index 0ee26d6dfbb1..d42819f3eb90 100644
--- a/sys-apps/mlocate/ChangeLog
+++ b/sys-apps/mlocate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/mlocate
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.105 2012/08/19 16:56:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/ChangeLog,v 1.106 2012/11/12 13:07:30 scarabeus Exp $
+
+*mlocate-0.26 (12 Nov 2012)
+
+  12 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> +mlocate-0.26.ebuild,
+  -mlocate-0.24.ebuild:
+  Version bump to latest. Remove older. Fixes bug#437144.
 
   19 Aug 2012; Raúl Porcel <armin76@gentoo.org> mlocate-0.25.ebuild:
   alpha/ia64/sparc stable wrt #422183
@@ -384,4 +390,3 @@
   +files/updatedb.conf, +metadata.xml, +mlocate-0.17.ebuild:
   new ebuild for bug 127010, thanks to José Romildo Malaquias
   <j.romildo@gmail.com>
-
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index da8ec8f2e12f..f96ba0c2fc46 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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.24.tar.xz 353948 SHA256 5787bee846735e21ff57df9e345d5db73d684d2cea9efc0f387462ccfbc6796f
-DIST mlocate-0.25.tar.xz 355900 SHA256 ab95c111f9dba35b5690896180dd0a7639dbf07d70b862fcb0731264d9273951
-EBUILD mlocate-0.24.ebuild 1720 SHA256 34c8b8d2e46934c8ced4145d94548c6f0e9ebe8816bbb7596dae77e88f37832f SHA512 8a5b60a13efae4f3d7d737cf8fb518def2a9232c5117ad986bdb6b3de70d896c92972687cb3b4516d2412a4f89c287134d36e093756c1404d6ef609e65519e62 WHIRLPOOL fbc6c53a04fa3102281ddee542d20e48522e5d723dff88ccf02165f248647f367536cf2defe6c2d22ab1f88f741ce13ef7ee3e80515138bd13d54eb66d0be855
+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
-MISC ChangeLog 12973 SHA256 25d3f47328fbad23cd31cc24b54f6b194f649a000e6b8a4c2bde531831c8bf52 SHA512 4b2692528885c4260f7bff53db5d4bac0476458a7d62c0495ec4ee73efe62b25ab1a3390ea17e8f53504bdeb1ac4a9ce85b81835c72c536fae7927f78308fb38 WHIRLPOOL 6224ede2106ab7f7dde194c10129398164220db78c9ab21938becfa6b5b5cd6dcac924aadaa7e6fd0ae5c0124ad68e4e81011c96500a7487f890a761b009b98f
+EBUILD mlocate-0.26.ebuild 1694 SHA256 00669e863102cbdfea9033e02820b3a24c5fa5f671451dd11cee966c5658c8e9 SHA512 f1a015727984c6b2b7dabc94cffc7e5dd9626c5530cbdc34be3a3a726251aa36250a6307505944d6de24c2adf916ced4f0447bfd2c1f5ac912492d7152f316b0 WHIRLPOOL d61214eb38a271b8945f86442b73776c5553b7d636ded79a30f5c3aa2f742687ad427660f8114979ca715ae6fac1b3f3ba369cb4b214bd4f2f794c4bb1a3350f
+MISC ChangeLog 13163 SHA256 e15a3f4474ba776550a6e6805619d485bb3bddbdf34225a883cbce42a146e0d4 SHA512 f4ae27b055104faefcaae1bfe4d62c69c53215df36ab4e4060f7072df766d61d3f4899b6b37ed1386e5d326601240a43f02d8970d700f5af9f5a3d1515f0a146 WHIRLPOOL 7476fc908983da5ee05ccd430d14294c840f8d5592b39951a484c8a1185f3297d81909dce6389c21fe25c576b41349fbadb831f3f35bdfa3dccf14f8a7b48b0d
 MISC metadata.xml 269 SHA256 76fb556342434f4a8ba872bc6dbb7a21f625b5fbd001ee467141d6b710ae82c6 SHA512 45237b40e8f574dd054749e552b73a1f980a34583ff1972eaef603cc4cfba56dee59a7dc2566afa3fe8f663225b0eb666ab3fc088b22220103a397809c2c9f72 WHIRLPOOL 691a8f0df73feb0f318622e083147e6ca05b203dc6aa26a4aa787f9b84050800077c6474d9ef2b667bfc94a138712a13c716ca7ffab3efe10122781e41510e77
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAxGqwACgkQuQc30/atMkCMlACgv/xEVA0LxTMbuLzIyjeyOC8w
-GZ4An0a/zCDoQi985f7cXXg13ndgvWv8
-=PYjB
+iQIcBAEBCAAGBQJQoPRjAAoJEOSiRoyO7jvogn0QAJganotlsT4IShtkMxym8QzY
+7X5W4hxPE1cGmBdsoN58DxFT6TyC2seFg+rfHpCbI7xESsQyb+0rvhRlu2LDMLab
++DBvPJIRkTdk89aTjrf9SWrWJcvr6OOBIoRgrP4wB9Kjcp0SHz5A/qLHn2rRhqQh
+PtX7PL4jYt3Kz8iLeCMh+3S5Wx3SlGzM8lGvQviyl0EsNLvZqHPSBC2SLYyM8ASq
+b0hxxgjug3VX/M8sIuuKxHGZXODytugMN0BcUx8jWa/KVTp3CTWqyvOCUFc6nEjz
+QnmXr/Z0DSUDctlI23L1r2USd/vtwYNOlV3oCCUS33pJuK9kg5qbr2vF2rFhpURf
+/klQ6ByPJUb8dlNgDOLYJbFn/dlOeDLWKz2iNDMGVSt/dVzA794LTs2X+yDb9A3s
+QyUMq0XMCp7UG+mk4VMI6LR/HmXmskD2++tGoZsNLj+VuvTg8Igmlv1DZilt1eOz
+HPNx/QsHLmXbfEWPNKt+k1Us1NLP+0QDaJZ0RwZuBpH9PIvY6QdCiE+fCNiCJNXd
+NdmOUOhbTLdSalereAwgvbruZoJduvBU0bomsFe6fPWphjL3CFOjEplsG4HJoYev
+G25eVJ4kd357ZWoYRnJE7qdhOmjw7ZJge7ia16HSAZ2bn9tRwKSNqbX67KvWyNiL
+zs9tvPVD/H+0m2+gIVmJ
+=hzfW
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/mlocate/mlocate-0.24.ebuild b/sys-apps/mlocate/mlocate-0.26.ebuild
index 4e1de453ef8b..7f0ebadac22e 100644
--- a/sys-apps/mlocate/mlocate-0.24.ebuild
+++ b/sys-apps/mlocate/mlocate-0.26.ebuild
@@ -1,9 +1,8 @@
 # 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.24.ebuild,v 1.10 2012/05/24 04:16:36 vapier Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mlocate/mlocate-0.26.ebuild,v 1.1 2012/11/12 13:07:30 scarabeus Exp $
 
+EAPI=4
 inherit eutils user
 
 DESCRIPTION="Merging locate is an utility to index and quickly search for files"
@@ -12,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls selinux"
 
 RDEPEND="!sys-apps/slocate
@@ -27,31 +26,31 @@ pkg_setup() {
 }
 
 src_configure() {
-	econf $(use_enable nls) || die
+	econf $(use_enable nls)
 }
 
 src_compile() {
-	emake groupname=locate || die
+	emake groupname=locate
 }
 
 src_install() {
-	emake groupname=locate DESTDIR="${D}" install || die
+	emake groupname=locate DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog README NEWS
 
 	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf || die
-	doins "${FILESDIR}"/mlocate-cron.conf || die
+	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
+	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 "${D}"/var/lib/mlocate
+	chown -R 0:locate "${ED}"/var/lib/mlocate
 	fperms 0750 /var/lib/mlocate
 }