diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-10-10 15:30:13 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-10 15:30:13 +0000 |
commit | efa0abc2a6ac3e8fb7689aade116aa81952c7776 (patch) | |
tree | fb44b51290ee4b7ec28910a689b00d9e613829ac /sys-libs | |
parent | Fixed PaX issue, bug #352640. The patch was submitted by Lubomir Krajcovic. (diff) | |
download | historical-efa0abc2a6ac3e8fb7689aade116aa81952c7776.tar.gz historical-efa0abc2a6ac3e8fb7689aade116aa81952c7776.tar.bz2 historical-efa0abc2a6ac3e8fb7689aade116aa81952c7776.zip |
Version bump.
Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/timezone-data/ChangeLog | 7 | ||||
-rw-r--r-- | sys-libs/timezone-data/Manifest | 10 | ||||
-rw-r--r-- | sys-libs/timezone-data/timezone-data-2011l.ebuild | 108 |
3 files changed, 120 insertions, 5 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog index a127412e12d1..07a4fa5e1f90 100644 --- a/sys-libs/timezone-data/ChangeLog +++ b/sys-libs/timezone-data/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/timezone-data # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.256 2011/10/07 15:23:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.257 2011/10/10 15:30:13 vapier Exp $ + +*timezone-data-2011l (10 Oct 2011) + + 10 Oct 2011; Mike Frysinger <vapier@gentoo.org> +timezone-data-2011l.ebuild: + Version bump. 07 Oct 2011; Mike Frysinger <vapier@gentoo.org> timezone-data-2011k.ebuild: Add new listinfo/ftp mirrors. diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index 3a2f9e04a5dd..8a9908df59f4 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -13,6 +13,7 @@ DIST tzdata2011h.tar.gz 196441 RMD160 7a78e9f9537340bdfb0fff1ce62f837722e39624 S DIST tzdata2011i.tar.gz 198665 RMD160 ee4a4e5db40ae4a2824a65b6658d920c6dc1546d SHA1 8274c0a5dfc41c7ab9ccfc919387b3c8180cd75d SHA256 f8dde7ca5e61f21ac34c8cdbef5568d00c829981211098f059d8104964c81ffa DIST tzdata2011j.tar.gz 198820 RMD160 8fe8e80d62fb4392197b7bd01b30e52398703de8 SHA1 f0be74619b61a7a000116c33022a9256bbda4e53 SHA256 7e8540a85f1b474df1b40b403bea5748311ca7731b3038e51d6abc7f2d223c2a DIST tzdata2011k.tar.gz 199725 RMD160 6e0061348316d47b987f838f106709b45a281959 SHA1 56f0847a10eaea672be19984b4b403e29631c98b SHA256 51f7d2a42b7fb9465feced642a6676afdf8b04a071e55f3fef1f0925bd67ef21 +DIST tzdata2011l.tar.gz 203374 RMD160 b933711b06246c9d452d846a193b53295a966287 SHA1 c6740ec9645b78750e2109b6d42cd283e16988d7 SHA256 cb9fec68a19c9c3b900bb71f3ca20d0051a863f765387b52fc2d144a5bbb0c7d EBUILD timezone-data-2011d.ebuild 3017 RMD160 a04132eb2e56ab0bed99e394efd786f0dae3ebe7 SHA1 1967fbeccb87a25c5a6573c7bd95d92ffc5be544 SHA256 a4218e393ee9c1f2a8dd318710c7fc673d22ab6ac21c3223299b59e98e0828c8 EBUILD timezone-data-2011e.ebuild 3017 RMD160 03c07f4da81d4cb1fd00099706d563b6f379a064 SHA1 06786e7a335dde08e3fcf154584b90caa4b8ecda SHA256 72efde75c7024c2e385c4ddf22d56af260220dba8461f2a85ead7334c8856117 EBUILD timezone-data-2011g.ebuild 3029 RMD160 fd707f92b634e8f5dc424e9dba6790dd533a2209 SHA1 b658dd476680f7ad105f6ff23e11b33c830b3d29 SHA256 5bca62397ec4cd6d39fe1b5c894d28649e64e646bb07c0771ee7644b917ce6e8 @@ -20,12 +21,13 @@ EBUILD timezone-data-2011h.ebuild 3020 RMD160 9846949c9a176202dc7695cc08d70dee81 EBUILD timezone-data-2011i.ebuild 3023 RMD160 6ff5ed86d6abef3934224027e098d8296a6cfad4 SHA1 269080892d8d03e72fff2389736ecde578d05d1c SHA256 16a36db8e675249f7c4338c571fc85510c929c34ce447bb3b495a32763bee48d EBUILD timezone-data-2011j.ebuild 3026 RMD160 b642feff94fa048fbeac5503481768afa6361590 SHA1 9d10588d4bcdc3f5d390030894cf6a3dc6168164 SHA256 b5188135682c27c3fc44339cfd7593af501f2b0996acb467ca2d7f5adc5b26bf EBUILD timezone-data-2011k.ebuild 3167 RMD160 58fb3d43835a1547c50e891ad19d10c07080e384 SHA1 d78e0597a0758890ab16b096aebd6d55850b8d6f SHA256 0f7d6d1cc42c88ca8356b3aee9beccb39c596af30db301cc6a31e00a33b2e2ec -MISC ChangeLog 33376 RMD160 37cbb8303d3a479d16807abb780400cce316f0b0 SHA1 efb42103f67c4600ce6f28654c610152de9d7156 SHA256 cf0f73e8e6922dfebe85a9a36ffcfd173be0f79eeb3c31bd67ab78a4d99246ad +EBUILD timezone-data-2011l.ebuild 3167 RMD160 325244dcd11ddd054116891c8b80ddd4b1534ec0 SHA1 03ae4409f28781b6805d3c51485cbf511f0b99cd SHA256 7c7c65f9495a2f0cb6e600d93d995f13695ee076c81600caa2e2fbf8cfee85aa +MISC ChangeLog 33508 RMD160 e968c2869844e2190b7a1e44a1ce7a339124ed10 SHA1 225dc81b8e7644bffe49e4e85315adcd018d349c SHA256 ba6a0d6995e0d35459f455917a5f8c90ba0bdacf2a2e7e85d0499ad213e29359 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6PGXYACgkQaC/OocHi7JYTlwD+I4qR5ODrWOkQZNvdk6ZQhns2 -DSuwG/LRPYB78VyhgBkBAI9mpPZAxj/Gmd7EImR5v0hVJJ3wwGWnHdNKLN/3FLDl -=/+Tx +iF4EAREIAAYFAk6TD4sACgkQaC/OocHi7Jah0QD+Jlbje0rT1KEUxPAxxuTu09sg +Tk/M4aASEmSf+nIysWEBAJLGyDZo/bc3hoDWVWWqfHolbPsughjF8l7HM7HwG+ut +=VKvY -----END PGP SIGNATURE----- diff --git a/sys-libs/timezone-data/timezone-data-2011l.ebuild b/sys-libs/timezone-data/timezone-data-2011l.ebuild new file mode 100644 index 000000000000..31e2783fc725 --- /dev/null +++ b/sys-libs/timezone-data/timezone-data-2011l.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2011l.ebuild,v 1.1 2011/10/10 15:30:13 vapier Exp $ + +inherit eutils toolchain-funcs flag-o-matic + +code_ver=${PV%l}i +data_ver=${PV} +DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" +HOMEPAGE="http://www.twinsun.com/tz/tz-link.htm https://mm.icann.org/mailman/listinfo/tz" +SRC_URI="ftp://elsie.nci.nih.gov/pub/tzdata${data_ver}.tar.gz + ftp://munnari.oz.au/pub/tzdata${data_ver}.tar.gz + ftp://elsie.nci.nih.gov/pub/tzcode${code_ver}.tar.gz + ftp://munnari.oz.au/pub/tzcode${code_ver}.tar.gz + mirror://gentoo/tzdata${data_ver}.tar.gz + mirror://gentoo/tzcode${code_ver}.tar.gz" + +LICENSE="BSD public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="nls elibc_FreeBSD elibc_glibc" + +RDEPEND="!<sys-libs/glibc-2.3.5" + +S=${WORKDIR} + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}"/${PN}-2008h-makefile.patch + tc-is-cross-compiler && cp -pR "${S}" "${S}"-native +} + +src_compile() { + local LDLIBS + tc-export CC + use elibc_FreeBSD && append-flags -DSTD_INSPIRED #138251 + if use nls ; then + use elibc_glibc || LDLIBS="${LDLIBS} -lintl" #154181 + export NLS=1 + else + export NLS=0 + fi + # Makefile uses LBLIBS for the libs (which defaults to LDFLAGS) + # But it also uses LFLAGS where it expects the real LDFLAGS + emake \ + LDLIBS="${LDLIBS}" \ + || die "emake failed" + if tc-is-cross-compiler ; then + emake -C "${S}"-native \ + CC=$(tc-getBUILD_CC) \ + CFLAGS="${BUILD_CFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + LDLIBS="${LDLIBS}" \ + zic || die + fi +} + +src_install() { + local zic="" + tc-is-cross-compiler && zic="zic=${S}-native/zic" + emake install ${zic} DESTDIR="${D}" || die + rm -rf "${D}"/usr/share/zoneinfo-leaps + dodoc README Theory + dohtml *.htm +} + +pkg_config() { + # make sure the /etc/localtime file does not get stale #127899 + local tz src + + if has_version '<sys-apps/baselayout-2' ; then + src="${ROOT}etc/conf.d/clock" + tz=$(unset TIMEZONE ; source "${src}" ; echo ${TIMEZONE-FOOKABLOIE}) + else + src="${ROOT}etc/timezone" + if [[ -e ${src} ]] ; then + tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") + else + tz="FOOKABLOIE" + fi + fi + [[ -z ${tz} ]] && return 0 + + if [[ ${tz} == "FOOKABLOIE" ]] ; then + elog "You do not have TIMEZONE set in ${src}." + + if [[ ! -e ${ROOT}/etc/localtime ]] ; then + cp -f "${ROOT}"/usr/share/zoneinfo/Factory "${ROOT}"/etc/localtime + elog "Setting ${ROOT}etc/localtime to Factory." + else + elog "Skipping auto-update of ${ROOT}etc/localtime." + fi + return 0 + fi + + if [[ ! -e ${ROOT}/usr/share/zoneinfo/${tz} ]] ; then + elog "You have an invalid TIMEZONE setting in ${src}" + elog "Your ${ROOT}etc/localtime has been reset to Factory; enjoy!" + tz="Factory" + fi + einfo "Updating ${ROOT}etc/localtime with ${ROOT}usr/share/zoneinfo/${tz}" + [[ -L ${ROOT}/etc/localtime ]] && rm -f "${ROOT}"/etc/localtime + cp -f "${ROOT}"/usr/share/zoneinfo/"${tz}" "${ROOT}"/etc/localtime +} + +pkg_postinst() { + pkg_config +} |