diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2012-11-01 21:23:46 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2012-11-01 21:23:46 +0000 |
| commit | b4ae7c765e3cb6cb742bdb02a2ac0e8caaa48866 (patch) | |
| tree | 7415968dfb6c35fa4c28278a0ae952659c0e4e9d /x11-libs/libfm | |
| parent | work around jam's AR handling (bug #440828) (diff) | |
| download | gentoo-2-b4ae7c765e3cb6cb742bdb02a2ac0e8caaa48866.tar.gz gentoo-2-b4ae7c765e3cb6cb742bdb02a2ac0e8caaa48866.tar.bz2 gentoo-2-b4ae7c765e3cb6cb742bdb02a2ac0e8caaa48866.zip | |
Fix the libfm symlink mess. Thanks to Zac Medico <zmedico@gentoo.org>. Bug #439570
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Diffstat (limited to 'x11-libs/libfm')
| -rw-r--r-- | x11-libs/libfm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libfm/libfm-9999.ebuild | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/x11-libs/libfm/ChangeLog b/x11-libs/libfm/ChangeLog index 62408d71dbeb..859685f31b60 100644 --- a/x11-libs/libfm/ChangeLog +++ b/x11-libs/libfm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libfm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.76 2012/09/27 21:04:34 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.77 2012/11/01 21:23:46 hwoarang Exp $ + + 01 Nov 2012; Markos Chandras <hwoarang@gentoo.org> libfm-9999.ebuild: + Fix the libfm symlink mess. Thanks to Zac Medico <zmedico@gentoo.org>. Bug + #439570 27 Sep 2012; Markos Chandras <hwoarang@gentoo.org> libfm-9999.ebuild: Remove the autom4te.cache file after running eautoreconf. Bug #436058 diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild index 2ae33cabe17a..bc063a633566 100644 --- a/x11-libs/libfm/libfm-9999.ebuild +++ b/x11-libs/libfm/libfm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.27 2012/09/27 21:04:34 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.28 2012/11/01 21:23:46 hwoarang Exp $ EAPI=4 @@ -71,6 +71,20 @@ src_configure() { src_install() { default find "${D}" -name '*.la' -exec rm -f '{}' + + # Remove symlink #439570 + if [[ -h ${D}/usr/include/${PN} ]]; then + rm "${D}"/usr/include/${PN} + fi +} + +pkg_preinst() { + # Resolve the symlink mess. Bug #439570 + [[ -d "${ROOT}"/usr/include/${PN} ]] && \ + rm -rf "${ROOT}"/usr/include/${PN} + if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then + cd ${D}/usr/include + ln -s ${PN}-1.0 ${PN} + fi } pkg_postinst() { |