Version bump #293404 by Rodrigo Severo.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

3 files changed, 119 insertions, 5 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 8b12af923da0..1b4b0856316b 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.215 2009/11/18 03:50:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.216 2009/11/18 04:01:57 vapier Exp $
+
+*timezone-data-2009s (18 Nov 2009)
+
+  18 Nov 2009; Mike Frysinger <vapier@gentoo.org>
+  +timezone-data-2009s.ebuild:
+  Version bump #293404 by Rodrigo Severo.
 
   18 Nov 2009; Mike Frysinger <vapier@gentoo.org>
   timezone-data-2009p.ebuild:
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index f721a1deeb34..fb7ca4de67f6 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -9,16 +9,18 @@ DIST tzdata2009m.tar.gz 180717 RMD160 c150cc7595add59972fd5d837f2a19ec093a9447 S
 DIST tzdata2009p.tar.gz 182635 RMD160 9f462caa329409a51862cf56e432f8ad6f20bd08 SHA1 2fe3219c9e59b7a6bd161fc340e18e27d3bcb473 SHA256 7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c
 DIST tzdata2009q.tar.gz 183958 RMD160 bc1fecfaaa7fcf56214c64e679acffa045e1bbb2 SHA1 832f6af2d62015bf0e514303913d423c7d849f74 SHA256 5ea1abc8b08dd7f67b53488a497d61f9617ed92d094e508e103049430518a19a
 DIST tzdata2009r.tar.gz 184143 RMD160 82c13a3dd96d51349b174e17bfd718bc2f92c5ab SHA1 7ea0ee6ed935d6d50090ad57da286e85e0362285 SHA256 684d23e3ebe825c9db90732534446f4e33f5ad4455980b15fd9eb2e4ba5a6731
+DIST tzdata2009s.tar.gz 184326 RMD160 3feadcbd8738b5ae1a3d6bba05a2c9644de9a1c1 SHA1 c870aab416411056a62a0ee69552010fc7fa499a SHA256 ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
 EBUILD timezone-data-2009m.ebuild 3016 RMD160 7b8734db360c0ae07625c853938653376dc58398 SHA1 28afea7867cc5e904ad4fcdf932dcb56a258d418 SHA256 e332b577fab622cfc16e2b01bea68caf221930a27a4a1e1ac611edbcfb926bb5
 EBUILD timezone-data-2009p.ebuild 3016 RMD160 afdf9dc17bbe4d2cb865c563ef9fe02a2fa4b8ac SHA1 c8fa94ebae6ec6675fca31e1b37f9ff8a98b8ebe SHA256 4da50cb353ac86582519621f5cc8bf526ffc7e9e4a55d4d305b68c5af25892e3
 EBUILD timezone-data-2009q.ebuild 3024 RMD160 55ca97e00c2cf875feec29cbadadc66070731a9c SHA1 ab9981d8e28eedc936cc75ca45b207a04b71348e SHA256 d0d37fd49c9b7920fbe59452f0a5921a6f8de90d8b89d2b944a7273eaa6d3cb0
 EBUILD timezone-data-2009r.ebuild 3024 RMD160 8a3a54e0126bd2c37314520a47e7b398c4a295d5 SHA1 266050d6a008fddce7f3ff271d84568f41dd9bde SHA256 094880d4264d5ef809009a0a9dd9bfcc962a9c70d6fe3e6f40d1704812cb0315
-MISC ChangeLog 27294 RMD160 477e88c04359ea0a0ae17ce75eceee55e41e89de SHA1 6a0c2c833fb284f901797f781315dd50c1bfee1e SHA256 db5de668e15efbfb13f1e764371a49eacf02e0b1a23eef782f2aa369def86d33
+EBUILD timezone-data-2009s.ebuild 3027 RMD160 d422f842ef4c12d94311fae306254801231c099d SHA1 5e0991d5d9e466f0eca2429b86c618ffae02f761 SHA256 6a8e025621b226651a2cfaac946f1566de490a26883718796b7655ff8ba9da09
+MISC ChangeLog 27454 RMD160 7a8d0747c98e9a830207b0781986b833d129f5a3 SHA1 2b9d6224f9898dcbb8d1b803b3019d9093eb8109 SHA256 6aa2731def0f8629479135ec1f277590d94e274b5c2391343cdc800721a2957a
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksDb8kACgkQlPl3HsVfCDqSGgCdFmPz3OOQhLdksM78zm7r/J+Y
-SAkAoIEUV16JGbDj7FLSiLmPBzzGltV3
-=n0A0
+iEYEARECAAYFAksDcnIACgkQlPl3HsVfCDq4BwCfROqAej61cKQzIJ6NHdVt6244
+R6oAn2MWCMckc/2exdQEYG4/bsrGGuQV
+=x8bJ
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2009s.ebuild b/sys-libs/timezone-data/timezone-data-2009s.ebuild
new file mode 100644
index 000000000000..97f64333909f
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2009s.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2009s.ebuild,v 1.1 2009/11/18 04:01:57 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV%s}r
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
+HOMEPAGE="ftp://elsie.nci.nih.gov/pub/"
+SRC_URI="ftp://elsie.nci.nih.gov/pub/tzdata${data_ver}.tar.gz
+	ftp://elsie.nci.nih.gov/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 *.jpg
+}
+
+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="/etc/conf.d/clock"
+		tz=$(unset TIMEZONE ; source "${ROOT}"/etc/conf.d/clock ; echo ${TIMEZONE-FOOKABLOIE})
+	else
+		src="/etc/timezone"
+		if [[ -e ${ROOT}/etc/timezone ]] ; then
+			tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${ROOT}"/etc/timezone)
+		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 /etc/localtime to Factory."
+		else
+			elog "Skipping auto-update of /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 /etc/localtime has been reset to Factory; enjoy!"
+		tz="Factory"
+	fi
+	einfo "Updating /etc/localtime with /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
+}