diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-06-03 20:02:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-06-03 20:02:40 +0000 |
| commit | 5b2a98cf1f6804351fb4ef65c973e62506c67796 (patch) | |
| tree | df2240b618ce8cdd1842921b55a12019e27a2a88 /sys-libs | |
| parent | Remove old. (diff) | |
| download | historical-5b2a98cf1f6804351fb4ef65c973e62506c67796.tar.gz historical-5b2a98cf1f6804351fb4ef65c973e62506c67796.tar.bz2 historical-5b2a98cf1f6804351fb4ef65c973e62506c67796.zip | |
allow /etc/timezone to be empty as well to indicate user-management
Package-Manager: portage-2.2_pre5.spank.spunk
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/timezone-data/Manifest | 8 | ||||
| -rw-r--r-- | sys-libs/timezone-data/timezone-data-2008c.ebuild | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index 52eaacde9103..20e838099c51 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -11,13 +11,13 @@ DIST tzdata2008c.tar.gz 168440 RMD160 1a59fb3f2519aae73692bbd6e2091720bcbcb14c S EBUILD timezone-data-2007k.ebuild 2400 RMD160 9523360c956c110ab64c54570b314ec64cc82762 SHA1 0b7eb00cedd2a9be223ecbd34d53411731b0044d SHA256 c317389397df384f4f072c84aedca3b38c46f498bd98fd962f5fd0b9dc487e40 EBUILD timezone-data-2008a.ebuild 2622 RMD160 c935340eeff837ee7a7b57ca530e61339853780c SHA1 4df6e8c0fa72aec15377292c79ca523b8de40288 SHA256 21e048ece0bc707fa1bc0ed8d1d4ed4c9d2feba4e44a62781902ec1d4bfef669 EBUILD timezone-data-2008b.ebuild 2627 RMD160 5cd98a39b696d315d49f9452c93ab0e308646fcc SHA1 6e5fbd8d9c3e2d5e7d93918a8e4c157833361874 SHA256 2cefeb2b0532b31f2b08c9d762244de8e3b5dcf6bb28fddbccefffc24b4a67a2 -EBUILD timezone-data-2008c.ebuild 2700 RMD160 5fabf0b5fb1c7aa3ccb4a7b1de79ba500c62393f SHA1 07658921ea5c68fe258c5fb7a8759d3a7019da4a SHA256 50bf81a154689346319203848e290f15e66f37f9a2910d8e6f8332443432e3a9 +EBUILD timezone-data-2008c.ebuild 2699 RMD160 22ccebfa90bc1d7ad4f334ab669fea823b94a95f SHA1 991bd11d89f9b3e26b90b7ebf35430b80eba052b SHA256 d9246f704cd430fc85302f18694d6b7f8265bf4b4eb65a227da5e9d7c433e9ba MISC ChangeLog 16565 RMD160 d3a41c32c56f6c112acad378ce4fa0065faff19e SHA1 3270a264e43e914cedea260994c19a97739fba3f SHA256 f6b1d5506cc4b3e663eeefbabafc49f987699fb3654b22e20f92c3d1eaca081e MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFIRVhhj9hvisErhMIRAksHAKDFLlmfpFxA4XRS8fiYnn0DAp/x1wCeLyBm -gNj3H9P61YEprqz60tfNRCw= -=LVx6 +iD8DBQFIRaNmj9hvisErhMIRAiaMAKCpLp9QxkjnRr9erRty4SRJH7dEDgCeNft8 +mwD/k8CldMnrMk1RndCgY8A= +=v7IH -----END PGP SIGNATURE----- diff --git a/sys-libs/timezone-data/timezone-data-2008c.ebuild b/sys-libs/timezone-data/timezone-data-2008c.ebuild index eef84bf33358..9fee907a1bce 100644 --- a/sys-libs/timezone-data/timezone-data-2008c.ebuild +++ b/sys-libs/timezone-data/timezone-data-2008c.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2008c.ebuild,v 1.2 2008/06/03 14:42:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2008c.ebuild,v 1.3 2008/06/03 20:02:40 vapier Exp $ inherit eutils toolchain-funcs flag-o-matic @@ -59,7 +59,6 @@ pkg_config() { if has_version '<sys-apps/baselayout-2' ; then src="/etc/conf.d/clock" tz=$(unset TIMEZONE ; source "${ROOT}"/etc/conf.d/clock ; echo ${TIMEZONE-FOOKABLOIE}) - [[ -z ${tz} ]] && return 0 else src="/etc/timezone" if [[ -e ${ROOT}/etc/timezone ]] ; then @@ -68,6 +67,7 @@ pkg_config() { tz="FOOKABLOIE" fi fi + [[ -z ${tz} ]] && return 0 if [[ ${tz} == "FOOKABLOIE" ]] ; then elog "You do not have TIMEZONE set in ${src}." |