From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 2 Jan 2007 23:50:18 +0000 (+0000)
Subject: abort if user has broken /etc/localtime
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=300767f9259ef67b904957dbaf9088126dee8c6f;p=gentoo.git

abort if user has broken /etc/localtime
Package-Manager: portage-2.1.2_rc4-r3
---

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index a793bfeda861..84f3ed6873a0 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -27,10 +27,10 @@ EBUILD busybox-1.2.2.1.ebuild 8397 RMD160 6e35665cbb569fb3d0c210d91e440433aa862b
 MD5 3bedcbbfebb81d7ed0fe15c8b9a592ff busybox-1.2.2.1.ebuild 8397
 RMD160 6e35665cbb569fb3d0c210d91e440433aa862b4a busybox-1.2.2.1.ebuild 8397
 SHA256 9718421ca42699dd35d17400731157942d102fb3a3f23123301a0762509a5cca busybox-1.2.2.1.ebuild 8397
-EBUILD busybox-1.3.1.ebuild 7838 RMD160 6ae09f2db9703d5440250ec7fd487bf9401f6e6b SHA1 5ce750a62f346462253728d06796588e2832b5db SHA256 dcd7d5f617633823b2bbee11e3ce685c42c553deab468ce128bc0a01dca47ac7
-MD5 8a594c17267fa5c577e4f61244e8a7d9 busybox-1.3.1.ebuild 7838
-RMD160 6ae09f2db9703d5440250ec7fd487bf9401f6e6b busybox-1.3.1.ebuild 7838
-SHA256 dcd7d5f617633823b2bbee11e3ce685c42c553deab468ce128bc0a01dca47ac7 busybox-1.3.1.ebuild 7838
+EBUILD busybox-1.3.1.ebuild 8170 RMD160 a03f782b78dcf837a3d4010eb32f72a73cfb876a SHA1 b321c6e36cc6b331a21a5d92162617712dcf46dd SHA256 2a38b3fbbbfb00bf56975c2ef4e83d0b56f5cdc43da946067309e716c3c5c03e
+MD5 6c6cb7aa634a15c30c2a0779389269a7 busybox-1.3.1.ebuild 8170
+RMD160 a03f782b78dcf837a3d4010eb32f72a73cfb876a busybox-1.3.1.ebuild 8170
+SHA256 2a38b3fbbbfb00bf56975c2ef4e83d0b56f5cdc43da946067309e716c3c5c03e busybox-1.3.1.ebuild 8170
 MISC ChangeLog 19226 RMD160 756eb736171c5ef30955a176e3b7b51ec51a0b64 SHA1 a27946d28d31b0a0dbbbbc37ed26437eeba2f9d9 SHA256 7a1a578f71cf25dbd454c4782229333dac7035fd6dcd628c5c3c250834fcdb98
 MD5 681e6e9fc4f7db82a5352244f9cb6f80 ChangeLog 19226
 RMD160 756eb736171c5ef30955a176e3b7b51ec51a0b64 ChangeLog 19226
@@ -46,9 +46,9 @@ MD5 b676836264c05f0066c645ea8620dca6 files/digest-busybox-1.3.1 247
 RMD160 76e327f1c7760c6159ddc317aa8eb486fd3eb8dc files/digest-busybox-1.3.1 247
 SHA256 b06e896a90e122006f6ab811e6fb2f6c08ffe36693c93271e4e1c7bcb82af939 files/digest-busybox-1.3.1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFl5g08bi6rjpTunYRAghCAKDW1C+uF9thZM2Eue2bwO4naIf5JgCfTERP
-VLY7+4AFvwO7DX8RxjRYoRE=
-=7eZC
+iD8DBQFFmvAK8bi6rjpTunYRAsmFAJwPHXpSxFJwZVJn6P0HVWh+rG0SmwCfWT2y
+8ycfFB+Dzt/+A4jD6Gu0Zus=
+=Dg/d
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.3.1.ebuild b/sys-apps/busybox/busybox-1.3.1.ebuild
index ddb699da9340..5ee4064a401e 100644
--- a/sys-apps/busybox/busybox-1.3.1.ebuild
+++ b/sys-apps/busybox/busybox-1.3.1.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/busybox/busybox-1.3.1.ebuild,v 1.4 2006/12/31 10:58:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.3.1.ebuild,v 1.5 2007/01/02 23:50:18 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -73,6 +73,16 @@ S=${WORKDIR}/${MY_P}
 # <pebenito> then eventually turning on selinux would mean
 # adding a dep: selinux? ( sys-libs/libselinux )
 
+pkg_setup() {
+	# Catch most people for now #159497 ... delete this check
+	# once we move to stable for releases
+	if [[ $(LC_ALL="C" date +%Z) == "Local time zone must be set--see zic manual page" ]] ; then
+		eerror "You forgot to set up your /etc/localtime."
+		eerror "You should do so now."
+		die "forgetful admin detected"
+	fi
+}
+
 busybox_config_option() {
 	case $1 in
 		y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;;