| 1 |
commit: 5b65f3d7e3ca9daa0831b09ecfdde854f152063d |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 20 00:56:19 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 20 00:56:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b65f3d7 |
| 7 |
|
| 8 |
sys-libs/timezone-data: fix paths for EAPI=7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.68, Repoman-2.3.16 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
...e-data-2019b.ebuild => timezone-data-2019b-r1.ebuild} | 16 ++++++++-------- |
| 14 |
1 file changed, 8 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/timezone-data/timezone-data-2019b.ebuild b/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild |
| 17 |
similarity index 92% |
| 18 |
rename from sys-libs/timezone-data/timezone-data-2019b.ebuild |
| 19 |
rename to sys-libs/timezone-data/timezone-data-2019b-r1.ebuild |
| 20 |
index 07d15cc4959..a52e4d3a726 100644 |
| 21 |
--- a/sys-libs/timezone-data/timezone-data-2019b.ebuild |
| 22 |
+++ b/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild |
| 23 |
@@ -103,7 +103,7 @@ src_install() { |
| 24 |
} |
| 25 |
|
| 26 |
get_TIMEZONE() { |
| 27 |
- local tz src="${EROOT}etc/timezone" |
| 28 |
+ local tz src="${EROOT}/etc/timezone" |
| 29 |
if [[ -e ${src} ]] ; then |
| 30 |
tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") |
| 31 |
else |
| 32 |
@@ -135,11 +135,11 @@ pkg_preinst() { |
| 33 |
|
| 34 |
configure_tz_data() { |
| 35 |
# make sure the /etc/localtime file does not get stale #127899 |
| 36 |
- local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" |
| 37 |
+ local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime" |
| 38 |
|
| 39 |
# If it's a symlink, assume the user knows what they're doing and |
| 40 |
# they're managing it themselves. #511474 |
| 41 |
- if [[ -L ${etc_lt} ]] ; then |
| 42 |
+ if [[ -L "${etc_lt}" ]] ; then |
| 43 |
einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." |
| 44 |
return 0 |
| 45 |
fi |
| 46 |
@@ -148,10 +148,10 @@ configure_tz_data() { |
| 47 |
einfo "Assuming your empty ${etc_lt} file is what you want; skipping update." |
| 48 |
return 0 |
| 49 |
fi |
| 50 |
- if [[ ${tz} == "FOOKABLOIE" ]] ; then |
| 51 |
+ if [[ "${tz}" == "FOOKABLOIE" ]] ; then |
| 52 |
elog "You do not have TIMEZONE set in ${src}." |
| 53 |
|
| 54 |
- if [[ ! -e ${etc_lt} ]] ; then |
| 55 |
+ if [[ ! -e "${etc_lt}" ]] ; then |
| 56 |
cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" |
| 57 |
elog "Setting ${etc_lt} to Factory." |
| 58 |
else |
| 59 |
@@ -160,13 +160,13 @@ configure_tz_data() { |
| 60 |
return 0 |
| 61 |
fi |
| 62 |
|
| 63 |
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then |
| 64 |
+ if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then |
| 65 |
elog "You have an invalid TIMEZONE setting in ${src}" |
| 66 |
elog "Your ${etc_lt} has been reset to Factory; enjoy!" |
| 67 |
tz="Factory" |
| 68 |
fi |
| 69 |
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" |
| 70 |
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" |
| 71 |
+ einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}" |
| 72 |
+ cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}" |
| 73 |
} |
| 74 |
|
| 75 |
pkg_config() { |
Archives