| 1 |
commit: 3cec5bd675c583b39c72eb2df45bc8f2ea342a12 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 29 07:55:46 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 29 07:59:27 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cec5bd6 |
| 7 |
|
| 8 |
sys-libs/timezone-data: add USE=zic-slim (disable by default) |
| 9 |
|
| 10 |
Many programs can't handle "slim" format of /usr/share/zoneinfo. |
| 11 |
|
| 12 |
Expose an USE flag to allow ease switching back and forth while |
| 13 |
using up to date zoneinfo data. |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/749591 |
| 16 |
Bug: https://bugs.gentoo.org/747538 |
| 17 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 18 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 19 |
|
| 20 |
sys-libs/timezone-data/metadata.xml | 4 ++++ |
| 21 |
sys-libs/timezone-data/timezone-data-2020d.ebuild | 7 ++++++- |
| 22 |
2 files changed, 10 insertions(+), 1 deletion(-) |
| 23 |
|
| 24 |
diff --git a/sys-libs/timezone-data/metadata.xml b/sys-libs/timezone-data/metadata.xml |
| 25 |
index a74a2f3c906..0cca351e7a0 100644 |
| 26 |
--- a/sys-libs/timezone-data/metadata.xml |
| 27 |
+++ b/sys-libs/timezone-data/metadata.xml |
| 28 |
@@ -15,5 +15,9 @@ |
| 29 |
when counting seconds since the epoch (while POSIX does not) as they are |
| 30 |
based on the TAI (International Atomic Time) clock |
| 31 |
</flag> |
| 32 |
+ <flag name="zic-slim"> |
| 33 |
+ Default to 'slim' file format for /usr/share/zoneinfo. Otherise 'fat' format |
| 34 |
+ is used. Not all programs can handle 'slim' format'. |
| 35 |
+ </flag> |
| 36 |
</use> |
| 37 |
</pkgmetadata> |
| 38 |
|
| 39 |
diff --git a/sys-libs/timezone-data/timezone-data-2020d.ebuild b/sys-libs/timezone-data/timezone-data-2020d.ebuild |
| 40 |
index d6de39e1497..8b4bec52eb7 100644 |
| 41 |
--- a/sys-libs/timezone-data/timezone-data-2020d.ebuild |
| 42 |
+++ b/sys-libs/timezone-data/timezone-data-2020d.ebuild |
| 43 |
@@ -15,7 +15,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.t |
| 44 |
LICENSE="BSD public-domain" |
| 45 |
SLOT="0" |
| 46 |
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" |
| 47 |
-IUSE="nls leaps-timezone elibc_FreeBSD" |
| 48 |
+IUSE="nls leaps-timezone elibc_FreeBSD zic-slim" |
| 49 |
|
| 50 |
DEPEND="nls? ( virtual/libintl )" |
| 51 |
RDEPEND="${DEPEND} |
| 52 |
@@ -43,6 +43,11 @@ src_configure() { |
| 53 |
fi |
| 54 |
|
| 55 |
append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"' |
| 56 |
+ |
| 57 |
+ # Upstream default is 'slim', but it breaks quite a few programs |
| 58 |
+ # that parse /etc/localtime directly: bug# 747538. |
| 59 |
+ append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"' |
| 60 |
+ |
| 61 |
LDLIBS="" |
| 62 |
if use nls ; then |
| 63 |
# See if an external libintl is available. #154181 #578424 |
Archives