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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 005E215815E for ; Fri, 2 Feb 2024 02:47:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5E15E2A7A; Fri, 2 Feb 2024 02:47:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEBF3E2A7A for ; Fri, 2 Feb 2024 02:47:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95B3A34322F for ; Fri, 2 Feb 2024 02:47:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 074DDFA7 for ; Fri, 2 Feb 2024 02:46:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1706841985.87bdc9616ff29a4f09ab132e9908c0b8dcf558d9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/files/, sys-libs/timezone-data/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/timezone-data/Manifest sys-libs/timezone-data/files/timezone-data-2022g-c23.patch sys-libs/timezone-data/timezone-data-2022g.ebuild sys-libs/timezone-data/timezone-data-2023a.ebuild X-VCS-Directories: sys-libs/timezone-data/ sys-libs/timezone-data/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 87bdc9616ff29a4f09ab132e9908c0b8dcf558d9 X-VCS-Branch: master Date: Fri, 2 Feb 2024 02:46:59 +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: e79aba09-3630-4b67-99f3-382086291cdc X-Archives-Hash: 7f1e9d3503cdeff1f94e9248d0028470 commit: 87bdc9616ff29a4f09ab132e9908c0b8dcf558d9 Author: Sam James gentoo org> AuthorDate: Fri Feb 2 02:46:25 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 2 02:46:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87bdc961 sys-libs/timezone-data: drop 2022g, 2023a Signed-off-by: Sam James gentoo.org> sys-libs/timezone-data/Manifest | 4 - .../files/timezone-data-2022g-c23.patch | 279 --------------------- sys-libs/timezone-data/timezone-data-2022g.ebuild | 201 --------------- sys-libs/timezone-data/timezone-data-2023a.ebuild | 197 --------------- 4 files changed, 681 deletions(-) diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index 81f7cc138458..43273bb987bb 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -1,10 +1,6 @@ -DIST tzcode2022g.tar.gz 287901 BLAKE2B b67bb2020913c57cc6bc68d231c53ba645b95305256065e2645bce3b0d71adfaea865ed9bf40f1ec3b4a73aad7e6c48f5ecd0895de6e2d69bed6113d6b579e26 SHA512 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a -DIST tzcode2023a.tar.gz 292438 BLAKE2B 090d80ddaf580e5638175cb511f8da0644886b6eb8c38dc1b2b3c854be30e9caec980ae0dcc2034471bef7b15abee6ce83901977bf3b8697651f6711573e1575 SHA512 d45fc677a0a32ae807bf421faceff675565ee15e3ff42d3a4121df10e1f7855ac16b27fbc28bd365f93c57f40c5bdf19cde88546f7090cfab7676cac0a5516a4 DIST tzcode2023c.tar.gz 292852 BLAKE2B 707ae61740543f3a61520f67176c391ba1e4a8d7858ede4cadd837935be9a9aeb5cf8914049838aaed2f57d7dc4e1df33f29913e143d23deb58011b3e103aade SHA512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 DIST tzcode2023d.tar.gz 298795 BLAKE2B 3e759de2e1dfe033bb98b5af5239631ef5dc33e25b6aeb95ab3e6041d5db3dd1b1cb8b210f072bc0d671117f2ad162cdcdcb3ecae97aa2d3be3bc2e809845666 SHA512 3994a5a060a7a5fffc6585f5191cf7679f9f9be44dbcee4d67d0e42c5b6020c308cb55caf8bf8d51554697665105a174cb470c8c4fc069438350f3bac725709b DIST tzcode2024a.tar.gz 301595 BLAKE2B f3b8d1e7735ad858d071df564a8e11ac4d252b97a5729fa6c282112ff3903f7d35897735920b4466a926ef647dc283356879134046805411c694efd3fd89b282 SHA512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c -DIST tzdata2022g.tar.gz 439731 BLAKE2B 582b79cc2317d27f3883042cbca25801397d9e2808ad8d3a340017d635372ef20316ce646a25a43b0ea5d4024841b54925ecc4510613295c39c28647989645cb SHA512 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65 -DIST tzdata2023a.tar.gz 442875 BLAKE2B 33dd386d37a6349c9f9e60694c43323e97c9ba2cc6ca8f7f3a27c96734c1f6281e08748f1676e9fb4162d75202c9d38910caa28475bcb7414283b5991053d096 SHA512 10aadd6eba50f63f427399281065ba34cb474f6a854f8dc7a6f4f1343b1474a05f22b69b1e113ea67bb5f3f479253610a16b89d9dfa157bf0fde4c69aa3d6493 DIST tzdata2023c.tar.gz 443902 BLAKE2B 8a50aa5f338565d86b8fa5428c138b251bd8dcc3ea66c144b49625d02c5c7aa27f1ace66babd36f10f75cf5eb832ec327b9c2e8adb0384c450130d1ee8c45562 SHA512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 DIST tzdata2023d.tar.gz 449767 BLAKE2B b79be37a8a258745d162a575c795ee6476b4fa5f6d2f7b562d9431a238eca276a1747a983778291184fc6e40a0c1f5e6284d41290fd6d1d3bd3118bda83f426e SHA512 81832b2d738c28cecbcb3906cc07568c5ae574adc9de35b25d4bf613581c92d471d67213b4261a56f0ec02efcf211b4e298b7e1dc367c972e726b0a2e9498df4 DIST tzdata2024a.tar.gz 451270 BLAKE2B 5ec49bbce704411a1d8b3f018b0d8f6c7de24c5600e0cb6c61a7ee29b4a49b1e502d23b40bce6584ea0aa9b66327321608cbabb994071ec4ca2b3a496aa2d621 SHA512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 diff --git a/sys-libs/timezone-data/files/timezone-data-2022g-c23.patch b/sys-libs/timezone-data/files/timezone-data-2022g-c23.patch deleted file mode 100644 index 2665841e5aa5..000000000000 --- a/sys-libs/timezone-data/files/timezone-data-2022g-c23.patch +++ /dev/null @@ -1,279 +0,0 @@ -https://github.com/eggert/tz/commit/9cfe9507fcc22cd4a0c4da486ea1c7f0de6b075f -but minus the NEWS changes - -From: Paul Eggert -Date: Thu, 1 Dec 2022 10:28:04 -0800 -Subject: [PATCH] Fix C23-related conformance bug -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem reported by Houge Langley for ‘gcc -std=gnu99’ in: -https://bugs.gentoo.org/show_bug.cgi?id=883719 -* NEWS: Mention this. -* date.c, localtime.c, private.h, zdump.c, zic.c: -Use ATTRIBUTE_* at the start of function declarations, -not later (such as after the keyword ‘static’). -This is required for strict conformance to C23. ---- a/date.c -+++ b/date.c -@@ -42,7 +42,7 @@ static void display(const char *, time_t); - static void dogmt(void); - static void errensure(void); - static void timeout(FILE *, const char *, const struct tm *); --static ATTRIBUTE_NORETURN void usage(void); -+ATTRIBUTE_NORETURN static void usage(void); - - int - main(const int argc, char *argv[]) ---- a/localtime.c -+++ b/localtime.c -@@ -843,7 +843,7 @@ is_digit(char c) - ** Return a pointer to that character. - */ - --static ATTRIBUTE_REPRODUCIBLE const char * -+ATTRIBUTE_REPRODUCIBLE static const char * - getzname(register const char *strp) - { - register char c; -@@ -864,7 +864,7 @@ getzname(register const char *strp) - ** We don't do any checking here; checking is done later in common-case code. - */ - --static ATTRIBUTE_REPRODUCIBLE const char * -+ATTRIBUTE_REPRODUCIBLE static const char * - getqzname(register const char *strp, const int delim) - { - register int c; ---- a/private.h -+++ b/private.h -@@ -646,7 +646,7 @@ DEPRECATED_IN_C23 char *asctime(struct tm const *); - char *asctime_r(struct tm const *restrict, char *restrict); - DEPRECATED_IN_C23 char *ctime(time_t const *); - char *ctime_r(time_t const *, char *); --double difftime(time_t, time_t) ATTRIBUTE_UNSEQUENCED; -+ATTRIBUTE_UNSEQUENCED double difftime(time_t, time_t); - size_t strftime(char *restrict, size_t, char const *restrict, - struct tm const *restrict); - # if HAVE_STRFTIME_L -@@ -765,10 +765,10 @@ timezone_t tzalloc(char const *); - void tzfree(timezone_t); - # if STD_INSPIRED - # if TZ_TIME_T || !defined posix2time_z --time_t posix2time_z(timezone_t, time_t) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE time_t posix2time_z(timezone_t, time_t); - # endif - # if TZ_TIME_T || !defined time2posix_z --time_t time2posix_z(timezone_t, time_t) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE time_t time2posix_z(timezone_t, time_t); - # endif - # endif - #endif ---- a/zdump.c -+++ b/zdump.c -@@ -89,7 +89,7 @@ static bool warned; - static bool errout; - - static char const *abbr(struct tm const *); --static intmax_t delta(struct tm *, struct tm *) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE static intmax_t delta(struct tm *, struct tm *); - static void dumptime(struct tm const *); - static time_t hunt(timezone_t, time_t, time_t, bool); - static void show(timezone_t, char *, time_t, bool); -@@ -97,7 +97,7 @@ static void showextrema(timezone_t, char *, time_t, struct tm *, time_t); - static void showtrans(char const *, struct tm const *, time_t, char const *, - char const *); - static const char *tformat(void); --static time_t yeartot(intmax_t) ATTRIBUTE_REPRODUCIBLE; -+ATTRIBUTE_REPRODUCIBLE static time_t yeartot(intmax_t); - - /* Is C an ASCII digit? */ - static bool -@@ -125,7 +125,7 @@ is_alpha(char a) - } - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - size_overflow(void) - { - fprintf(stderr, _("%s: size overflow\n"), progname); -@@ -134,7 +134,7 @@ size_overflow(void) - - /* Return A + B, exiting if the result would overflow either ptrdiff_t - or size_t. */ --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - sumsize(size_t a, size_t b) - { - #ifdef ckd_add -@@ -151,7 +151,7 @@ sumsize(size_t a, size_t b) - - /* Return a pointer to a newly allocated buffer of size SIZE, exiting - on failure. SIZE should be nonzero. */ --static void * ATTRIBUTE_MALLOC -+ATTRIBUTE_MALLOC static void * - xmalloc(size_t size) - { - void *p = malloc(size); -@@ -916,7 +916,7 @@ showextrema(timezone_t tz, char *zone, time_t lo, struct tm *lotmp, time_t hi) - # include - - /* A substitute for snprintf that is good enough for zdump. */ --static int ATTRIBUTE_FORMAT((printf, 3, 4)) -+ATTRIBUTE_FORMAT((printf, 3, 4)) static int - my_snprintf(char *s, size_t size, char const *format, ...) - { - int n; ---- a/zic.c -+++ b/zic.c -@@ -459,20 +459,20 @@ static char roll[TZ_MAX_LEAPS]; - ** Memory allocation. - */ - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - memory_exhausted(const char *msg) - { - fprintf(stderr, _("%s: Memory exhausted: %s\n"), progname, msg); - exit(EXIT_FAILURE); - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - size_overflow(void) - { - memory_exhausted(_("size overflow")); - } - --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - size_sum(size_t a, size_t b) - { - #ifdef ckd_add -@@ -487,7 +487,7 @@ size_sum(size_t a, size_t b) - size_overflow(); - } - --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - size_product(ptrdiff_t nitems, ptrdiff_t itemsize) - { - #ifdef ckd_mul -@@ -502,7 +502,7 @@ size_product(ptrdiff_t nitems, ptrdiff_t itemsize) - size_overflow(); - } - --static ATTRIBUTE_REPRODUCIBLE ptrdiff_t -+ATTRIBUTE_REPRODUCIBLE static ptrdiff_t - align_to(ptrdiff_t size, ptrdiff_t alignment) - { - ptrdiff_t lo_bits = alignment - 1, sum = size_sum(size, lo_bits); -@@ -526,7 +526,7 @@ memcheck(void *ptr) - return ptr; - } - --static void * ATTRIBUTE_MALLOC -+ATTRIBUTE_MALLOC static void * - emalloc(size_t size) - { - return memcheck(malloc(size)); -@@ -538,7 +538,7 @@ erealloc(void *ptr, size_t size) - return memcheck(realloc(ptr, size)); - } - --static char * ATTRIBUTE_MALLOC -+ATTRIBUTE_MALLOC static char * - estrdup(char const *str) - { - return memcheck(strdup(str)); -@@ -608,7 +608,7 @@ eat(int fnum, lineno num) - eats(fnum, num, 0, -1); - } - --static void ATTRIBUTE_FORMAT((printf, 1, 0)) -+ATTRIBUTE_FORMAT((printf, 1, 0)) static void - verror(const char *const string, va_list args) - { - /* -@@ -626,7 +626,7 @@ verror(const char *const string, va_list args) - fprintf(stderr, "\n"); - } - --static void ATTRIBUTE_FORMAT((printf, 1, 2)) -+ATTRIBUTE_FORMAT((printf, 1, 2)) static void - error(const char *const string, ...) - { - va_list args; -@@ -636,7 +636,7 @@ error(const char *const string, ...) - errors = true; - } - --static void ATTRIBUTE_FORMAT((printf, 1, 2)) -+ATTRIBUTE_FORMAT((printf, 1, 2)) static void - warning(const char *const string, ...) - { - va_list args; -@@ -666,7 +666,7 @@ close_file(FILE *stream, char const *dir, char const *name, - } - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - usage(FILE *stream, int status) - { - fprintf(stream, -@@ -3597,7 +3597,7 @@ lowerit(char a) - } - - /* case-insensitive equality */ --static ATTRIBUTE_REPRODUCIBLE bool -+ATTRIBUTE_REPRODUCIBLE static bool - ciequal(register const char *ap, register const char *bp) - { - while (lowerit(*ap) == lowerit(*bp++)) -@@ -3606,7 +3606,7 @@ ciequal(register const char *ap, register const char *bp) - return false; - } - --static ATTRIBUTE_REPRODUCIBLE bool -+ATTRIBUTE_REPRODUCIBLE static bool - itsabbr(register const char *abbr, register const char *word) - { - if (lowerit(*abbr) != lowerit(*word)) -@@ -3622,7 +3622,7 @@ itsabbr(register const char *abbr, register const char *word) - - /* Return true if ABBR is an initial prefix of WORD, ignoring ASCII case. */ - --static ATTRIBUTE_REPRODUCIBLE bool -+ATTRIBUTE_REPRODUCIBLE static bool - ciprefix(char const *abbr, char const *word) - { - do -@@ -3725,14 +3725,14 @@ getfields(char *cp, char **array, int arrayelts) - return nsubs; - } - --static ATTRIBUTE_NORETURN void -+ATTRIBUTE_NORETURN static void - time_overflow(void) - { - error(_("time overflow")); - exit(EXIT_FAILURE); - } - --static ATTRIBUTE_REPRODUCIBLE zic_t -+ATTRIBUTE_REPRODUCIBLE static zic_t - oadd(zic_t t1, zic_t t2) - { - #ifdef ckd_add -@@ -3746,7 +3746,7 @@ oadd(zic_t t1, zic_t t2) - time_overflow(); - } - --static ATTRIBUTE_REPRODUCIBLE zic_t -+ATTRIBUTE_REPRODUCIBLE static zic_t - tadd(zic_t t1, zic_t t2) - { - #ifdef ckd_add diff --git a/sys-libs/timezone-data/timezone-data-2022g.ebuild b/sys-libs/timezone-data/timezone-data-2022g.ebuild deleted file mode 100644 index 862ddbf6ddce..000000000000 --- a/sys-libs/timezone-data/timezone-data-2022g.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic - -MY_CODE_VER=${PV} -MY_DATA_VER=${PV} -DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" -HOMEPAGE="https://www.iana.org/time-zones" -SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${MY_DATA_VER}.tar.gz - https://www.iana.org/time-zones/repository/releases/tzcode${MY_CODE_VER}.tar.gz" - -LICENSE="BSD public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="nls leaps-timezone zic-slim" - -DEPEND="nls? ( virtual/libintl )" -RDEPEND=" - ${DEPEND} - !sys-libs/glibc[vanilla(+)] -" - -PATCHES=( - "${FILESDIR}"/${P}-c23.patch -) - -src_unpack() { - mkdir "${S}" && cd "${S}" || die - default -} - -src_prepare() { - default - - # check_web contacts validator.w3.org - sed -i -e 's/check_tables check_web/check_tables/g' \ - Makefile || die "Failed to disable check_web" - - if tc-is-cross-compiler ; then - cp -pR "${S}" "${S}"-native || die - fi -} - -src_configure() { - tc-export CC - - # bug #471102 - append-lfs-flags - - if use elibc_Darwin ; then - # bug #138251 - append-cppflags -DSTD_INSPIRED - 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. bug #154181, bug #578424 - local c="${T}/test" - echo 'main(){}' > "${c}.c" || die - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then - LDLIBS+=" -lintl" - fi - fi -} - -_emake() { - emake \ - REDO=$(usex leaps-timezone posix_right posix_only) \ - TOPDIR="${EPREFIX}" \ - ZICDIR='$(TOPDIR)/usr/bin' \ - "$@" -} - -src_compile() { - _emake \ - AR="$(tc-getAR)" \ - cc="$(tc-getCC)" \ - RANLIB="$(tc-getRANLIB)" \ - CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LDLIBS="${LDLIBS}" - - if tc-is-cross-compiler ; then - _emake -C "${S}"-native \ - AR="$(tc-getBUILD_AR)" \ - cc="$(tc-getBUILD_CC)" \ - RANLIB="$(tc-getBUILD_RANLIB)" \ - CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \ - LDFLAGS="${BUILD_LDFLAGS}" \ - LDLIBS="${LDLIBS}" \ - zic - fi -} - -src_test() { - # VALIDATE_ENV is used for extended/web based tests. Punt on them. - emake check VALIDATE_ENV=true -} - -src_install() { - local zic="" - tc-is-cross-compiler && zic="zic=${S}-native/zic" - _emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit" - rm -rf "${D}/nukeit" "${ED}/etc" || die - - insinto /usr/share/zoneinfo - doins "${S}"/leap-seconds.list - - # Delete man pages installed by man-pages package. - rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die - dodoc CONTRIBUTING README NEWS *.html -} - -get_TIMEZONE() { - local tz src="${EROOT}/etc/timezone" - if [[ -e ${src} ]] ; then - tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") - else - tz="FOOKABLOIE" - fi - - [[ -z ${tz} ]] && return 1 || echo "${tz}" -} - -pkg_preinst() { - local tz=$(get_TIMEZONE) - if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then - eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" - eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" - eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" - eerror "be using right/xxx for the system timezone as it breaks programs." - die "Please fix your timezone setting" - fi - - # Trim the symlink by hand to avoid portage's automatic protection checks. - rm -f "${EROOT}"/usr/share/zoneinfo/posix -} - -configure_tz_data() { - # Make sure the /etc/localtime file does not get stale, bug #127899 - 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, bug #511474 - if [[ -L "${etc_lt}" ]] ; then - einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." - return 0 - fi - - if ! tz=$(get_TIMEZONE) ; then - einfo "Assuming your empty ${src} file is what you want; skipping update." - return 0 - fi - - if [[ "${tz}" == "FOOKABLOIE" ]] ; then - einfo "You do not have a timezone set in ${src}; skipping update." - return 0 - fi - - local tzpath="${EROOT}/usr/share/zoneinfo/${tz}" - - if [[ ! -e ${tzpath} ]]; then - ewarn "The timezone specified in ${src} is not valid!" - return 1 - fi - - if [[ -f ${etc_lt} ]]; then - # If a regular file already exists, copy over it. - ewarn "Found a regular file at ${etc_lt}." - ewarn "Some software may expect a symlink instead." - ewarn "You may convert it to a symlink by removing the file and running:" - ewarn " emerge --config sys-libs/timezone-data" - einfo "Copying ${tzpath} to ${etc_lt}." - cp -f "${tzpath}" "${etc_lt}" - else - # Otherwise, create a symlink and remove the timezone file. - tzpath="../usr/share/zoneinfo/${tz}" - einfo "Linking ${tzpath} at ${etc_lt}." - if ln -snf "${tzpath}" "${etc_lt}"; then - einfo "Removing ${src}." - rm -f "${src}" - fi - fi -} - -pkg_config() { - configure_tz_data -} - -pkg_postinst() { - configure_tz_data -} diff --git a/sys-libs/timezone-data/timezone-data-2023a.ebuild b/sys-libs/timezone-data/timezone-data-2023a.ebuild deleted file mode 100644 index 3584f95f6133..000000000000 --- a/sys-libs/timezone-data/timezone-data-2023a.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic - -MY_CODE_VER=${PV} -MY_DATA_VER=${PV} -DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" -HOMEPAGE="https://www.iana.org/time-zones" -SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${MY_DATA_VER}.tar.gz - https://www.iana.org/time-zones/repository/releases/tzcode${MY_CODE_VER}.tar.gz" - -LICENSE="BSD public-domain" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="nls leaps-timezone zic-slim" - -DEPEND="nls? ( virtual/libintl )" -RDEPEND=" - ${DEPEND} - !sys-libs/glibc[vanilla(+)] -" - -src_unpack() { - mkdir "${S}" && cd "${S}" || die - default -} - -src_prepare() { - default - - # check_web contacts validator.w3.org - sed -i -e 's/check_tables check_web/check_tables/g' \ - Makefile || die "Failed to disable check_web" - - if tc-is-cross-compiler ; then - cp -pR "${S}" "${S}"-native || die - fi -} - -src_configure() { - tc-export CC - - # bug #471102 - append-lfs-flags - - if use elibc_Darwin ; then - # bug #138251 - append-cppflags -DSTD_INSPIRED - 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. bug #154181, bug #578424 - local c="${T}/test" - echo 'main(){}' > "${c}.c" || die - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then - LDLIBS+=" -lintl" - fi - fi -} - -_emake() { - emake \ - REDO=$(usex leaps-timezone posix_right posix_only) \ - TOPDIR="${EPREFIX}" \ - ZICDIR='$(TOPDIR)/usr/bin' \ - "$@" -} - -src_compile() { - _emake \ - AR="$(tc-getAR)" \ - cc="$(tc-getCC)" \ - RANLIB="$(tc-getRANLIB)" \ - CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LDLIBS="${LDLIBS}" - - if tc-is-cross-compiler ; then - _emake -C "${S}"-native \ - AR="$(tc-getBUILD_AR)" \ - cc="$(tc-getBUILD_CC)" \ - RANLIB="$(tc-getBUILD_RANLIB)" \ - CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \ - LDFLAGS="${BUILD_LDFLAGS}" \ - LDLIBS="${LDLIBS}" \ - zic - fi -} - -src_test() { - # VALIDATE_ENV is used for extended/web based tests. Punt on them. - emake check VALIDATE_ENV=true -} - -src_install() { - local zic="" - tc-is-cross-compiler && zic="zic=${S}-native/zic" - _emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit" - rm -rf "${D}/nukeit" "${ED}/etc" || die - - insinto /usr/share/zoneinfo - doins "${S}"/leap-seconds.list - - # Delete man pages installed by man-pages package. - rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die - dodoc CONTRIBUTING README NEWS *.html -} - -get_TIMEZONE() { - local tz src="${EROOT}/etc/timezone" - if [[ -e ${src} ]] ; then - tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") - else - tz="FOOKABLOIE" - fi - - [[ -z ${tz} ]] && return 1 || echo "${tz}" -} - -pkg_preinst() { - local tz=$(get_TIMEZONE) - if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then - eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" - eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" - eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" - eerror "be using right/xxx for the system timezone as it breaks programs." - die "Please fix your timezone setting" - fi - - # Trim the symlink by hand to avoid portage's automatic protection checks. - rm -f "${EROOT}"/usr/share/zoneinfo/posix -} - -configure_tz_data() { - # Make sure the /etc/localtime file does not get stale, bug #127899 - 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, bug #511474 - if [[ -L "${etc_lt}" ]] ; then - einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." - return 0 - fi - - if ! tz=$(get_TIMEZONE) ; then - einfo "Assuming your empty ${src} file is what you want; skipping update." - return 0 - fi - - if [[ "${tz}" == "FOOKABLOIE" ]] ; then - einfo "You do not have a timezone set in ${src}; skipping update." - return 0 - fi - - local tzpath="${EROOT}/usr/share/zoneinfo/${tz}" - - if [[ ! -e ${tzpath} ]]; then - ewarn "The timezone specified in ${src} is not valid!" - return 1 - fi - - if [[ -f ${etc_lt} ]]; then - # If a regular file already exists, copy over it. - ewarn "Found a regular file at ${etc_lt}." - ewarn "Some software may expect a symlink instead." - ewarn "You may convert it to a symlink by removing the file and running:" - ewarn " emerge --config sys-libs/timezone-data" - einfo "Copying ${tzpath} to ${etc_lt}." - cp -f "${tzpath}" "${etc_lt}" - else - # Otherwise, create a symlink and remove the timezone file. - tzpath="../usr/share/zoneinfo/${tz}" - einfo "Linking ${tzpath} at ${etc_lt}." - if ln -snf "${tzpath}" "${etc_lt}"; then - einfo "Removing ${src}." - rm -f "${src}" - fi - fi -} - -pkg_config() { - configure_tz_data -} - -pkg_postinst() { - configure_tz_data -}