Add support for updating /etc/localtime via TIMEZONE in /etc/conf.d/clock.

Package-Manager: portage-2.1.2_rc4-r3

3 files changed, 36 insertions, 18 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index eddecc1f651e..47afeab52559 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.54 2006/11/29 01:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.55 2006/12/31 14:50:54 vapier Exp $
+
+  31 Dec 2006; Mike Frysinger <vapier@gentoo.org>
+  timezone-data-2006p.ebuild:
+  Add support for updating /etc/localtime via TIMEZONE in /etc/conf.d/clock.
 
 *timezone-data-2006p (29 Nov 2006)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 060f684787fe..cd2c19234d0e 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -25,14 +25,14 @@ EBUILD timezone-data-2006o.ebuild 1604 RMD160 924ea086cb3ba2765d8ef93f8b2902e70e
 MD5 590cffc3dc76bbb37cab04695ee204e0 timezone-data-2006o.ebuild 1604
 RMD160 924ea086cb3ba2765d8ef93f8b2902e70e9aea65 timezone-data-2006o.ebuild 1604
 SHA256 c3c2c07909dfcdf794257478e7cd22fbccee37cfa9b461aea874393cd3f66ee3 timezone-data-2006o.ebuild 1604
-EBUILD timezone-data-2006p.ebuild 1604 RMD160 c9c9cc11203c91b8b904076b4b2373674aa51b7e SHA1 cc461ecd9e9d5ae25cab57b34d76e77b5eff0904 SHA256 7e2241ae150f80608e23e8d4ad444b14b2da9ec59bf60b8f813e94ae2b1e7c23
-MD5 faf71f3ab0755ba94c25575470bd2760 timezone-data-2006p.ebuild 1604
-RMD160 c9c9cc11203c91b8b904076b4b2373674aa51b7e timezone-data-2006p.ebuild 1604
-SHA256 7e2241ae150f80608e23e8d4ad444b14b2da9ec59bf60b8f813e94ae2b1e7c23 timezone-data-2006p.ebuild 1604
-MISC ChangeLog 7069 RMD160 8cc84ab42196b9cbd29769424db3b1ec8a5afaaf SHA1 bf546c885a1b36be80bf2bc9835220e2df86a918 SHA256 bc6a0af52adef6a7b8dd9466efd945b97a5fae5b4cf86d4c1140531489604b83
-MD5 abb7dc62e29b5d803933d46432e45668 ChangeLog 7069
-RMD160 8cc84ab42196b9cbd29769424db3b1ec8a5afaaf ChangeLog 7069
-SHA256 bc6a0af52adef6a7b8dd9466efd945b97a5fae5b4cf86d4c1140531489604b83 ChangeLog 7069
+EBUILD timezone-data-2006p.ebuild 2167 RMD160 1aa6590e6519bacc1c374e885650ce956d6a5432 SHA1 b97e48eb2ebc3da986d428f3d83bbfd7bcb51809 SHA256 ba94250f8ac1850328f30a2319f62a141e4f331f1c1769edc6da04eae93c99f9
+MD5 2cfef3d425afb3ae5f2800eeb0917d69 timezone-data-2006p.ebuild 2167
+RMD160 1aa6590e6519bacc1c374e885650ce956d6a5432 timezone-data-2006p.ebuild 2167
+SHA256 ba94250f8ac1850328f30a2319f62a141e4f331f1c1769edc6da04eae93c99f9 timezone-data-2006p.ebuild 2167
+MISC ChangeLog 7227 RMD160 12316935c701a93e447504a6de8a077df1284782 SHA1 636c58f9d4ce537cb1890326d9a34a45ad0f8ef1 SHA256 35fec980b89d7436713a34dd5775f9c55cd369b69e396124bf4655f267f97603
+MD5 1235b622399a896bfee63a6ffffdc929 ChangeLog 7227
+RMD160 12316935c701a93e447504a6de8a077df1284782 ChangeLog 7227
+SHA256 35fec980b89d7436713a34dd5775f9c55cd369b69e396124bf4655f267f97603 ChangeLog 7227
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -50,9 +50,9 @@ MD5 a4170777b7b45d303661109124d48f83 files/digest-timezone-data-2006p 470
 RMD160 268e04966aaac0f07ccab18bc9ab41d4c0cf873a files/digest-timezone-data-2006p 470
 SHA256 b81bc44d1f497b5d3b1102f8edd1f8e413e7a293ad5e703fdacdbe3043043682 files/digest-timezone-data-2006p 470
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFbN+0amhnQswr0vIRAn3pAJ9KM222s5jd61hd/9mPLMdQrUfHBgCfd/TH
-L4vsXUAAGMPJiqSIDynNyJ4=
-=Qx8B
+iD8DBQFFl86U8bi6rjpTunYRAsnUAJ0dHja9OJzApCAMRzerr/4LhQSnCwCghR3c
+gjb0rOa811umKia4fq2/4BM=
+=4ax8
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2006p.ebuild b/sys-libs/timezone-data/timezone-data-2006p.ebuild
index 2357542526d3..2e94b7f9c71c 100644
--- a/sys-libs/timezone-data/timezone-data-2006p.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2006p.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-libs/timezone-data/timezone-data-2006p.ebuild,v 1.1 2006/11/29 01:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2006p.ebuild,v 1.2 2006/12/31 14:50:54 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -51,9 +51,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ ! -e ${ROOT}/etc/localtime ]] ; then
-		ewarn "Please remember to set your timezone using the zic command."
-		rm -f "${ROOT}"/etc/localtime
-		ln -s ../usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime
+	# make sure the /etc/localtime file does not get stale #127899
+	local tz=$(source "${ROOT}"/etc/conf.d/clock ; echo ${TIMEZONE})
+	if [[ -z ${tz} ]] ; then
+		if [[ ! -e ${ROOT}/etc/localtime ]] ; then
+			cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime
+		fi
+		ewarn "You do not have TIMEZONE set in /etc/conf.d/clock."
+		ewarn "Skipping auto-update of /etc/localtime."
+		return 0
 	fi
+
+	if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then
+		eerror "You have an invalid TIMEZONE setting in /etc/conf.d/clock."
+		eerror "Your /etc/localtime has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating /etc/localtime with /usr/share/zoneinfo/${tz}"
+	rm -f "${ROOT}"/etc/localtime
+	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${ROOT}"/etc/localtime
 }