diff options
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/m4/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/m4/m4-1.4.9.ebuild | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog index 00777b40f593..8745146556e7 100644 --- a/sys-devel/m4/ChangeLog +++ b/sys-devel/m4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/m4 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.80 2007/04/09 07:09:28 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/ChangeLog,v 1.81 2007/04/12 17:05:38 uberlord Exp $ + + 12 Apr 2007; Roy Marples <uberlord@gentoo.org> m4-1.4.9.ebuild: + Don't install charset.alias to avoid collisions - libc or libiconv will + provide it. 09 Apr 2007; Peter Weller <welp@gentoo.org> m4-1.4.8.ebuild: Stable on amd64 wrt bug 172005 diff --git a/sys-devel/m4/m4-1.4.9.ebuild b/sys-devel/m4/m4-1.4.9.ebuild index a3c0150b858d..072c5f7a0317 100644 --- a/sys-devel/m4/m4-1.4.9.ebuild +++ b/sys-devel/m4/m4-1.4.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.9.ebuild,v 1.2 2007/03/24 07:03:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/m4/m4-1.4.9.ebuild,v 1.3 2007/04/12 17:05:38 uberlord Exp $ DESCRIPTION="GNU macro processor" HOMEPAGE="http://www.gnu.org/software/m4/m4.html" @@ -30,4 +30,7 @@ src_compile() { src_install() { emake install DESTDIR="${D}" || die dodoc BACKLOG ChangeLog NEWS README* THANKS TODO + + # charset.alias should be owned either by libc or libiconv + [ -e "${D}"/usr/lib/charset.alias ] && rm "${D}"/usr/lib/charset.alias } |