Don't install charset.alias to avoid collisions - libc or libiconv will provide it.

Package-Manager: portage-2.1.2.3

diff --git a/sys-devel/m4/ChangeLog b/sys-devel/m4/ChangeLog
index 00777b40f593eac0a967364b4f5765c92abadc6b..8745146556e7b8da95048166932fb1f54768d354 100644 (file)
--- 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/Manifest b/sys-devel/m4/Manifest
index d937ebda29e23fcd01b89afbc77c3d9279e2fdd4..798d69b837ef7d1fc93464b8ac0b0851dd9b1fe5 100644 (file)
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -9,14 +9,14 @@ EBUILD m4-1.4.8.ebuild 904 RMD160 2f0de070ea2b272eae967f7242d583ca3ba22908 SHA1
 MD5 e15d9632e8dfac948afa6fa5e32b23ed m4-1.4.8.ebuild 904
 RMD160 2f0de070ea2b272eae967f7242d583ca3ba22908 m4-1.4.8.ebuild 904
 SHA256 eebefa1409ee77c5e8dea7608dd07279ceac3eb37eb8734b62b996742fbb36a9 m4-1.4.8.ebuild 904
-EBUILD m4-1.4.9.ebuild 917 RMD160 27c7035be5b3d953eeca40d0990e5d13bd36bfb7 SHA1 4924d198b7f1281a5b4ca990465d0e7071fb21f4 SHA256 0402251ed2e9242cfbfebdb5100e8b8e2a0864a05d1a71820c10f9cf744cd45a
-MD5 335066fe1da92cf57e03a7765c625408 m4-1.4.9.ebuild 917
-RMD160 27c7035be5b3d953eeca40d0990e5d13bd36bfb7 m4-1.4.9.ebuild 917
-SHA256 0402251ed2e9242cfbfebdb5100e8b8e2a0864a05d1a71820c10f9cf744cd45a m4-1.4.9.ebuild 917
-MISC ChangeLog 8780 RMD160 8f012bb1702042771eab60fb1973e2ba849f5aae SHA1 ed003532da1a6e8213f7cf5b031f43e99e84e35d SHA256 4b65e1c18197d823fd2a910841f9f00af819a5dbd0a37580a35df262a9f6e54d
-MD5 fff518d6178f25cb5bd2039e54adc0cf ChangeLog 8780
-RMD160 8f012bb1702042771eab60fb1973e2ba849f5aae ChangeLog 8780
-SHA256 4b65e1c18197d823fd2a910841f9f00af819a5dbd0a37580a35df262a9f6e54d ChangeLog 8780
+EBUILD m4-1.4.9.ebuild 1052 RMD160 cb268ede680229f377761451eb4b4da247104b28 SHA1 00fa29002797a969f575da03bbf7fddb38a7c7cf SHA256 a24d750ade6ba3c85adf84436363ac0ab601e98ab20631395c53bbe65b7ab565
+MD5 01f9b88128e11f57151b74404e9496fd m4-1.4.9.ebuild 1052
+RMD160 cb268ede680229f377761451eb4b4da247104b28 m4-1.4.9.ebuild 1052
+SHA256 a24d750ade6ba3c85adf84436363ac0ab601e98ab20631395c53bbe65b7ab565 m4-1.4.9.ebuild 1052
+MISC ChangeLog 8939 RMD160 b4dd0036a71eaa6ce840122a2651838a60a9584b SHA1 7a6df124c844f2513126985e6a4bc5ba95de5f12 SHA256 74ce2eec80e6e01200310cfa05b66d64cfe6ef31f3fe85dba4e14b9d4dd2b4e7
+MD5 0f2ecfd124e9ab1486f76c5150e8096a ChangeLog 8939
+RMD160 b4dd0036a71eaa6ce840122a2651838a60a9584b ChangeLog 8939
+SHA256 74ce2eec80e6e01200310cfa05b66d64cfe6ef31f3fe85dba4e14b9d4dd2b4e7 ChangeLog 8939
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164

diff --git a/sys-devel/m4/m4-1.4.9.ebuild b/sys-devel/m4/m4-1.4.9.ebuild
index a3c0150b858db58784545c65cc245aba44a5a5ea..072c5f7a03170f10107fbfd80aa8e96a7f22786d 100644 (file)
--- 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
 }