Apply change from Debian for Argentina changes #289345 by Rodrigo Campos.

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

4 files changed, 147 insertions, 2 deletions

diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index b01e567d8d5c..5abbb903e57e 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,13 @@
 # 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.204 2009/10/05 15:33:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.205 2009/10/19 07:31:28 vapier Exp $
+
+*timezone-data-2009n-r1 (19 Oct 2009)
+
+  19 Oct 2009; Mike Frysinger <vapier@gentoo.org>
+  +timezone-data-2009n-r1.ebuild,
+  +files/timezone-data-2009n-argentina.patch:
+  Apply change from Debian for Argentina changes #289345 by Rodrigo Campos.
 
   05 Oct 2009; Raúl Porcel <armin76@gentoo.org> timezone-data-2009m.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #287016
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 1596a20fa914..d18168d1b416 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX timezone-data-2008h-makefile.patch 4037 RMD160 b7b9926ccee050dd18f2c33f2654a0b6dc4d35e0 SHA1 281539ae7f6fd804fc1e7ec9533552fa7fd50d88 SHA256 fc496b869ed6b70c60b0fcdea0a176e31c9405c96e6bf73b5edc26339de66c39
+AUX timezone-data-2009n-argentina.patch 699 RMD160 5f7495ab353b6e549296335390fd7768f91e125c SHA1 2b27366e536c844f0043a69b6c94637243953368 SHA256 3c030b048a08fc5ef84fc2228e6792bb430ec5460e381b4125025e62e42d3f42
 DIST tzcode2009i.tar.gz 190331 RMD160 ce68308f927c4cf408620fe382e581a8d25ff261 SHA1 317cd42bb70368eb255fc8058f035c1fc7690c8c SHA256 738a768e38ccd57f1c31f049731b58d5e1c29f3bf78c9b28086769291963dcfa
 DIST tzcode2009k.tar.gz 190353 RMD160 66147ee62cf9c1d2a8705b038f2be22742e1d5d7 SHA1 91af66846aaec13de2de610433d31151bb890b7d SHA256 2581f4ce19b11e4218ad0b2859679485af1cefe036f52643c8fb20024c8f5d45
 DIST tzdata2009j.tar.gz 179277 RMD160 b431ed85e44ae54f136ba114daf349de011e36dc SHA1 a2ba077b7bb1c3113aadb17a98b26ec46de8c64e SHA256 ab6fb5b3588208ab0cade05dfa8d6ef9516bc719613a0676137e56c336cb7bb7
@@ -10,6 +14,14 @@ EBUILD timezone-data-2009j.ebuild 3016 RMD160 bda8d1b4ad5e651e6d18035f8b1f2d12f3
 EBUILD timezone-data-2009k.ebuild 3024 RMD160 1af7f16185ded0b1e13ca5dc88610536e1573827 SHA1 40b7324dbc1262ea1af5e89979eeb1cb4bb2297e SHA256 0e5eaa419c5dbe56d585b4ab45a80a4b694b9793ee394cad6214046d51c7d456
 EBUILD timezone-data-2009l.ebuild 3028 RMD160 eeb164de4430f4283ca062befc76ebaa733c5425 SHA1 f9aff0fabcf1044738b8b4eafb0462d5eb6bc87d SHA256 9cd795f4269197c9358ce37c12b6c3f729215350a5bee88d72a69ee1cc768ecb
 EBUILD timezone-data-2009m.ebuild 3018 RMD160 130ea8a11fc4a1459fd9848f505366cb20ab9c43 SHA1 b5ee0592a4b0cac20b2602541ccd1b7b93c25453 SHA256 46141d0224ba0c6d1ad442b33201d35080e964b9ef862eb141114898296f3588
+EBUILD timezone-data-2009n-r1.ebuild 3082 RMD160 b776538c941e9010998d1b225c7a873fbb5f2aff SHA1 47d855cc9df2069521753acf4cd0132bd2fd18bf SHA256 b7dd5f1903eae02d54722ff1380b9cac49f6dbb8cb515b99d37f67a59ad9deb0
 EBUILD timezone-data-2009n.ebuild 3028 RMD160 71722ba8c60aea4bf73fc58d7e2cdd881ab2373b SHA1 a5ec9deedd389e711a1fe0034c9d90117d2bd869 SHA256 652bceacc7066c2544144f11df6f1d751ad41782225bd94845be7b1ee05835f0
-MISC ChangeLog 25729 RMD160 a3d39fa2e03c56f84d116303324aef4b1beedac7 SHA1 a2cb6a85545f84ba905732fcc516e5a9d0cba206 SHA256 bc2df8cd7fd40aa23f9faf7c7f868687b382288183aece482bfc59c04306c3d0
+MISC ChangeLog 25974 RMD160 a0a42ee49bae66a101d022d19b084c1c0297c673 SHA1 2ddd671bbad8fff948527fa0a34f16d41eb9d865 SHA256 fde3b6182f281d37f95121ab3967e3d614bb5976ee7a0883f14620d687026db8
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkrcFd0ACgkQlPl3HsVfCDoBzgCfTZkRktmdBkewYN4xOKzzDuhQ
+FToAnj8rkfaRzvII7+Ey9vBWU67DvD3y
+=+AXo
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/timezone-data/files/timezone-data-2009n-argentina.patch b/sys-libs/timezone-data/files/timezone-data-2009n-argentina.patch
new file mode 100644
index 000000000000..60065d82a4a1
--- /dev/null
+++ b/sys-libs/timezone-data/files/timezone-data-2009n-argentina.patch
@@ -0,0 +1,19 @@
+--- tzdata/southamerica
++++ tzdata/southamerica
+@@ -215,9 +215,14 @@
+ # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+ # </a>
+ 
++# Margarita Manterola:
++# Same as always, Argentina's government just decided to change its mind
++# regarding DST, 2 days in advance.
++# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275
++
+ Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
+-Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
+-Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
++Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
++Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
+  
+ # From Mariano Absatz (2004-05-21):
+ # Today it was officially published that the Province of Mendoza is changing
diff --git a/sys-libs/timezone-data/timezone-data-2009n-r1.ebuild b/sys-libs/timezone-data/timezone-data-2009n-r1.ebuild
new file mode 100644
index 000000000000..a9934b671e5b
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2009n-r1.ebuild
@@ -0,0 +1,107 @@
+# 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-2009n-r1.ebuild,v 1.1 2009/10/19 07:31:28 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+code_ver=${PV/n/k}
+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
+	epatch "${FILESDIR}"/${P}-argentina.patch #289345
+	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
+}