* [gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data: timezone-data-2014i-r1.ebuild ChangeLog
@ 2014-10-26 3:19 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2014-10-26 3:19 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/26 03:19:56
Modified: ChangeLog
Added: timezone-data-2014i-r1.ebuild
Log:
Fix CPPFLAGS usage #526790 by Victor.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.315 sys-libs/timezone-data/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.315&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.315&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.314&r2=1.315
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- ChangeLog 22 Oct 2014 23:38:37 -0000 1.314
+++ ChangeLog 26 Oct 2014 03:19:56 -0000 1.315
@@ -1,6 +1,12 @@
# 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.314 2014/10/22 23:38:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.315 2014/10/26 03:19:56 vapier Exp $
+
+*timezone-data-2014i-r1 (26 Oct 2014)
+
+ 26 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+ +timezone-data-2014i-r1.ebuild, files/timezone-data-2014h-makefile.patch:
+ Fix CPPFLAGS usage #526790 by Victor.
*timezone-data-2014i (22 Oct 2014)
1.1 sys-libs/timezone-data/timezone-data-2014i-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014i-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014i-r1.ebuild?rev=1.1&content-type=text/plain
Index: timezone-data-2014i-r1.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-2014i-r1.ebuild,v 1.1 2014/10/26 03:19:56 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"
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[vanilla(+)]"
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
# In case of a failed upgrade, clean up the symlinks #506570
if [ -L .gentoo-upgrade ] ; then
rm -rf posix .gentoo-upgrade
fi
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}-2014h-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="${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
# 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} ]] && return 1 || echo "${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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-10-26 3:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-26 3:19 [gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data: timezone-data-2014i-r1.ebuild ChangeLog Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox