Hi, pytz frequently fails to merge because timezone-data is not up to date in the prefix tree, so I just made the change below to the 2012c version and it merged ok, so I thought I'd just let you know that you can update that on the tree as well, since it's an easy change. Best, --- timezone-data-2012c.ebuild 2012-05-26 09:44:23.000000000 -0500 +++ timezone-data-2012e.ebuild 2012-08-10 16:34:55.000000000 -0500 @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2012c.ebuild,v 1.4 2012/05/16 21:58:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2012e.ebuild,v 1.4 2012/05/16 21:58:46 vapier Exp $ inherit eutils toolchain-funcs flag-o-matic -code_ver=${PV%c}b +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" Reproducible: Always
Created attachment 320928 [details] timezone-data2012e.ebuild
synced, thanks
