summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-04-11 15:26:42 +0000
committerMike Frysinger <vapier@gentoo.org>2009-04-11 15:26:42 +0000
commitce1bd658f511a73f762472a17eaf86f3fe6a109e (patch)
tree22700640725b7169d8a66ed9b110176ec373c4bb /sys-libs/timezone-data
parentAdd ~alpha/~ia64 (diff)
downloadhistorical-ce1bd658f511a73f762472a17eaf86f3fe6a109e.tar.gz
historical-ce1bd658f511a73f762472a17eaf86f3fe6a109e.tar.bz2
historical-ce1bd658f511a73f762472a17eaf86f3fe6a109e.zip
Strip comments and spaces from /etc/timezone as suggested by Alon Bar-Lev #265736.
Package-Manager: portage-2.2_rc28/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/timezone-data')
-rw-r--r--sys-libs/timezone-data/ChangeLog7
-rw-r--r--sys-libs/timezone-data/Manifest14
-rw-r--r--sys-libs/timezone-data/timezone-data-2009e.ebuild4
3 files changed, 20 insertions, 5 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index ba6216f2f229..5081492def5e 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/timezone-data
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.178 2009/04/10 13:40:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.179 2009/04/11 15:26:42 vapier Exp $
+
+ 11 Apr 2009; Mike Frysinger <vapier@gentoo.org>
+ timezone-data-2009e.ebuild:
+ Strip comments and spaces from /etc/timezone as suggested by Alon Bar-Lev
+ #265736.
10 Apr 2009; Raúl Porcel <armin76@gentoo.org> timezone-data-2009c.ebuild:
alpha/arm/ia64/m68k/s390/sh/x86 stable wrt #265522
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 1f5800995b27..2d582369ed56 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX timezone-data-2008h-makefile.patch 4037 RMD160 b7b9926ccee050dd18f2c33f2654a0b6dc4d35e0 SHA1 281539ae7f6fd804fc1e7ec9533552fa7fd50d88 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39
DIST tzcode2009b.tar.gz 190156 RMD160 633df8c0e350d68b15d55cfb54131be55133bdfc SHA1 53e62aef41066bb9b55b36451f7df61a0ed29c59 SHA256 4117dbd3864616e8391e79fffe2b4da999f7251763bc77a7b7006df57220400c
DIST tzcode2009d.tar.gz 190134 RMD160 26db83e9306354ffadf5a1606696b73587b47c7f SHA1 b935ac44d2df7c7bb2abb8d5aeb622dcc23b263b SHA256 3e914ff7d4593030531dd5b73ca5a71d7c0f5d52cb6096f7d6b1d5f720c4bee0
@@ -9,6 +12,13 @@ DIST tzdata2009e.tar.gz 177453 RMD160 458a30139d4562b27323b103401bf428635e7956 S
EBUILD timezone-data-2009b.ebuild 2963 RMD160 513ec550b833c1411e277e808fb8cdb8eb58d939 SHA1 58a0603c4615c10b87ee87d14f91b21c0977e631 SHA256 5b744eedab0ae0c404cd8bdb1733b211165b2f4f84830fc30a153ecdfe43add8
EBUILD timezone-data-2009c.ebuild 2969 RMD160 bd7be3f60108a4727047934c4d1d37a1581eebd3 SHA1 f1a4cae2b57c2f2e58e0e2cfe563fb5e41caeabf SHA256 0354f4b0a6f26f23235b47a9941247eb8296aa4a19d4aa82584e1b9ff77fa51e
EBUILD timezone-data-2009d.ebuild 2974 RMD160 2be83ef89b20669e8345fbed5da1a5a3cce8ddd2 SHA1 15857c5789da3c1a2fd99947782111427ce2a238 SHA256 6f93c93677c09d10ef422412d433a7fccd5c6a82d7d71a8a82e56a9335c3c395
-EBUILD timezone-data-2009e.ebuild 2974 RMD160 e527739ea43bcc31f33b6f6cb7c37bd2c54dccbc SHA1 e878cc7335911e75bbd4a05cf53a0c908511ad8c SHA256 0201d65574d4513d8dfed926018fc27dcb1d6a950b1d8fcc68340fbb48d3c2e5
-MISC ChangeLog 22357 RMD160 dac3f0742c7a6a1349d9d6d6d96e152927b84825 SHA1 53f698844f8db557385c24fa187043b670a19529 SHA256 c86aa489b14c72a2e167c4afcf53033aed6bed0fe897f6503e62e00db2aaeb7b
+EBUILD timezone-data-2009e.ebuild 3024 RMD160 6a494ac40017eb3b85a5cb5b0bbf1e6087e1a2a6 SHA1 1a66cec223b31c1b3cc47fd9a37525aae104a574 SHA256 327b3ac4ffbac3fd709544e7dd5980556b8405bb42fc30a99c55ea7f47ba9516
+MISC ChangeLog 22524 RMD160 e64a3ccf2f785165d855c35a6db0794358e56c87 SHA1 57067b3fe82af14135ac41ebc3d39053a3ab1051 SHA256 ba176362593a090f41f2d1d3775e835aad8264e75c447ccfc90f5f46eb5bd0ec
MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkngtrgACgkQn/5bYzqsSmHU4QCdGe73THNr9TB5zocBEKaUlmwY
+xm8AnjOU7zlKCDJ75A/qKMzqhzOkiqbc
+=XYfz
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2009e.ebuild b/sys-libs/timezone-data/timezone-data-2009e.ebuild
index 8921106c878d..190c76833497 100644
--- a/sys-libs/timezone-data/timezone-data-2009e.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2009e.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2009e.ebuild,v 1.1 2009/04/09 09:42:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2009e.ebuild,v 1.2 2009/04/11 15:26:42 vapier Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -72,7 +72,7 @@ pkg_config() {
else
src="/etc/timezone"
if [[ -e ${ROOT}/etc/timezone ]] ; then
- tz=$(<"${ROOT}"/etc/timezone)
+ tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${ROOT}"/etc/timezone)
else
tz="FOOKABLOIE"
fi