6 files changed, 219 insertions, 2 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6c44e41c1e59..bf3c73b19162 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index ed82d2f4de6e..b4eab5772d44 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -11,6 +11,6 @@ EBUILD liburing-2.2.ebuild 1574 BLAKE2B 78ebce489d9b427f0832118b0e752cc8cb033a7b
 EBUILD liburing-2.3-r4.ebuild 2142 BLAKE2B 22748487fd62608752ef8e0dda645e74c948d664818e8f755449bc53c4213f15ba83f00d4aebded5cf82da62e0f5989f4b7de18afc992ba6f3b1c4b9bb4952bf SHA512 7364fd68ba42e0eb970f52f6bb4fefa26a029378164c283ac88b251ccaab5c242c3c4cea5f0f1449bcb2f6a9eb0ba73ac477ee4f5b819f311cc78ad946c38220
 EBUILD liburing-2.5-r2.ebuild 1991 BLAKE2B cfd589c1ed94c76f62b9b4e49fcd80da683f734cd54efe6c33c7717a07202f7b0c1e8b82691ccca52d3c3ce7f33c92040aa5c7008fdccdcd85fcd669bf86c4ec SHA512 f78dfa16671f8a168de24f596b67f2efd0ba7a5f131c907c63e226e7d72ffe9464ac04c8804cf047e1b63147fbdb566a4e75d6f9a9d7a1f722c1d406b5d0e6d1
 EBUILD liburing-2.6.ebuild 1896 BLAKE2B b38551ff2a462ff1a10c71009cc7476e4f558f0083db4dbe81787048fff039bbfc88bf0d18736dffc0f370b1eb53f662bd42cf5ae5cffe1559d9947e6e7e3989 SHA512 432d775cac4f913c51aa97925ee9bcd4a5bb8c6a366ecae7a72b6b47d3bfd2b03d5ca2b8a3539f0269e335478c267bd4173a19de116a1c35a9a2a83f8909778f
-EBUILD liburing-2.7-r1.ebuild 1909 BLAKE2B a9da03e1dab976ddb0505c1dc6be6c0be4a15c5a9a360b00ad875a6ec5a42bf0e3f753b22d07ba1768d201438c3d35537bae80d061359befa02d40c53ee7cad4 SHA512 f53eba596a6307e11e53036b2f6ba996d73c08fb0b0020c1e40470e88455952fac675b90ae9aac2b8afa8efee438ee4c4d0c40be91fa00d43d43a58b7c1418fa
+EBUILD liburing-2.7-r1.ebuild 1915 BLAKE2B 293ef9bb1d6893348162a23a321b4702a6cf067c5ff921884e10c7ceba3d7aa136b57dbccb5c4a3b6b06a3270c7111cd73658669670dbdaa30801ac7900bc508 SHA512 2fa7e3ad262e5c823d7022ee7cceacd5db8a3e7dd054a38a0c9b69c589e0fdfbc38f67f4708468ab17bed4e0986076eedb308b93e25558acc96a138374805b6f
 EBUILD liburing-9999.ebuild 1896 BLAKE2B 443616eb7133f1887f69373deefc21af17dea96774a15457f906fe269f3e2c6f1bac9b929cc68684d3a3326f46fd10f1fca8efb2ef2f5c43e320a111c34346c8 SHA512 20253472f8bd1fb541cac0f21aaec4d6b3f1106ff9e61bc82370d7f6d65388739dc4246b53c6171156647b70af6c11d88d6993160e8d8088f0cce648156055ee
 MISC metadata.xml 326 BLAKE2B 7c133a6dbb4ab4b537c0741ec9f3cd525c0803040950ee93e4c1cbc848c7618074471cc1a18ca07d6963c06252c83b66df0811ebae4c0cf9d7782f66ca5aa14a SHA512 1aacf941a9fa57429468fdfc8f546f559c5d483988ba5c6b0f4ed0fe5913f85d218b2a9eec83bae1d11a71eed36a37e76ccedc192697fbe9763fd0b09b2dcfd7
diff --git a/sys-libs/liburing/liburing-2.7-r1.ebuild b/sys-libs/liburing/liburing-2.7-r1.ebuild
index 5e6d4ed12e3b..14695dfc2536 100644
--- a/sys-libs/liburing/liburing-2.7-r1.ebuild
+++ b/sys-libs/liburing/liburing-2.7-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/axboe/liburing.git"
 else
 	SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	QA_PKGCONFIG_VERSION=${PV}
 fi
 LICENSE="MIT"
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index dd1fd1af4ea0..d409e27cf2ed 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,8 +1,11 @@
 AUX timezone-data-2024a-AsiaAlmaty.patch 1211 BLAKE2B 2d85afd4aa93ecbc051efc67ef0451fa8acd342b7f949db6a07b3f0108da612abe4002c44e308ccdfc1bb4cd3f078814951cdb623907d68a1a5a69de817bf96c SHA512 988dd962d85f2ba02e8e47fc982da1830b0e184135403fa4fe38e2ff251ac242ce7f36ed5298830a91dc76cfd428b09faaf1319c4f20cd29833b9164def079cb
+AUX timezone-data-2024b-April-short.patch 877 BLAKE2B b15f547759e3418011dc0dd83c09573bcae5a9ce6b22387dd694b4ab8a138e470e6bec68492efb9251ae20c63bfb9dae87b9d208d467b3ae6a3170def4eff0cf SHA512 dcff5b75c023c317482c58c4ccef91bd86ce2a1c6f9993985daa542ccf61616251b56b4d091ba7a44dceb7549caa7e18ff50970ffc28e0db89c4e949fe1ba2ff
 DIST tzcode2023d.tar.gz 298795 BLAKE2B 3e759de2e1dfe033bb98b5af5239631ef5dc33e25b6aeb95ab3e6041d5db3dd1b1cb8b210f072bc0d671117f2ad162cdcdcb3ecae97aa2d3be3bc2e809845666 SHA512 3994a5a060a7a5fffc6585f5191cf7679f9f9be44dbcee4d67d0e42c5b6020c308cb55caf8bf8d51554697665105a174cb470c8c4fc069438350f3bac725709b
 DIST tzcode2024a.tar.gz 301595 BLAKE2B f3b8d1e7735ad858d071df564a8e11ac4d252b97a5729fa6c282112ff3903f7d35897735920b4466a926ef647dc283356879134046805411c694efd3fd89b282 SHA512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c
 DIST tzdata2023d.tar.gz 449767 BLAKE2B b79be37a8a258745d162a575c795ee6476b4fa5f6d2f7b562d9431a238eca276a1747a983778291184fc6e40a0c1f5e6284d41290fd6d1d3bd3118bda83f426e SHA512 81832b2d738c28cecbcb3906cc07568c5ae574adc9de35b25d4bf613581c92d471d67213b4261a56f0ec02efcf211b4e298b7e1dc367c972e726b0a2e9498df4
 DIST tzdata2024a.tar.gz 451270 BLAKE2B 5ec49bbce704411a1d8b3f018b0d8f6c7de24c5600e0cb6c61a7ee29b4a49b1e502d23b40bce6584ea0aa9b66327321608cbabb994071ec4ca2b3a496aa2d621 SHA512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236
+DIST tzdb-2024b.tar.lz 544381 BLAKE2B 7e9e7d88aa25813c461bd9a9653fcb5e9b212bd07f7c6d5632a75e7f2200af121382ffe98bdf2a88f21b88e1fcebb3fee1bdc39322fe65520084144065d3445f SHA512 72446e5cf445515512437c8deaae3063b093aab9620d6441cafaa9b3b71603c857f7ba53557579595788bbc901cd6142404b4db6b0e9f2b23d57b2b3cbc837a8
 EBUILD timezone-data-2023d.ebuild 5274 BLAKE2B f105cd30b039b31e3ca213711c65db387c730135503b8a5633db29ab1d61eebe4e26457326e16269a5735087a77c6c1386304b15c905b338655347e98fccf3fa SHA512 606844ea9605847a3c0ca6fa03cc5151443634fd8c475e9b0a6a4dd936c2ac2dbc012978a6d67d29cdf08f14cdcafff5fe633b5f6e41b9e08e0c17fda8f0c5e7
 EBUILD timezone-data-2024a-r1.ebuild 5327 BLAKE2B abae514255a2155c8cddccb6b0a94fff559a1bde54eaadb2e499a7c48d37658de4209ccf3c98345aa55102358fd4c1f9fb493f144b96159487bb24b5f4bdeb2a SHA512 014e334be715b5927c7e67e8c97ec6c4f244153ba1619f82bc2845ead9a1903cfa990a48c697dc6e2c130aaa0efa0ebee37c6d4af94db6ec831aadfc0cb59fa6
+EBUILD timezone-data-2024b.ebuild 5049 BLAKE2B 986e7abb9c519c02cab68cec482370f8eee30ba77035e0b1c6559adf4a11adf67cd26f1b588ac610f9cb50811d1c229b38903d06514c38e60fce9984d2c05112 SHA512 4f259b4ed09125d28b581479c8a9c0bf9982eaf6e383e955ee3b8ffa30fe75adcea74499851edc595d13820775502069f3a717a3374efc708fd9170ce034b8b6
 MISC metadata.xml 807 BLAKE2B 24b09c4228c232b607e6e6c165a20e364136d77aa970e72c70124636a038cd3b672bad16ddd68c0b75373be6a09f969e59bc38f7e451bb2869cd46c521e2ca82 SHA512 0b95b32d79651493a04032f175f3320d8975cea714b43fa56aa528f10f51a7c52b58a934828f98a770855485af6f8db048bd2bfa3010802cff8c26ae05bb16e2
diff --git a/sys-libs/timezone-data/files/timezone-data-2024b-April-short.patch b/sys-libs/timezone-data/files/timezone-data-2024b-April-short.patch
new file mode 100644
index 000000000000..6fd4ed296f40
--- /dev/null
+++ b/sys-libs/timezone-data/files/timezone-data-2024b-April-short.patch
@@ -0,0 +1,22 @@
+https://github.com/eggert/tz/commit/926b507fa5c3192b1b68fab5910cbd3ba9377c97
+
+From 926b507fa5c3192b1b68fab5910cbd3ba9377c97 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 5 Sep 2024 14:36:02 -0700
+Subject: [PATCH] "Apr", not "April", in IN column
+
+* northamerica (Rule): Use "Apr", not "April", in the IN column.
+Both forms are valid, but "Apr" is more consistent.
+Problem reported by Howard Hinnant.
+--- a/northamerica
++++ b/northamerica
+@@ -2631,7 +2631,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
+ # http://puentelibre.mx/noticia/ciudad_juarez_cambio_horario_noviembre_2022/
+ 
+ # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
+-Rule	Mexico	1931	only	-	April	30	0:00	1:00	D
++Rule	Mexico	1931	only	-	Apr	30	0:00	1:00	D
+ Rule	Mexico	1931	only	-	Oct	1	0:00	0	S
+ Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
+ Rule	Mexico	1939	only	-	Jun	25	0:00	0	S
+
diff --git a/sys-libs/timezone-data/timezone-data-2024b.ebuild b/sys-libs/timezone-data/timezone-data-2024b.ebuild
new file mode 100644
index 000000000000..7e2ceffa21d2
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2024b.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs flag-o-matic unpacker
+
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="https://www.iana.org/time-zones"
+SRC_URI="
+	https://data.iana.org/time-zones/releases/tzdb-${PV}.tar.lz
+"
+S="${WORKDIR}"/tzdb-${PV}
+
+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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="nls leaps-timezone zic-slim"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="
+	${DEPEND}
+	!sys-libs/glibc[vanilla(+)]
+"
+BDEPEND="$(unpacker_src_uri_depends)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-April-short.patch
+)
+
+src_prepare() {
+	default
+
+	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 'int 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() {
+	tc-export AR CC RANLIB
+
+	_emake \
+		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() {
+	# CURL is used for extended/web based tests. Punt on them.
+	emake check CURL=:
+}
+
+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
+}