vapier 14/06/14 02:40:31 Modified: metadata.xml ChangeLog Added: timezone-data-2014e.ebuild Log: Version bump. Add USE=right_timezone to control install of the "right" timezones. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.3 sys-libs/timezone-data/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/metadata.xml?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/metadata.xml?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/metadata.xml?r1=1.2&r2=1.3 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/metadata.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- metadata.xml 26 Sep 2013 11:17:52 -0000 1.2 +++ metadata.xml 14 Jun 2014 02:40:31 -0000 1.3 @@ -6,4 +6,10 @@ <email>[email protected]</email> <name>Dirkjan Ochtman</name> </maintainer> + <use> + <flag name='right_timezone'> + Install the set of "right" timezones; these timezones include leap seconds + when counting seconds since the epoch (while posix does not) + </flag> + </use> </pkgmetadata> 1.303 sys-libs/timezone-data/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.303&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.303&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.302&r2=1.303 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- ChangeLog 28 May 2014 15:13:39 -0000 1.302 +++ ChangeLog 14 Jun 2014 02:40:31 -0000 1.303 @@ -1,6 +1,13 @@ # ChangeLog for sys-libs/timezone-data # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.302 2014/05/28 15:13:39 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.303 2014/06/14 02:40:31 vapier Exp $ + +*timezone-data-2014e (14 Jun 2014) + + 14 Jun 2014; Mike Frysinger <[email protected]> +timezone-data-2014e.ebuild, + metadata.xml: + Version bump. Add USE=right_timezone to control install of the "right" + timezones. *timezone-data-2014d (28 May 2014) 1.1 sys-libs/timezone-data/timezone-data-2014e.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.1&content-type=text/plain Index: timezone-data-2014e.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.1 2014/06/14 02:40:31 vapier Exp $ EAPI="4" 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 ftp://munnari.oz.au/pub/oldtz/tzdata${data_ver}.tar.gz ftp://munnari.oz.au/pub/oldtz/tzcode${data_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 right_timezone elibc_FreeBSD elibc_glibc" RDEPEND="!<sys-libs/glibc-2.3.5" S=${WORKDIR} pkg_setup() { # Deal with the case where older timezone-data installed a # dir here, but newer one installs symlinks. Portage will # barf when you try to transition file types. if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then if [[ -d posix ]] ; then rm -rf .gentoo-upgrade #487192 mv posix .gentoo-upgrade || die ln -s .gentoo-upgrade posix || die fi fi } src_prepare() { epatch "${FILESDIR}"/${PN}-2013h-makefile.patch tc-is-cross-compiler && cp -pR "${S}" "${S}"-native } _emake() { emake \ TOPDIR="${EPREFIX}/usr" \ REDO=$(usex right_timezone posix_right posix_only) \ "$@" } src_compile() { local LDLIBS tc-export CC if use elibc_FreeBSD || use elibc_Darwin ; then append-cppflags -DSTD_INSPIRED #138251 fi export NLS=$(usex nls 1 0) if use nls && ! use elibc_glibc ; then LDLIBS+=" -lintl" #154181 fi # TOPDIR is used in some utils when compiling. _emake \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ RANLIB="$(tc-getRANLIB)" \ CFLAGS="${CPPFLAGS} ${CFLAGS} -std=gnu99" \ LDFLAGS="${LDFLAGS}" \ LDLIBS="${LDLIBS}" if tc-is-cross-compiler ; then _emake -C "${S}"-native \ CC="$(tc-getBUILD_CC)" \ CFLAGS="${BUILD_CFLAGS}" \ LDFLAGS="${BUILD_LDFLAGS}" \ LDLIBS="${LDLIBS}" \ zic fi } src_install() { local zic="" tc-is-cross-compiler && zic="zic=${S}-native/zic" _emake install ${zic} DESTDIR="${ED}" dodoc README Theory dohtml *.htm # install the symlink by hand to not break existing timezones if ! use right_timezone && [[ ! -e ${ED}/usr/share/zoneinfo/posix ]] ; then dosym . /usr/share/zoneinfo/posix fi } 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} ]] } pkg_preinst() { local tz=$(get_TIMEZONE) if ! use right_timezone && [[ ${tz} == right/* ]] ; then eerror "Your timezone is set to '${tz}' but you have USE=-right_timezone." die "Please fix your USE or timezone" 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" tz=$(get_TIMEZONE) || return 0 if [[ ${tz} == "FOOKABLOIE" ]] ; then elog "You do not have TIMEZONE set in ${src}." if [[ ! -e ${etc_lt} ]] ; then # if /etc/localtime is a symlink somewhere, assume they # know what they're doing and they're managing it themselves if [[ ! -L ${etc_lt} ]] ; then cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" elog "Setting ${etc_lt} to Factory." else elog "Assuming your ${etc_lt} symlink is what you want; skipping update." fi 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}" [[ -L ${etc_lt} ]] && rm -f "${etc_lt}" cp -f "${EROOT}"/usr/share/zoneinfo/"${tz}" "${etc_lt}" } pkg_postinst() { rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & pkg_config wait }
