diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-09-30 04:42:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-09-30 04:42:20 +0000 |
| commit | fd25558bf4ec594fda9a4ca7f3fea4e6ec135739 (patch) | |
| tree | 18fff7a3a80a1fbcecf3f76f14f57e6e8263f37e | |
| parent | partial fix for bug 486538 (diff) | |
| download | gentoo-2-fd25558bf4ec594fda9a4ca7f3fea4e6ec135739.tar.gz gentoo-2-fd25558bf4ec594fda9a4ca7f3fea4e6ec135739.tar.bz2 gentoo-2-fd25558bf4ec594fda9a4ca7f3fea4e6ec135739.zip | |
Merge duplicate pkg_postinst funcs #485720#6 by Arfrever Frehtes Taifersar Arahesis.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
| -rw-r--r-- | sys-libs/timezone-data/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/timezone-data/timezone-data-2013f-r1.ebuild | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog index b1ebcb9fb975..70f6949550d4 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.290 2013/09/28 11:01:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.291 2013/09/30 04:42:20 vapier Exp $ + + 30 Sep 2013; Mike Frysinger <vapier@gentoo.org> timezone-data-2013f-r1.ebuild: + Merge duplicate pkg_postinst funcs #485720#6 by Arfrever Frehtes Taifersar + Arahesis. 28 Sep 2013; Mike Frysinger <vapier@gentoo.org> timezone-data-2013d.ebuild: Stabilize for all for real this time. diff --git a/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild b/sys-libs/timezone-data/timezone-data-2013f-r1.ebuild index c44a51995519..8068a269f030 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.1 2013/09/28 10:55:44 vapier Exp $ +# $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 $ EAPI="3" @@ -68,10 +68,6 @@ src_compile() { fi } -pkg_postinst() { - rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade -} - src_install() { local zic="" tc-is-cross-compiler && zic="zic=${S}-native/zic" @@ -126,5 +122,7 @@ pkg_config() { } pkg_postinst() { + rm -rf "${EROOT}"/usr/share/zoneinfo/.gentoo-upgrade & pkg_config + wait } |