From 3cfb949564fa87aa94a34421d24b74d4dfcc4b70 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 13 Mar 2007 22:14:01 +0000 Subject: [PATCH] Respect TIMEZONE="" and switch to elog. Package-Manager: portage-2.1.2.2 --- sys-libs/timezone-data/ChangeLog | 6 +- sys-libs/timezone-data/Manifest | 60 ++++--------------- .../timezone-data/timezone-data-2007c.ebuild | 17 +++--- 3 files changed, 27 insertions(+), 56 deletions(-) diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog index 9e31bcb18b6b..faad7c4c195c 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-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.67 2007/03/08 17:55:42 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.68 2007/03/13 22:14:01 vapier Exp $ + + 13 Mar 2007; Mike Frysinger + timezone-data-2007c.ebuild: + Respect TIMEZONE="" and switch to elog. 08 Mar 2007; Tobias Scherbaum timezone-data-2007c.ebuild: diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index 5f2c2a14c9dc..740ab1576e8b 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -5,63 +5,27 @@ AUX timezone-data-2005n-makefile.patch 3504 RMD160 c08c65c6a6ae0392dfc5128801251 MD5 1f6ffc1a5b1396663c9f044be9806cf3 files/timezone-data-2005n-makefile.patch 3504 RMD160 c08c65c6a6ae0392dfc5128801251c5d1c6d3b0d files/timezone-data-2005n-makefile.patch 3504 SHA256 5eb2068da4df12a2eb84caebe262c285b62e244e046b50869b6a80e16401d707 files/timezone-data-2005n-makefile.patch 3504 -DIST tzcode2006g.tar.gz 186201 RMD160 3cef35fd05a7f9f888bf4f0453e4c134999bfe19 SHA1 d07677f939e19bc4621d106561c6f21d42df6e70 SHA256 972b29be1d2e5c3c9cf17b9d6d92ce90b568f1c8ec9d6d54fb3b45047371aa9c -DIST tzcode2006p.tar.gz 187340 RMD160 d076f1bd80a3c6676cb32b0f4b2d67a76d66af29 SHA1 f540c84539b0b5e0f33a3659aab5940a9d399ec1 SHA256 abbe9907e5d1073e9190700527428e3af65a25edb2516259c0bf42785f20df53 -DIST tzcode2007a.tar.gz 187427 RMD160 08360e03bece6b85b27db910485446e074f42fcb SHA1 9d2a721b8297f43cea0a0681851bf475d1291de4 SHA256 b1f6d2bba4d13f8a8ddef946833caa612efbfa64850052317cadf1ad2b706e63 -DIST tzcode2007b.tar.gz 187437 RMD160 2fa306e020662aaf30f832876be56c71a08dd685 SHA1 6cb7edb13d5c99b0c4b777abfa34412dc3071a26 SHA256 2710535e40d387043b9435c6e1bf470a5cb98c298e4ae7f7c8c215a7ae425843 DIST tzcode2007c.tar.gz 189109 RMD160 e6b7c7a1c832d0ac0b78a87efa56b8282f7ce304 SHA1 6af4f83d4b4a54c185ce7d5b0bea19c8706f422c SHA256 3c976bdd5c5657b46aabb7e3af20e325e94cfb790e2859f1c9de7ec465562546 -DIST tzdata2006g.tar.gz 153042 RMD160 b45ba26d1d34f8e591a4f6e4fe95450ba93bfdef SHA1 ecb25c4cc858f1bf3ec2be148d9d72e3563dbefb SHA256 028a5d8bc3771876cf43b497e8b8691acae8263af34b0a8de3e014f01a5558d0 -DIST tzdata2006p.tar.gz 157220 RMD160 846f6d6d65bbad0e9cd1f346e7cfc78ed5bcb116 SHA1 aa9c9d98ec369f93096d83e23c33b8042503dc55 SHA256 6b246374b468d8ead477541f4624b74cd1da2b3de7ef757a3fc40ca29cfb29bc -DIST tzdata2007a.tar.gz 157506 RMD160 3f4d0a7fc49a69f1b1bf396dafc856c6f4e235b6 SHA1 f1c051d9f47ad0b23f9a60705c12980f268303df SHA256 7866826c0fd0810af2bb2b240c81961b0350c1fa42db870baa33c6126039e0d3 -DIST tzdata2007b.tar.gz 157432 RMD160 b33cf3046265dea56e6efb6fcb0172932a823f61 SHA1 72d2793f0a0fb324cd81702f49c0e7f02e522a9a SHA256 f1dcc1c615a792c0f72704119faf141e7408f8c94d876e478e052fa33b5a1cb1 DIST tzdata2007c.tar.gz 158198 RMD160 f63b65a0a0c8326080ed4eb0fbf1241d2308b6a3 SHA1 7767bd530f01a7656080b0f4409d359fe555bb14 SHA256 3575df0a341fef53240620423da519c6cba16212ab8b2576c9595b80deaf3af2 -EBUILD timezone-data-2006g.ebuild 1432 RMD160 1d6a835f50d38a7fc1f48b2cd81740e26e470830 SHA1 8d2f181954846d3e3a574634a8e3a8ab3c20dfc8 SHA256 f38412a5e42caf5fc87163a30d2368de76a467731ca3398dda8bb6984bb4829b -MD5 357a0738b1cab7d15fc7cc25e695c110 timezone-data-2006g.ebuild 1432 -RMD160 1d6a835f50d38a7fc1f48b2cd81740e26e470830 timezone-data-2006g.ebuild 1432 -SHA256 f38412a5e42caf5fc87163a30d2368de76a467731ca3398dda8bb6984bb4829b timezone-data-2006g.ebuild 1432 -EBUILD timezone-data-2006p.ebuild 2166 RMD160 2ff19d4775dcce56aa7b36f317acab59aab2a5ec SHA1 f5015aa946174e29624a25f8b3931bbc214ce4a5 SHA256 c747cdc25ddfbca74db5d59a1ebde54032452e241e2c4e7b463eaece9fd1df52 -MD5 8eceee0803d1d9ab73ba9202d3ec4441 timezone-data-2006p.ebuild 2166 -RMD160 2ff19d4775dcce56aa7b36f317acab59aab2a5ec timezone-data-2006p.ebuild 2166 -SHA256 c747cdc25ddfbca74db5d59a1ebde54032452e241e2c4e7b463eaece9fd1df52 timezone-data-2006p.ebuild 2166 -EBUILD timezone-data-2007a.ebuild 2243 RMD160 2c3788bb1fd145d8eccfed794a96ba1668ecfeac SHA1 3ce7e9118ba1a312c443583126b5bee1363988ed SHA256 724ba207dc7a42b6809f699a4f77d0fbc9d7e5ab0178904ba62c0fec634f5545 -MD5 7e8ac5d4fa2ed371e66c41bde414c3b9 timezone-data-2007a.ebuild 2243 -RMD160 2c3788bb1fd145d8eccfed794a96ba1668ecfeac timezone-data-2007a.ebuild 2243 -SHA256 724ba207dc7a42b6809f699a4f77d0fbc9d7e5ab0178904ba62c0fec634f5545 timezone-data-2007a.ebuild 2243 -EBUILD timezone-data-2007b.ebuild 2243 RMD160 d33fc3bc083ef231bc0e5b09077c0c5f79a10b79 SHA1 675f0d947a39c48ca46260978c2e1e05cd471798 SHA256 8dd7bed2b9cbc215dbc52f11c1627c69f8482daf16c8fa58295a810a0d46a354 -MD5 283b7c455f8d11abefb4b566e24a2fe1 timezone-data-2007b.ebuild 2243 -RMD160 d33fc3bc083ef231bc0e5b09077c0c5f79a10b79 timezone-data-2007b.ebuild 2243 -SHA256 8dd7bed2b9cbc215dbc52f11c1627c69f8482daf16c8fa58295a810a0d46a354 timezone-data-2007b.ebuild 2243 -EBUILD timezone-data-2007c.ebuild 2230 RMD160 f820b3d5e6c557d78ebd5dec4444e77335238de9 SHA1 77ecce62a8f850f9ac3aab7be6bcff072b90440d SHA256 aec94f178db2cd9e70acf4bb32d6e79d31034941fcaf9ff65af80817420cdf5d -MD5 eff3e33a24f4289364ddb928915fc54d timezone-data-2007c.ebuild 2230 -RMD160 f820b3d5e6c557d78ebd5dec4444e77335238de9 timezone-data-2007c.ebuild 2230 -SHA256 aec94f178db2cd9e70acf4bb32d6e79d31034941fcaf9ff65af80817420cdf5d timezone-data-2007c.ebuild 2230 -MISC ChangeLog 8840 RMD160 f6c0f241c841d27795cd77112a29900901d76811 SHA1 df48295b850c89c2ce8e9f175d9562c9924cde86 SHA256 bbeaca457e7dc1c1ef972b694fc07a6dd97afda7f32cff5a4b6888f9374461c1 -MD5 4855e1e5ab020a95e8c9dd5c46d2dc91 ChangeLog 8840 -RMD160 f6c0f241c841d27795cd77112a29900901d76811 ChangeLog 8840 -SHA256 bbeaca457e7dc1c1ef972b694fc07a6dd97afda7f32cff5a4b6888f9374461c1 ChangeLog 8840 +EBUILD timezone-data-2007c.ebuild 2347 RMD160 33e222ce6d63e57fc7da567d49cbfa3a4a3da382 SHA1 9c8d71f2e0485a9049383c5dba5027f05c0bef58 SHA256 9acff8000c7cb5e0ae559b2a86ba6adec9c71e80a133bc8072c593eef1b87c3d +MD5 57edbb42f9b2a1912e0084ea78f11437 timezone-data-2007c.ebuild 2347 +RMD160 33e222ce6d63e57fc7da567d49cbfa3a4a3da382 timezone-data-2007c.ebuild 2347 +SHA256 9acff8000c7cb5e0ae559b2a86ba6adec9c71e80a133bc8072c593eef1b87c3d timezone-data-2007c.ebuild 2347 +MISC ChangeLog 8959 RMD160 4cc54133a8d90a1c92f9e594d8074322d25fc83d SHA1 f8d68c7e21933d4c93fbee313947e6532de73e1f SHA256 c9a6a8a72cc167cd9612a50ab9b8eebab4d62b588d29ce5a5762a8b6680be592 +MD5 3b75cae397cee80a5d59fe99cbef0f40 ChangeLog 8959 +RMD160 4cc54133a8d90a1c92f9e594d8074322d25fc83d ChangeLog 8959 +SHA256 c9a6a8a72cc167cd9612a50ab9b8eebab4d62b588d29ce5a5762a8b6680be592 ChangeLog 8959 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162 -MD5 4cc6d9d32b89d9a9920d45105aba6f3a files/digest-timezone-data-2006g 470 -RMD160 67142c79b806791be4839a76d6c941f2309f2db4 files/digest-timezone-data-2006g 470 -SHA256 e36bb05ea7331b5e4538cc6ca515b8346b3511ad046fdd8df7aef190964f38be files/digest-timezone-data-2006g 470 -MD5 a4170777b7b45d303661109124d48f83 files/digest-timezone-data-2006p 470 -RMD160 268e04966aaac0f07ccab18bc9ab41d4c0cf873a files/digest-timezone-data-2006p 470 -SHA256 b81bc44d1f497b5d3b1102f8edd1f8e413e7a293ad5e703fdacdbe3043043682 files/digest-timezone-data-2006p 470 -MD5 5f2cfcbaefa62caf702eb3319aef4a4a files/digest-timezone-data-2007a 470 -RMD160 77ef9a13aa8cbaf26c2bab32b51061d5dbbd0050 files/digest-timezone-data-2007a 470 -SHA256 00bd4d260d3b1844384a449bb87cb00da184902226cc3ebec4119095aae93a0a files/digest-timezone-data-2007a 470 -MD5 583d2e91ac0388d2747112466d238e6d files/digest-timezone-data-2007b 470 -RMD160 fa3ed7e0b1f931d0e80f0d239014a0a7180a35f7 files/digest-timezone-data-2007b 470 -SHA256 91d42b97beded09b39a54627f74e534a40da08615fbf540b4ec42892e2d77ffa files/digest-timezone-data-2007b 470 MD5 1bdba8440036d4738e7e332201a0a6cb files/digest-timezone-data-2007c 470 RMD160 b9b4315c428fe2f88c9c4f1f2801c9b031ffae65 files/digest-timezone-data-2007c 470 SHA256 8115eae1debcca8293ce176bbc737046e393c4464ef2c2eccf7e30869da20259 files/digest-timezone-data-2007c 470 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF8z+58bi6rjpTunYRAlzuAJ9JmVZZhR7BU1SGpkX7dx+9/ak0zQCg2aBF -hchCbCKaqzByimZ8Kbmdt80= -=KH2A +iD8DBQFF9yIy8bi6rjpTunYRApXsAJ4oQ0ZxrJ4WAqWyuzVwQ7qUMCiW8QCgiFH0 +SNCVS86i5julU4SUtYfpObI= +=JEB8 -----END PGP SIGNATURE----- diff --git a/sys-libs/timezone-data/timezone-data-2007c.ebuild b/sys-libs/timezone-data/timezone-data-2007c.ebuild index 327c221c38cb..202f0bd5c606 100644 --- a/sys-libs/timezone-data/timezone-data-2007c.ebuild +++ b/sys-libs/timezone-data/timezone-data-2007c.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2007c.ebuild,v 1.9 2007/03/10 23:30:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2007c.ebuild,v 1.10 2007/03/13 22:14:01 vapier Exp $ inherit eutils toolchain-funcs flag-o-matic @@ -52,19 +52,22 @@ src_install() { pkg_config() { # 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 + local tz=$(unset TIMEZONE ; source "${ROOT}"/etc/conf.d/clock ; echo ${TIMEZONE-FOOKABLOIE}) + [[ -z ${tz} ]] && return 0 + if [[ ${tz} == "FOOKABLOIE" ]] ; then + elog "You do not have TIMEZONE set in /etc/conf.d/clock." if [[ ! -e ${ROOT}/etc/localtime ]] ; then cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime + elog "Setting /etc/localtime to Factory." + else + elog "Skipping auto-update of /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!" + elog "You have an invalid TIMEZONE setting in /etc/conf.d/clock." + elog "Your /etc/localtime has been reset to Factory; enjoy!" tz="Factory" fi einfo "Updating /etc/localtime with /usr/share/zoneinfo/${tz}" -- 2.26.2