From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 450ED138334 for ; Sat, 20 Jul 2019 00:56:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7449CE078A; Sat, 20 Jul 2019 00:56:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45D8EE078A for ; Sat, 20 Jul 2019 00:56:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AB9F34810C for ; Sat, 20 Jul 2019 00:56:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD1B066B for ; Sat, 20 Jul 2019 00:56:36 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1563584179.5b65f3d7e3ca9daa0831b09ecfdde854f152063d.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/timezone-data/timezone-data-2019b-r1.ebuild sys-libs/timezone-data/timezone-data-2019b.ebuild X-VCS-Directories: sys-libs/timezone-data/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 5b65f3d7e3ca9daa0831b09ecfdde854f152063d X-VCS-Branch: master Date: Sat, 20 Jul 2019 00:56:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a8f5b704-10cd-45e6-8e8e-654b58ba795b X-Archives-Hash: 57be5f0d48358fbe9f042caab47d2bfd commit: 5b65f3d7e3ca9daa0831b09ecfdde854f152063d Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Jul 20 00:56:19 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Jul 20 00:56:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b65f3d7 sys-libs/timezone-data: fix paths for EAPI=7 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Thomas Deutschmann gentoo.org> ...e-data-2019b.ebuild => timezone-data-2019b-r1.ebuild} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-libs/timezone-data/timezone-data-2019b.ebuild b/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild similarity index 92% rename from sys-libs/timezone-data/timezone-data-2019b.ebuild rename to sys-libs/timezone-data/timezone-data-2019b-r1.ebuild index 07d15cc4959..a52e4d3a726 100644 --- a/sys-libs/timezone-data/timezone-data-2019b.ebuild +++ b/sys-libs/timezone-data/timezone-data-2019b-r1.ebuild @@ -103,7 +103,7 @@ src_install() { } get_TIMEZONE() { - local tz src="${EROOT}etc/timezone" + local tz src="${EROOT}/etc/timezone" if [[ -e ${src} ]] ; then tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") else @@ -135,11 +135,11 @@ pkg_preinst() { configure_tz_data() { # make sure the /etc/localtime file does not get stale #127899 - local tz src="${EROOT}etc/timezone" etc_lt="${EROOT}etc/localtime" + local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime" # If it's a symlink, assume the user knows what they're doing and # they're managing it themselves. #511474 - if [[ -L ${etc_lt} ]] ; then + if [[ -L "${etc_lt}" ]] ; then einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." return 0 fi @@ -148,10 +148,10 @@ configure_tz_data() { einfo "Assuming your empty ${etc_lt} file is what you want; skipping update." return 0 fi - if [[ ${tz} == "FOOKABLOIE" ]] ; then + if [[ "${tz}" == "FOOKABLOIE" ]] ; then elog "You do not have TIMEZONE set in ${src}." - if [[ ! -e ${etc_lt} ]] ; then + if [[ ! -e "${etc_lt}" ]] ; then cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" elog "Setting ${etc_lt} to Factory." else @@ -160,13 +160,13 @@ configure_tz_data() { return 0 fi - if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then + if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then elog "You have an invalid TIMEZONE setting in ${src}" elog "Your ${etc_lt} has been reset to Factory; enjoy!" tz="Factory" fi - einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}" - cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" + einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}" + cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}" } pkg_config() {