If /etc/localtime is a broken symlink, and /etc/timezone does not exist, assume the user is maintaining their own thing and leave /etc/localtime alone.

Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64

5 files changed, 62 insertions, 38 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 69f99a3ab5df..f40a4ae02253 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.258 2011/10/19 20:10:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.259 2011/10/19 20:12:23 vapier Exp $
+
+  19 Oct 2011; Mike Frysinger <vapier@gentoo.org> timezone-data-2011j.ebuild,
+  timezone-data-2011k.ebuild, timezone-data-2011l.ebuild:
+  If /etc/localtime is a broken symlink, and /etc/timezone does not exist,
+  assume the user is maintaining their own thing and leave /etc/localtime
+  alone.
 
   19 Oct 2011; Mike Frysinger <vapier@gentoo.org> timezone-data-2011j.ebuild:
   Stabilize for everyone.
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 8a9908df59f4..56648309efd4 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -19,15 +19,15 @@ EBUILD timezone-data-2011e.ebuild 3017 RMD160 03c07f4da81d4cb1fd00099706d563b6f3
 EBUILD timezone-data-2011g.ebuild 3029 RMD160 fd707f92b634e8f5dc424e9dba6790dd533a2209 SHA1 b658dd476680f7ad105f6ff23e11b33c830b3d29 SHA256 5bca62397ec4cd6d39fe1b5c894d28649e64e646bb07c0771ee7644b917ce6e8
 EBUILD timezone-data-2011h.ebuild 3020 RMD160 9846949c9a176202dc7695cc08d70dee81b6cf65 SHA1 5970eb8295efab0705e63091420fb30076abcf59 SHA256 3470b47a5b9b52d1fd791b1ca199b822de78228c9659b0d84528cb7bb98b0a70
 EBUILD timezone-data-2011i.ebuild 3023 RMD160 6ff5ed86d6abef3934224027e098d8296a6cfad4 SHA1 269080892d8d03e72fff2389736ecde578d05d1c SHA256 16a36db8e675249f7c4338c571fc85510c929c34ce447bb3b495a32763bee48d
-EBUILD timezone-data-2011j.ebuild 3026 RMD160 b642feff94fa048fbeac5503481768afa6361590 SHA1 9d10588d4bcdc3f5d390030894cf6a3dc6168164 SHA256 b5188135682c27c3fc44339cfd7593af501f2b0996acb467ca2d7f5adc5b26bf
-EBUILD timezone-data-2011k.ebuild 3167 RMD160 58fb3d43835a1547c50e891ad19d10c07080e384 SHA1 d78e0597a0758890ab16b096aebd6d55850b8d6f SHA256 0f7d6d1cc42c88ca8356b3aee9beccb39c596af30db301cc6a31e00a33b2e2ec
-EBUILD timezone-data-2011l.ebuild 3167 RMD160 325244dcd11ddd054116891c8b80ddd4b1534ec0 SHA1 03ae4409f28781b6805d3c51485cbf511f0b99cd SHA256 7c7c65f9495a2f0cb6e600d93d995f13695ee076c81600caa2e2fbf8cfee85aa
-MISC ChangeLog 33508 RMD160 e968c2869844e2190b7a1e44a1ce7a339124ed10 SHA1 225dc81b8e7644bffe49e4e85315adcd018d349c SHA256 ba6a0d6995e0d35459f455917a5f8c90ba0bdacf2a2e7e85d0499ad213e29359
+EBUILD timezone-data-2011j.ebuild 3191 RMD160 0a4fbc29f5206221f7e3389a516427e624bdf9a0 SHA1 026bbe455be1adb4206483afccac1fd729b0b99e SHA256 baae9ee5574f0f92a0682a882209c9b331da2309ca7115f5c45a2104bcfabb26
+EBUILD timezone-data-2011k.ebuild 3344 RMD160 a243738879658c3bc7a2e1a74bfcdeff79a6e044 SHA1 dcfd5861620a231bf720099ca187dea73a82c13d SHA256 9b8b53b827566915b679f2a19371617f2bc845028af1e1fbe1e67d0ec9b74a93
+EBUILD timezone-data-2011l.ebuild 3344 RMD160 233661502619a989591f4294c143e96e616028e0 SHA1 5abe160f5bc9406123cb43b450edc17516329638 SHA256 13b8193cac0610bb7c708e5b3bf0621528e5cd732d8f8fe39ae9452413f5fcbb
+MISC ChangeLog 33908 RMD160 4d2429e8712e285b819a26969f7ab07780fc2cba SHA1 4b4d7739ca2bcc2126e57ccf77899691e3f132ba SHA256 75036e34a5f74787601f4ab9666b6103995a1bb45f62a282b449a3de04cb9a34
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6TD4sACgkQaC/OocHi7Jah0QD+Jlbje0rT1KEUxPAxxuTu09sg
-Tk/M4aASEmSf+nIysWEBAJLGyDZo/bc3hoDWVWWqfHolbPsughjF8l7HM7HwG+ut
-=VKvY
+iF4EAREIAAYFAk6fLy4ACgkQaC/OocHi7JbySwD9Hjqq3vXqSZOfdlzQliz5BFZg
+bTprIHdLYJ2KDVZbDc8A/R41QW7+tHOr38N9v5oHnppB4u//LLEjCAT/0acaASto
+=+8Is
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2011j.ebuild b/sys-libs/timezone-data/timezone-data-2011j.ebuild
index 55cc8dd5340c..5e83a735b626 100644
--- a/sys-libs/timezone-data/timezone-data-2011j.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2011j.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2011j.ebuild,v 1.2 2011/10/19 20:10:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2011j.ebuild,v 1.3 2011/10/19 20:12:23 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -64,7 +64,7 @@ src_install() {
 
 pkg_config() {
 	# make sure the /etc/localtime file does not get stale #127899
-	local tz src
+	local tz src etc_lt="${ROOT}etc/localtime"
 
 	if has_version '<sys-apps/baselayout-2' ; then
 		src="${ROOT}etc/conf.d/clock"
@@ -82,23 +82,29 @@ pkg_config() {
 	if [[ ${tz} == "FOOKABLOIE" ]] ; then
 		elog "You do not have TIMEZONE set in ${src}."
 
-		if [[ ! -e ${ROOT}/etc/localtime ]] ; then
-			cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime
-			elog "Setting ${ROOT}etc/localtime to Factory."
+		if [[ ! -e ${etc_lt} ]] ; then
+			# if /etc/localtime is a symlink somewhere, assume they
+			# know what they're doing and they're managing it themselves
+			if [[ ! -L ${etc_lt} ]] ; then
+				cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+				elog "Setting ${etc_lt} to Factory."
+			else
+				elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
+			fi
 		else
-			elog "Skipping auto-update of ${ROOT}etc/localtime."
+			elog "Skipping auto-update of ${etc_lt}."
 		fi
 		return 0
 	fi
 
 	if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then
 		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${ROOT}etc/localtime has been reset to Factory; enjoy!"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
 		tz="Factory"
 	fi
-	einfo "Updating ${ROOT}etc/localtime with ${ROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${ROOT}/etc/localtime ]] && rm -f "${ROOT}"/etc/localtime
-	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${ROOT}"/etc/localtime
+	einfo "Updating ${etc_lt} with ${ROOT}usr/share/zoneinfo/${tz}"
+	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
+	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
 }
 
 pkg_postinst() {
diff --git a/sys-libs/timezone-data/timezone-data-2011k.ebuild b/sys-libs/timezone-data/timezone-data-2011k.ebuild
index 0732fc3e98b4..b6c2aea5749b 100644
--- a/sys-libs/timezone-data/timezone-data-2011k.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2011k.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2011k.ebuild,v 1.2 2011/10/07 15:23:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2011k.ebuild,v 1.3 2011/10/19 20:12:23 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -66,7 +66,7 @@ src_install() {
 
 pkg_config() {
 	# make sure the /etc/localtime file does not get stale #127899
-	local tz src
+	local tz src etc_lt="${ROOT}etc/localtime"
 
 	if has_version '<sys-apps/baselayout-2' ; then
 		src="${ROOT}etc/conf.d/clock"
@@ -84,23 +84,29 @@ pkg_config() {
 	if [[ ${tz} == "FOOKABLOIE" ]] ; then
 		elog "You do not have TIMEZONE set in ${src}."
 
-		if [[ ! -e ${ROOT}/etc/localtime ]] ; then
-			cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime
-			elog "Setting ${ROOT}etc/localtime to Factory."
+		if [[ ! -e ${etc_lt} ]] ; then
+			# if /etc/localtime is a symlink somewhere, assume they
+			# know what they're doing and they're managing it themselves
+			if [[ ! -L ${etc_lt} ]] ; then
+				cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+				elog "Setting ${etc_lt} to Factory."
+			else
+				elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
+			fi
 		else
-			elog "Skipping auto-update of ${ROOT}etc/localtime."
+			elog "Skipping auto-update of ${etc_lt}."
 		fi
 		return 0
 	fi
 
 	if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then
 		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${ROOT}etc/localtime has been reset to Factory; enjoy!"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
 		tz="Factory"
 	fi
-	einfo "Updating ${ROOT}etc/localtime with ${ROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${ROOT}/etc/localtime ]] && rm -f "${ROOT}"/etc/localtime
-	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${ROOT}"/etc/localtime
+	einfo "Updating ${etc_lt} with ${ROOT}usr/share/zoneinfo/${tz}"
+	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
+	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
 }
 
 pkg_postinst() {
diff --git a/sys-libs/timezone-data/timezone-data-2011l.ebuild b/sys-libs/timezone-data/timezone-data-2011l.ebuild
index 31e2783fc725..1887dd0cc302 100644
--- a/sys-libs/timezone-data/timezone-data-2011l.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2011l.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2011l.ebuild,v 1.1 2011/10/10 15:30:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2011l.ebuild,v 1.2 2011/10/19 20:12:23 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -66,7 +66,7 @@ src_install() {
 
 pkg_config() {
 	# make sure the /etc/localtime file does not get stale #127899
-	local tz src
+	local tz src etc_lt="${ROOT}etc/localtime"
 
 	if has_version '<sys-apps/baselayout-2' ; then
 		src="${ROOT}etc/conf.d/clock"
@@ -84,23 +84,29 @@ pkg_config() {
 	if [[ ${tz} == "FOOKABLOIE" ]] ; then
 		elog "You do not have TIMEZONE set in ${src}."
 
-		if [[ ! -e ${ROOT}/etc/localtime ]] ; then
-			cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime
-			elog "Setting ${ROOT}etc/localtime to Factory."
+		if [[ ! -e ${etc_lt} ]] ; then
+			# if /etc/localtime is a symlink somewhere, assume they
+			# know what they're doing and they're managing it themselves
+			if [[ ! -L ${etc_lt} ]] ; then
+				cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
+				elog "Setting ${etc_lt} to Factory."
+			else
+				elog "Assuming your ${etc_lt} symlink is what you want; skipping update."
+			fi
 		else
-			elog "Skipping auto-update of ${ROOT}etc/localtime."
+			elog "Skipping auto-update of ${etc_lt}."
 		fi
 		return 0
 	fi
 
 	if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then
 		elog "You have an invalid TIMEZONE setting in ${src}"
-		elog "Your ${ROOT}etc/localtime has been reset to Factory; enjoy!"
+		elog "Your ${etc_lt} has been reset to Factory; enjoy!"
 		tz="Factory"
 	fi
-	einfo "Updating ${ROOT}etc/localtime with ${ROOT}usr/share/zoneinfo/${tz}"
-	[[ -L ${ROOT}/etc/localtime ]] && rm -f "${ROOT}"/etc/localtime
-	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${ROOT}"/etc/localtime
+	einfo "Updating ${etc_lt} with ${ROOT}usr/share/zoneinfo/${tz}"
+	[[ -L ${etc_lt} ]] && rm -f "${etc_lt}"
+	cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
 }
 
 pkg_postinst() {