From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 27 Dec 2006 16:15:47 +0000 (+0000)
Subject: Move makewhatis to /etc/cron.daily.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4a2b080a4750b64356c22573e02472dfcd30b77;p=gentoo.git

Move makewhatis to /etc/cron.daily.
Package-Manager: portage-2.1.2_rc4-r1
---

diff --git a/sys-apps/man/ChangeLog b/sys-apps/man/ChangeLog
index 895717e6cb97..1b4ef0bce0c7 100644
--- a/sys-apps/man/ChangeLog
+++ b/sys-apps/man/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/man
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.104 2006/11/29 05:18:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/ChangeLog,v 1.105 2006/12/27 16:15:47 vapier Exp $
+
+  27 Dec 2006; Mike Frysinger <vapier@gentoo.org> man-1.6e.ebuild:
+  Move makewhatis to /etc/cron.daily.
 
 *man-1.6e (29 Nov 2006)
 
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index 6e5bdf481571..b54b8ba8f0f0 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -55,14 +55,14 @@ EBUILD man-1.6d.ebuild 3271 RMD160 cb2fa2ab59ed3641ac907f3e72597bdb78d6d176 SHA1
 MD5 5daaa868ed82c817f414f0da0d7484cb man-1.6d.ebuild 3271
 RMD160 cb2fa2ab59ed3641ac907f3e72597bdb78d6d176 man-1.6d.ebuild 3271
 SHA256 4719ecf55025f396ca02c3fe50beda55447db38bcebdbd4700725f5236fb4381 man-1.6d.ebuild 3271
-EBUILD man-1.6e.ebuild 3001 RMD160 2ba323f25430e934599b6820d1c40902c2b56dc2 SHA1 4b5b5111900d3e176d05639dbc91173791f5c553 SHA256 7ddc7c0a322e3bccdec1b16564b3c9085fbc3fbb8febfb0999f33739dab702c5
-MD5 920f3ed136a84dcde256249ea1b29fbb man-1.6e.ebuild 3001
-RMD160 2ba323f25430e934599b6820d1c40902c2b56dc2 man-1.6e.ebuild 3001
-SHA256 7ddc7c0a322e3bccdec1b16564b3c9085fbc3fbb8febfb0999f33739dab702c5 man-1.6e.ebuild 3001
-MISC ChangeLog 14664 RMD160 97cf05a246ef899c045221b6d9bef52369d05ade SHA1 336168a5485b8f23ac6807f7dc9ceeb2096b5a21 SHA256 20a08999e7578aaa2ad99608567ec5405ef76d33ca510a29bc7d71e9913d0742
-MD5 4c16ba6ba4aae79fc80e17a6e521cdaa ChangeLog 14664
-RMD160 97cf05a246ef899c045221b6d9bef52369d05ade ChangeLog 14664
-SHA256 20a08999e7578aaa2ad99608567ec5405ef76d33ca510a29bc7d71e9913d0742 ChangeLog 14664
+EBUILD man-1.6e.ebuild 3307 RMD160 b5b9e644e803a87fe26b1c53201b16f9f3edc414 SHA1 67680c0c2f0d1ecac04da84daeb0c850fe4f6931 SHA256 096fcd00f187cb23d96268570c648dcff7a8c09105343a8166f0f2533121c139
+MD5 f19ddc44832adc425f5c0b231f0a6d14 man-1.6e.ebuild 3307
+RMD160 b5b9e644e803a87fe26b1c53201b16f9f3edc414 man-1.6e.ebuild 3307
+SHA256 096fcd00f187cb23d96268570c648dcff7a8c09105343a8166f0f2533121c139 man-1.6e.ebuild 3307
+MISC ChangeLog 14770 RMD160 85aed9d01a595a66109b986418275a2256b784ac SHA1 fbd12b8d6673b0f6e3c4c19a22021328236eb0a1 SHA256 d6f5fe5e90fad4a4a073c4740b7e7d291a9842cb0a292d88f27cb72f2d691bfe
+MD5 ea5772efe735abc73a367eff9652f893 ChangeLog 14770
+RMD160 85aed9d01a595a66109b986418275a2256b784ac ChangeLog 14770
+SHA256 d6f5fe5e90fad4a4a073c4740b7e7d291a9842cb0a292d88f27cb72f2d691bfe ChangeLog 14770
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -74,9 +74,9 @@ MD5 9260305e16fda8ca7362cceb0cb5ad02 files/digest-man-1.6e 226
 RMD160 9d9e3022e704e8ebbee6ab33f2f6b9357ffb0fe6 files/digest-man-1.6e 226
 SHA256 450b990513ad7cf341ba6ba412d2ba0d380e11daa1f76fc70290fbbe40b88431 files/digest-man-1.6e 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFbRh0amhnQswr0vIRAlDyAJ94dxRpoKhq2VYMZaiIQBFbav7E1gCeNW5Y
-XvIGQ2ahyDwfODfKOz7ZA2w=
-=joTt
+iD8DBQFFkpxp8bi6rjpTunYRAvgmAKCH3uMomGkSoVRbNwt2MOf4wNQidQCgsuhr
+jaFVFZfnltSPHaioHP5zhIU=
+=vULt
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/man/man-1.6e.ebuild b/sys-apps/man/man-1.6e.ebuild
index 8b4cc348a182..3fc9af54a9bb 100644
--- a/sys-apps/man/man-1.6e.ebuild
+++ b/sys-apps/man/man-1.6e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6e.ebuild,v 1.1 2006/11/29 05:18:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/man/man-1.6e.ebuild,v 1.2 2006/12/27 16:15:47 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -80,12 +80,13 @@ src_compile() {
 }
 
 src_install() {
-	make PREFIX="${D}" install || die "make install failed"
+	emake PREFIX="${D}" install || die "make install failed"
 	dosym man /usr/bin/manpath
 
 	dodoc LSM README* TODO
 
-	exeinto /etc/cron.weekly
+	# makewhatis only adds man-pages from the last 24hrs
+	exeinto /etc/cron.daily
 	newexe "${FILESDIR}"/makewhatis.cron makewhatis
 
 	keepdir /var/cache/man
@@ -105,7 +106,13 @@ pkg_postinst() {
 
 	echo
 
-	local files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
+	local f files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
+	for f in ${files} ; do
+		[[ ${f} == */etc/cron.daily/makewhatis ]] && continue
+		[[ $(md5sum "${f}") == "8b2016cc778ed4e2570b912c0f420266 "* ]] \
+			&& rm -f "${f}"
+	done
+	files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
 	if [[ ${files/$'\n'} != ${files} ]] ; then
 		ewarn "You have multiple makewhatis cron files installed."
 		ewarn "You might want to delete all but one of these:"