summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-10-12 19:21:54 +0000
committerMike Frysinger <vapier@gentoo.org>2013-10-12 19:21:54 +0000
commit7d4a3cf840da1426c622e55606201a4a2cfc7ff3 (patch)
tree3e234b0cc37345d55079d2b64a1d7f5001f04c20 /sys-libs/timezone-data
parentVersion bump; remove old (diff)
downloadgentoo-2-7d4a3cf840da1426c622e55606201a4a2cfc7ff3.tar.gz
gentoo-2-7d4a3cf840da1426c622e55606201a4a2cfc7ff3.tar.bz2
gentoo-2-7d4a3cf840da1426c622e55606201a4a2cfc7ff3.zip
Clear out previous upgrade dir if around #487192 by Alexander.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-libs/timezone-data')
-rw-r--r--sys-libs/timezone-data/ChangeLog6
-rw-r--r--sys-libs/timezone-data/timezone-data-2013f-r1.ebuild3
-rw-r--r--sys-libs/timezone-data/timezone-data-2013g.ebuild3
3 files changed, 9 insertions, 3 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog
index 5fca4af04c17..899a3168072b 100644
--- a/sys-libs/timezone-data/ChangeLog
+++ b/sys-libs/timezone-data/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/timezone-data
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.292 2013/10/02 06:36:24 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.293 2013/10/12 19:21:54 vapier Exp $
+
+ 12 Oct 2013; Mike Frysinger <vapier@gentoo.org> timezone-data-2013f-r1.ebuild,
+ timezone-data-2013g.ebuild:
+ Clear out previous upgrade dir if around #487192 by Alexander.
*timezone-data-2013g (02 Oct 2013)
diff --git a/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild b/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild
index 8068a269f030..1f28be3ce250 100644
--- a/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild,v 1.2 2013/09/30 04:42:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild,v 1.3 2013/10/12 19:21:54 vapier Exp $
EAPI="3"
@@ -30,6 +30,7 @@ pkg_setup() {
# barf when you try to transition file types.
if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
if [[ -d posix ]] ; then
+ rm -rf .gentoo-upgrade #487192
mv posix .gentoo-upgrade || die
ln -s .gentoo-upgrade posix || die
fi
diff --git a/sys-libs/timezone-data/timezone-data-2013g.ebuild b/sys-libs/timezone-data/timezone-data-2013g.ebuild
index 8df940e4e15b..97f4d5ef3cf7 100644
--- a/sys-libs/timezone-data/timezone-data-2013g.ebuild
+++ b/sys-libs/timezone-data/timezone-data-2013g.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013g.ebuild,v 1.1 2013/10/02 06:36:24 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2013g.ebuild,v 1.2 2013/10/12 19:21:54 vapier Exp $
EAPI="3"
@@ -30,6 +30,7 @@ pkg_setup() {
# barf when you try to transition file types.
if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
if [[ -d posix ]] ; then
+ rm -rf .gentoo-upgrade #487192
mv posix .gentoo-upgrade || die
ln -s .gentoo-upgrade posix || die
fi