From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1218279-garchives=archives.gentoo.org@lists.gentoo.org>
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 2C8AC1381F3
for <garchives@archives.gentoo.org>; Thu, 29 Oct 2020 07:59:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 699DDE0982;
Thu, 29 Oct 2020 07:59:38 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 5462EE0982
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Oct 2020 07:59:38 +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 F3BFD340AF0
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Oct 2020 07:59:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AE637395
for <gentoo-commits@lists.gentoo.org>; Thu, 29 Oct 2020 07:59:35 +0000 (UTC)
From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" <slyfox@gentoo.org>
Message-ID: <1603958367.3cec5bd675c583b39c72eb2df45bc8f2ea342a12.slyfox@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/metadata.xml sys-libs/timezone-data/timezone-data-2020d.ebuild
X-VCS-Directories: sys-libs/timezone-data/
X-VCS-Committer: slyfox
X-VCS-Committer-Name: Sergei Trofimovich
X-VCS-Revision: 3cec5bd675c583b39c72eb2df45bc8f2ea342a12
X-VCS-Branch: master
Date: Thu, 29 Oct 2020 07:59:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 942beebc-6bb7-4bfa-8813-b0f17b4dbb73
X-Archives-Hash: cb6742dc1beba0bd1e919dc5a173ccd0
commit: 3cec5bd675c583b39c72eb2df45bc8f2ea342a12
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 07:55:46 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 07:59:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cec5bd6
sys-libs/timezone-data: add USE=zic-slim (disable by default)
Many programs can't handle "slim" format of /usr/share/zoneinfo.
Expose an USE flag to allow ease switching back and forth while
using up to date zoneinfo data.
Bug: https://bugs.gentoo.org/749591
Bug: https://bugs.gentoo.org/747538
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-libs/timezone-data/metadata.xml | 4 ++++
sys-libs/timezone-data/timezone-data-2020d.ebuild | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/sys-libs/timezone-data/metadata.xml b/sys-libs/timezone-data/metadata.xml
index a74a2f3c906..0cca351e7a0 100644
--- a/sys-libs/timezone-data/metadata.xml
+++ b/sys-libs/timezone-data/metadata.xml
@@ -15,5 +15,9 @@
when counting seconds since the epoch (while POSIX does not) as they are
based on the TAI (International Atomic Time) clock
</flag>
+ <flag name="zic-slim">
+ Default to 'slim' file format for /usr/share/zoneinfo. Otherise 'fat' format
+ is used. Not all programs can handle 'slim' format'.
+ </flag>
</use>
</pkgmetadata>
diff --git a/sys-libs/timezone-data/timezone-data-2020d.ebuild b/sys-libs/timezone-data/timezone-data-2020d.ebuild
index d6de39e1497..8b4bec52eb7 100644
--- a/sys-libs/timezone-data/timezone-data-2020d.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2020d.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t
LICENSE="BSD public-domain"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls leaps-timezone elibc_FreeBSD"
+IUSE="nls leaps-timezone elibc_FreeBSD zic-slim"
DEPEND="nls? ( virtual/libintl )"
RDEPEND="${DEPEND}
@@ -43,6 +43,11 @@ src_configure() {
fi
append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
+
+ # Upstream default is 'slim', but it breaks quite a few programs
+ # that parse /etc/localtime directly: bug# 747538.
+ append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"'
+
LDLIBS=""
if use nls ; then
# See if an external libintl is available. #154181 #578424