public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/, sys-libs/timezone-data/files/
Date: Sun, 27 Nov 2016 03:30:12 +0000 (UTC)	[thread overview]
Message-ID: <1480217349.b2a52fb78a2cb1b9cf318a639b31abf8231c6e02.vapier@gentoo> (raw)

commit:     b2a52fb78a2cb1b9cf318a639b31abf8231c6e02
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 03:29:09 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 03:29:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a52fb7

sys-libs/timezone-data: drop old <2016h versions

 .../files/timezone-data-2016c-makefile.patch       |  81 -----------
 sys-libs/timezone-data/timezone-data-2016e.ebuild  | 157 ---------------------
 sys-libs/timezone-data/timezone-data-2016f.ebuild  | 157 ---------------------
 sys-libs/timezone-data/timezone-data-2016g.ebuild  | 157 ---------------------
 4 files changed, 552 deletions(-)

diff --git a/sys-libs/timezone-data/files/timezone-data-2016c-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2016c-makefile.patch
deleted file mode 100644
index b099e05..00000000
--- a/sys-libs/timezone-data/files/timezone-data-2016c-makefile.patch
+++ /dev/null
@@ -1,81 +0,0 @@
- - Fix up default paths
- - Support env CC
- - Don't build/install libtz.a
- - Don't install man-pages provided by sys-apps/man-pages
- - Move tzselect, zic, and zdump to bin
- - Do not run network based unittests
-
---- a/Makefile
-+++ b/Makefile
-@@ -45,21 +45,21 @@ POSIXRULES=	America/New_York
- 
- # Everything gets put in subdirectories of. . .
- 
--TOPDIR=		/usr/local
-+TOPDIR=		/usr
- 
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
- 
- TZDIR_BASENAME=	zoneinfo
--TZDIR=		$(TOPDIR)/etc/$(TZDIR_BASENAME)
-+TZDIR=		$(TOPDIR)/share/$(TZDIR_BASENAME)
- 
- # Types to try, as an alternative to time_t.  int64_t should be first.
- TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
- 
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
- 
--ETCDIR=		$(TOPDIR)/etc
-+SBINDIR=		$(TOPDIR)/sbin
- 
- # If you "make INSTALL", the "date" command gets installed in. . .
- 
-@@ -67,7 +67,7 @@ BINDIR=		$(TOPDIR)/bin
- 
- # Manual pages go in subdirectories of. . .
- 
--MANDIR=		$(TOPDIR)/man
-+MANDIR=		$(TOPDIR)/share/man
- 
- # Library functions are put in an archive in LIBDIR.
- 
-@@ -298,8 +298,7 @@ GZIPFLAGS=	-9n
- 
- #MAKE=		make
- 
--cc=		cc
--CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
-+CPPFLAGS+=		-DTZDIR=\"$(TZDIR)\"
- 
- AR=		ar
- 
-@@ -352,16 +354,12 @@ ALL:		all date
- install:	all $(DATA) $(REDO) $(MANS)
- 		mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
--			$(DESTDIR)$(LIBDIR) \
-+			$(DESTDIR)$(BINDIR) \
- 			$(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- 			$(DESTDIR)$(MANDIR)/man8
- 		$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
- 		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
--		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-+		cp tzselect zic zdump $(DESTDIR)$(BINDIR)/.
--		cp libtz.a $(DESTDIR)$(LIBDIR)/.
--		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
- 		cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
--		cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
--		cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
- 
- INSTALL:	ALL install date.1
- 		mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-@@ -440,7 +438,7 @@ tzselect:	tzselect.ksh
- 		chmod +x $@
- 
- check:		check_character_set check_white_space check_links check_sorted \
--		  check_tables check_web
-+		  check_tables
- 
- check_character_set: $(ENCHILADA)
- 		LC_ALL=en_US.utf8 && export LC_ALL && \

diff --git a/sys-libs/timezone-data/timezone-data-2016e.ebuild b/sys-libs/timezone-data/timezone-data-2016e.ebuild
deleted file mode 100644
index 73e4b89..00000000
--- a/sys-libs/timezone-data/timezone-data-2016e.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls leaps_timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2016c-makefile.patch
-	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 \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex leaps_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-}
-
-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
-}
-
-pkg_config() {
-	# 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_postinst() {
-	pkg_config
-}

diff --git a/sys-libs/timezone-data/timezone-data-2016f.ebuild b/sys-libs/timezone-data/timezone-data-2016f.ebuild
deleted file mode 100644
index 570028d..00000000
--- a/sys-libs/timezone-data/timezone-data-2016f.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls leaps_timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2016c-makefile.patch
-	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 \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex leaps_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-}
-
-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
-}
-
-pkg_config() {
-	# 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_postinst() {
-	pkg_config
-}

diff --git a/sys-libs/timezone-data/timezone-data-2016g.ebuild b/sys-libs/timezone-data/timezone-data-2016g.ebuild
deleted file mode 100644
index c22100e..00000000
--- a/sys-libs/timezone-data/timezone-data-2016g.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm"
-SRC_URI="http://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	http://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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="nls leaps_timezone elibc_FreeBSD"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2016g-makefile.patch
-	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 \
-		TOPDIR="${EPREFIX}/usr" \
-		REDO=$(usex leaps_timezone posix_right posix_only) \
-		"$@"
-}
-
-src_compile() {
-	# TOPDIR is used in some utils when compiling.
-	_emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			CC="$(tc-getBUILD_CC)" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			CPPFLAGS="${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}"
-	dodoc CONTRIBUTING README NEWS Theory
-	dohtml *.htm
-}
-
-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
-}
-
-pkg_config() {
-	# 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_postinst() {
-	pkg_config
-}


             reply	other threads:[~2016-11-27  3:30 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-27  3:30 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-01-11  8:32 [gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/, sys-libs/timezone-data/files/ Sam James
2022-12-02  3:26 WANG Xuerui
2022-11-07  4:35 Sam James
2018-01-24  6:37 Mike Frysinger
2017-11-05  0:15 Andreas Hüttel
2016-04-12  1:46 Mike Frysinger
2015-08-12  4:24 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480217349.b2a52fb78a2cb1b9cf318a639b31abf8231c6e02.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox