Version bump #311925 by Rodrigo Severo.

Package-Manager: portage-2.2_rc67/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 24ae14ceebee..39e4d19c35dc 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.227 2010/03/23 20:34:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.228 2010/03/29 18:21:23 vapier Exp $
+
+*timezone-data-2010g (29 Mar 2010)
+
+  29 Mar 2010; Mike Frysinger <vapier@gentoo.org>
+  +timezone-data-2010g.ebuild:
+  Version bump #311925 by Rodrigo Severo.
 
 *timezone-data-2010f (23 Mar 2010)
 
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 802ca0848ea7..2a77692c49d8 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -8,15 +8,17 @@ DIST tzcode2010f.tar.gz 191851 RMD160 b829a2dc015f5f752756e79a6d744e72025754b2 S
 DIST tzdata2010b.tar.gz 187080 RMD160 b466357f47e1fb002d1586b3bf1b41a30e2512b1 SHA1 c456b990d9a3c3874d17197b5c8b5ee57def0463 SHA256 a93208ae389cc0d3618731cc9f406ba2cfc6aac39668a06c687d3fae2a7e8210
 DIST tzdata2010e.tar.gz 187452 RMD160 b1473d8752d8bf25aa72ad055567599c5bc65fc3 SHA1 8668d6cde933470247a42246c7b73124ba403a89 SHA256 09ebe8787560ef0a0b8b27a115d0d79d4b9e4ed9d48e768426c59ad18b73abd6
 DIST tzdata2010f.tar.gz 188147 RMD160 e0ea3c63b934dd16b058ffd275457f2278bd1605 SHA1 dcfb18ed88d00fdbb9e58f7cba190c86332b74f1 SHA256 823361e38da3f79a34c0adb835b1b6d2ae640937e3f7a7f4a2181500eeff0e94
+DIST tzdata2010g.tar.gz 188032 RMD160 4c8d6a70dda66c0f18167a6871b62d6ac8c1b8ba SHA1 7ae3878ae7dc98d905b93970138051653582f24f SHA256 a069dbea2989613466f9f4adb6de381efb46aeb9ff89e03fabb23dcae2c4cd90
 EBUILD timezone-data-2010b.ebuild 3015 RMD160 2fbe1b19127074cae0872e961f628652d7b32e12 SHA1 60d3f400178b690d0292cfa329b8a7f100d70132 SHA256 1722894332834c0b0420c3122eeda075a83c72417feab30fbea2f6feb69cc8d9
 EBUILD timezone-data-2010e.ebuild 3023 RMD160 4a2c682a905b4fb1b78e1332d4b4802da7806e04 SHA1 4742f7cfff7a145b7c9dd84dacf4580e88924524 SHA256 ce72209c6f468f935c2e5a5849a0964705e22895bff4bc8cf9796ccad2ef44e9
 EBUILD timezone-data-2010f.ebuild 3023 RMD160 afe35c8c542f9d3eabd5fa074c5277562fb15c8d SHA1 e783304f09471072ebca86283cc403bd5dc75829 SHA256 e13d44740e33d63fcd9fa26eb93bbe838bc6e1cbedea1f3871c39201879f5623
-MISC ChangeLog 29184 RMD160 3f12b5c3a3dfcb66e70bd2e968a77b96a3445c0d SHA1 3b1305a25949687509cf86dbc89752a54b80d44d SHA256 bd4c6c76863626d931eb83a66e6df90cfbca9bd21ec1ea3e61ef814c9c7c217f
+EBUILD timezone-data-2010g.ebuild 3023 RMD160 d0357a34e4a43907e38fbdfd21c7092ce82e7fbc SHA1 f3d0af508434e2f435d2d6643d6467385e82480b SHA256 d31eea20aaccd70deb6aa59bf48e0f9639a438b1ed63fdf10c6f816ccdc422f7
+MISC ChangeLog 29344 RMD160 b2e4251ca24cab3601673e882dca866a970a4690 SHA1 46550fff29b50adfe70e52f0ba3b946ff1b769e7 SHA256 44d973df998d937ebe0ba53b6177a9377dadc9f706444356fa4e3d0584dcd201
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAkupJdgACgkQTwhj9JtAlp6jsQD/cvwfASiq9c99u+ZV2WrJaDFu
-4oWVWjisovijcDBQNK8A/3wxU9fQeo6Vs7y+IOmoJbekJtjRMTTvuDWlmT7BzP0P
-=0BW4
+iF4EAREIAAYFAkuw76EACgkQTwhj9JtAlp75BAD/aX+6nn3ebZTwYeLC9FrQDjb0
+iwPZKbYBOLJICozHAzEA/0nb1duWBJFbpSEvtsKTp+DUEq/J/uYfc/Alu0RNcVnt
+=tGHV
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/timezone-data-2010g.ebuild b/sys-libs/timezone-data/timezone-data-2010g.ebuild
new file mode 100644
index 000000000000..6dd7e085043b
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2010g.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2010g.ebuild,v 1.1 2010/03/29 18:21:23 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV%g}f
+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="${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
+}