| 1 |
vapier 08/03/22 23:49:38 |
| 2 |
|
| 3 |
Modified: timezone-data-2008a.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add support for /etc/timezone. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sys-libs/timezone-data/timezone-data-2008a.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/timezone-data/timezone-data-2008a.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/timezone-data/timezone-data-2008a.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/timezone-data/timezone-data-2008a.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: timezone-data-2008a.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2008a.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- timezone-data-2008a.ebuild 10 Mar 2008 15:23:32 -0000 1.1 |
| 22 |
+++ timezone-data-2008a.ebuild 22 Mar 2008 23:49:37 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2008a.ebuild,v 1.1 2008/03/10 15:23:32 vapier Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2008a.ebuild,v 1.2 2008/03/22 23:49:37 vapier Exp $ |
| 28 |
|
| 29 |
inherit eutils toolchain-funcs flag-o-matic |
| 30 |
|
| 31 |
@@ -52,21 +52,29 @@ |
| 32 |
|
| 33 |
pkg_config() { |
| 34 |
# make sure the /etc/localtime file does not get stale #127899 |
| 35 |
- local tz=$(unset TIMEZONE ; source "${ROOT}"/etc/conf.d/clock ; echo ${TIMEZONE-FOOKABLOIE}) |
| 36 |
- [[ -z ${tz} ]] && return 0 |
| 37 |
- if [[ ${tz} == "FOOKABLOIE" ]] ; then |
| 38 |
- elog "You do not have TIMEZONE set in /etc/conf.d/clock." |
| 39 |
- if [[ ! -e ${ROOT}/etc/localtime ]] ; then |
| 40 |
- cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime |
| 41 |
- elog "Setting /etc/localtime to Factory." |
| 42 |
- else |
| 43 |
- elog "Skipping auto-update of /etc/localtime." |
| 44 |
+ local tz src |
| 45 |
+ |
| 46 |
+ if [[ -e ${ROOT}/etc/timezone ]] ; then |
| 47 |
+ src="/etc/timezone" |
| 48 |
+ tz=$(<"${ROOT}"/etc/timezone) |
| 49 |
+ else |
| 50 |
+ src="/etc/conf.d/clock" |
| 51 |
+ tz=$(unset TIMEZONE ; source "${ROOT}"/etc/conf.d/clock ; echo ${TIMEZONE-FOOKABLOIE}) |
| 52 |
+ [[ -z ${tz} ]] && return 0 |
| 53 |
+ if [[ ${tz} == "FOOKABLOIE" ]] ; then |
| 54 |
+ elog "You do not have TIMEZONE set in /etc/conf.d/clock." |
| 55 |
+ if [[ ! -e ${ROOT}/etc/localtime ]] ; then |
| 56 |
+ cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime |
| 57 |
+ elog "Setting /etc/localtime to Factory." |
| 58 |
+ else |
| 59 |
+ elog "Skipping auto-update of /etc/localtime." |
| 60 |
+ fi |
| 61 |
+ return 0 |
| 62 |
fi |
| 63 |
- return 0 |
| 64 |
fi |
| 65 |
|
| 66 |
if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then |
| 67 |
- elog "You have an invalid TIMEZONE setting in /etc/conf.d/clock." |
| 68 |
+ elog "You have an invalid TIMEZONE setting in ${src}" |
| 69 |
elog "Your /etc/localtime has been reset to Factory; enjoy!" |
| 70 |
tz="Factory" |
| 71 |
fi |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.120 sys-libs/timezone-data/ChangeLog |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.120&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.120&content-type=text/plain |
| 79 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.119&r2=1.120 |
| 80 |
|
| 81 |
Index: ChangeLog |
| 82 |
=================================================================== |
| 83 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v |
| 84 |
retrieving revision 1.119 |
| 85 |
retrieving revision 1.120 |
| 86 |
diff -u -r1.119 -r1.120 |
| 87 |
--- ChangeLog 10 Mar 2008 15:23:32 -0000 1.119 |
| 88 |
+++ ChangeLog 22 Mar 2008 23:49:37 -0000 1.120 |
| 89 |
@@ -1,6 +1,10 @@ |
| 90 |
# ChangeLog for sys-libs/timezone-data |
| 91 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 92 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.119 2008/03/10 15:23:32 vapier Exp $ |
| 93 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.120 2008/03/22 23:49:37 vapier Exp $ |
| 94 |
+ |
| 95 |
+ 22 Mar 2008; Mike Frysinger <vapier@g.o> |
| 96 |
+ timezone-data-2008a.ebuild: |
| 97 |
+ Add support for /etc/timezone. |
| 98 |
|
| 99 |
*timezone-data-2008a (10 Mar 2008) |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
-- |
| 105 |
gentoo-commits@l.g.o mailing list |
Archives