commit: e8a1eecc6c89a3cc9d3b86bfd736276005dc4541
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 6 20:15:36 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 6 20:16:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a1eecc
sys-libs/timezone-data: drop old
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-libs/timezone-data/Manifest | 2 -
.../timezone-data/timezone-data-2018g-r1.ebuild | 173 ---------------------
2 files changed, 175 deletions(-)
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index de0c3bbd85a..50bea910eb0 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,4 +1,2 @@
-DIST tzcode2018g.tar.gz 241541 BLAKE2B
08525661ee6ca0c65c3b2619cc044a79d3b25ff557b9995dac039372eea24d041318ed6927726fb1bdf89991b2fa8a77c792e03e14fc510d06409c0dfc73df95
SHA512
58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484
DIST tzcode2018i.tar.gz 242962 BLAKE2B
682a23c324b6d8e1a0d63c6140c82ca3a24017c0972e7f915ecad5e0838f8f57743ffa2c5d9cc9744739a0e7d791ddb21947618cd11635767800ac99307c9548
SHA512
1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d
-DIST tzdata2018g.tar.gz 366408 BLAKE2B
cc1158d35bd398f32741b1ace03a7cd0adb3a94670ea08a7566051901e58692891a3661afdbc71a487f777ecfab72572017476a7a73cdc966bd3c34751eb629e
SHA512
92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa
DIST tzdata2018i.tar.gz 377009 BLAKE2B
fa28fdac145756368d4760c418742efd558e63fd9900fc4649971b683b162df5e566c6214a79ec46b48fc65af488a7e0e95ddb6176a4f9adb5b39bc634426143
SHA512
6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a
diff --git a/sys-libs/timezone-data/timezone-data-2018g-r1.ebuild
b/sys-libs/timezone-data/timezone-data-2018g-r1.ebuild
deleted file mode 100644
index fa1396ab59a..00000000000
--- a/sys-libs/timezone-data/timezone-data-2018g-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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
http://www.twinsun.com/tz/tz-link.htm";
-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 s390 sh sparc
x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~x64-solaris"
-IUSE="nls leaps_timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- !sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
- default
- tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
- tc-export CC
-
- append-lfs-flags #471102
-
- if use elibc_FreeBSD || use elibc_Darwin ; then
- append-cppflags -DSTD_INSPIRED #138251
- fi
-
- append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
- 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) \
- TZDATA_TEXT= \
- 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 -j1 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 ${etc_lt} file is what you want;
skipping update."
- return 0
- fi
- if [[ ${tz} == "FOOKABLOIE" ]] ; then
- elog "You do not have TIMEZONE set in ${src}."
-
- if [[ ! -e ${etc_lt} ]] ; then
- cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}"
- elog "Setting ${etc_lt} to Factory."
- else
- elog "Skipping auto-update of ${etc_lt}."
- fi
- return 0
- fi
-
- if [[ ! -e ${EROOT}/usr/share/zoneinfo/${tz} ]] ; then
- elog "You have an invalid TIMEZONE setting in ${src}"
- elog "Your ${etc_lt} has been reset to Factory; enjoy!"
- tz="Factory"
- fi
- einfo "Updating ${etc_lt} with ${EROOT}usr/share/zoneinfo/${tz}"
- cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}"
-}
-
-pkg_config() {
- configure_tz_data
-}
-
-pkg_postinst() {
- configure_tz_data
-}
