Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/
Date: Tue, 30 Jan 2018 00:51:00
Message-Id: 1517273438.fd2466e64250224ee2f9689fd55a42ed7a0900a2.heroxbd@gentoo
1 commit: fd2466e64250224ee2f9689fd55a42ed7a0900a2
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 30 00:48:27 2018 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 30 00:50:38 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2466e6
7
8 Revert "sys-libs/timezone-data: fix install on prefix systems #645634"
9
10 This reverts commit f9aff1e839de0d9291b0538ce956c5b88cac0a41.
11
12 This is a regression for the fix 3d8012b536f1 by grobian.
13
14 Bug: https://bugs.gentoo.org/645634
15 Suggested-By: Cyril de Vaucleroy
16
17 sys-libs/timezone-data/timezone-data-2018c.ebuild | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20 diff --git a/sys-libs/timezone-data/timezone-data-2018c.ebuild b/sys-libs/timezone-data/timezone-data-2018c.ebuild
21 index e325cd837c9..7f59f932db4 100644
22 --- a/sys-libs/timezone-data/timezone-data-2018c.ebuild
23 +++ b/sys-libs/timezone-data/timezone-data-2018c.ebuild
24 @@ -87,7 +87,7 @@ src_install() {
25 local zic=""
26 tc-is-cross-compiler && zic="zic=${S}-native/zic"
27 _emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
28 - rm -rf "${ED}/nukeit" "${ED}/etc" || die
29 + rm -rf "${D}/nukeit" "${ED}/etc" || die
30 # Delete man pages installed by man-pages package.
31 rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
32 dodoc CONTRIBUTING README NEWS *.html