[gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/

["Sam James" <sam@gentoo.org>]

commit:     c4c2b19a0dd9f077a94f92cd7e4c60b47390520f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 08:17:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 08:20:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4c2b19a

sys-libs/timezone-data: drop 2021a-r1, 2022b

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-libs/timezone-data/Manifest                    |   4 -
 .../timezone-data/timezone-data-2021a-r1.ebuild    | 196 ---------------------
 sys-libs/timezone-data/timezone-data-2022b.ebuild  | 196 ---------------------
 3 files changed, 396 deletions(-)

diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index d10b50fc9242..65941e002ac5 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,10 +1,6 @@
-DIST tzcode2021a.tar.gz 262204 BLAKE2B 4072685f2344602ffcfe32a7bf92d3b0d93e38ffca842f1c07a60db5e26f1f18ab32fc7b5f155b0bdab49f8d0bfcd5b58f4a192b4d06d7d9639893e5cb596328 SHA512 bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45
 DIST tzcode2021e.tar.gz 273644 BLAKE2B 3331477d8107fb30b2c37d3a3afb212dda7ecf53aa553ea5070537bd1a4a01bf62e70adb2fb14c025e22d272d96ee51e9e5089c5c9790682d3c43cda0ded8680 SHA512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
 DIST tzcode2022a.tar.gz 275632 BLAKE2B f9b3bb5eedc51896c2a1dd77fe8118518c8a1f35152325fa6c4163e11dd34aeb0c88b16b17a27ad022feb2f6818996ec0e40e06a7e1edd454187f586c3739070 SHA512 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed
-DIST tzcode2022b.tar.gz 279432 BLAKE2B f4fdb5ded5186e536849b1da9768dcdb389a2b9f6530070388cea9eca17d9db02198a25f1310d9a50ba5f8a53270d3336f9b2cf803666edb2dac20333d57ed8f SHA512 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79
 DIST tzcode2022c.tar.gz 280190 BLAKE2B 4c66b84da8b1e535b92f8be8f0a1fa32f3b050f3e7676370e3094b5098e7670455e506160f364c61cfba1a919b769da8864a5347f240107c750c723fcc5caa2f SHA512 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06
-DIST tzdata2021a.tar.gz 411892 BLAKE2B b8d177e90e22bd8a3fd23c9a9c19896cb245efd8e768b59ab8c63e56ab141e67331f3231e3a7c802f844375049cfd902e14e912ce677b3aea38fc0d968905e87 SHA512 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
 DIST tzdata2021e.tar.gz 422509 BLAKE2B e0e1189a1bbfb2ee641b9c4c8d00775372638d46d7aea72ff0c4bcb02b38a65eedaf89e6b272e054245c940369a50c2573e6fc720414e4ab3d45adeda8ed9c75 SHA512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119
 DIST tzdata2022a.tar.gz 425833 BLAKE2B 0af5b785a6f5d871b017237ad58d3d9bedd0de38cf18ac51b32cd8df9811215af7af913d8cd3966de695ce65df3f49f52e239196e93b953094763814cc56ecd0 SHA512 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
-DIST tzdata2022b.tar.gz 432594 BLAKE2B 23732f1c753efeca97bb9d6ed8d487a56c735943cb1062a77a1a76faf0109f86238ef9b0ec9ec92b8bdf1da10435f2c39e1465a7fefe74eab8de730214920249 SHA512 a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1
 DIST tzdata2022c.tar.gz 432721 BLAKE2B 087a0e728c6052f91142ef11ad2092e573de99d787ed1e8ff62476b870ff2e3d222a19df01ad624cf06e543aa7e40df89dcd888b9e5fd12f8b5af90bdffc9ac9 SHA512 e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b

diff --git a/sys-libs/timezone-data/timezone-data-2021a-r1.ebuild b/sys-libs/timezone-data/timezone-data-2021a-r1.ebuild
deleted file mode 100644
index 0569f80588bc..000000000000
--- a/sys-libs/timezone-data/timezone-data-2021a-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-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${data_ver}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls leaps-timezone zic-slim"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-src_unpack() {
-	mkdir -p "${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"
-
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	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
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		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
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-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"
-
-	# 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
-		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-2022b.ebuild b/sys-libs/timezone-data/timezone-data-2022b.ebuild
deleted file mode 100644
index f727bbfe8931..000000000000
--- a/sys-libs/timezone-data/timezone-data-2022b.ebuild
+++ /dev/null
@@ -1,196 +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
-
-code_ver=${PV}
-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${data_ver}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls leaps-timezone zic-slim"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-src_unpack() {
-	mkdir -p "${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"
-
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	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
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		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
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-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"
-
-	# 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
-		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
-}