Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libfm: libfm-9999.ebuild ChangeLog
Date: Thu, 01 Nov 2012 21:24:04
Message-Id: 20121101212346.CF96D21600@flycatcher.gentoo.org
1 hwoarang 12/11/01 21:23:46
2
3 Modified: libfm-9999.ebuild ChangeLog
4 Log:
5 Fix the libfm symlink mess. Thanks to Zac Medico <zmedico@g.o>. Bug #439570
6
7 (Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
8
9 Revision Changes Path
10 1.28 x11-libs/libfm/libfm-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.28&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.28&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?r1=1.27&r2=1.28
15
16 Index: libfm-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v
19 retrieving revision 1.27
20 retrieving revision 1.28
21 diff -u -r1.27 -r1.28
22 --- libfm-9999.ebuild 27 Sep 2012 21:04:34 -0000 1.27
23 +++ libfm-9999.ebuild 1 Nov 2012 21:23:46 -0000 1.28
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.27 2012/09/27 21:04:34 hwoarang Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.28 2012/11/01 21:23:46 hwoarang Exp $
29
30 EAPI=4
31
32 @@ -71,6 +71,20 @@
33 src_install() {
34 default
35 find "${D}" -name '*.la' -exec rm -f '{}' +
36 + # Remove symlink #439570
37 + if [[ -h ${D}/usr/include/${PN} ]]; then
38 + rm "${D}"/usr/include/${PN}
39 + fi
40 +}
41 +
42 +pkg_preinst() {
43 + # Resolve the symlink mess. Bug #439570
44 + [[ -d "${ROOT}"/usr/include/${PN} ]] && \
45 + rm -rf "${ROOT}"/usr/include/${PN}
46 + if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
47 + cd ${D}/usr/include
48 + ln -s ${PN}-1.0 ${PN}
49 + fi
50 }
51
52 pkg_postinst() {
53
54
55
56 1.77 x11-libs/libfm/ChangeLog
57
58 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.77&view=markup
59 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.77&content-type=text/plain
60 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?r1=1.76&r2=1.77
61
62 Index: ChangeLog
63 ===================================================================
64 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v
65 retrieving revision 1.76
66 retrieving revision 1.77
67 diff -u -r1.76 -r1.77
68 --- ChangeLog 27 Sep 2012 21:04:34 -0000 1.76
69 +++ ChangeLog 1 Nov 2012 21:23:46 -0000 1.77
70 @@ -1,6 +1,10 @@
71 # ChangeLog for x11-libs/libfm
72 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
73 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.76 2012/09/27 21:04:34 hwoarang Exp $
74 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.77 2012/11/01 21:23:46 hwoarang Exp $
75 +
76 + 01 Nov 2012; Markos Chandras <hwoarang@g.o> libfm-9999.ebuild:
77 + Fix the libfm symlink mess. Thanks to Zac Medico <zmedico@g.o>. Bug
78 + #439570
79
80 27 Sep 2012; Markos Chandras <hwoarang@g.o> libfm-9999.ebuild:
81 Remove the autom4te.cache file after running eautoreconf. Bug #436058