fix file collision with glibc, bug #71275

diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog
index 5d68f574fedcc63c5bcafec437e25a13420a89e1..97258386323b4ebb525075e37dff11a5d6988cc5 100644 (file)
--- a/app-misc/mc/ChangeLog
+++ b/app-misc/mc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/mc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.67 2004/11/17 13:48:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.68 2004/11/17 13:50:57 lanius Exp $
+
+  17 Nov 2004; <heino@gentoo.org> mc-4.6.0-r12.ebuild:
+  fix file collision with glibc, bug #71275
 
 *mc-4.6.0-r12 (17 Nov 2004)
 

diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index d018d6fe6fbf4da1fdfbcd9dfb588256687c0689..b30727c8cfe8adb1e236fb49aa7806fdc651d649 100644 (file)
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,6 @@
 MD5 1361bbda69bdfac3c9b39e1d0fb523c8 mc-4.6.0-r11.ebuild 2995
-MD5 aa3370dc31564952f68ff59471167145 mc-4.6.0-r12.ebuild 3041
-MD5 e1f69e938a5e72f3cfe778ae827d251e ChangeLog 10567
+MD5 786b7b9175b23a30be2692bd33388fa3 mc-4.6.0-r12.ebuild 3132
+MD5 ae2504786f7ac5f3e0d748d95246443f ChangeLog 10667
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 b07d2f1ccf2c5b607caaeaa82ad1681e files/mc-4.6.0-key.c.patch 811
 MD5 169bb0ff53b2a9c5271503bbcbccf3df files/mc-4.6.0-find.patch 5798

diff --git a/app-misc/mc/mc-4.6.0-r12.ebuild b/app-misc/mc/mc-4.6.0-r12.ebuild
index 20bc02248764314e471622c98e0364abde844f6c..bd92bee29263654bd241cfa2720e9e9a8977078f 100644 (file)
--- a/app-misc/mc/mc-4.6.0-r12.ebuild
+++ b/app-misc/mc/mc-4.6.0-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r12.ebuild,v 1.1 2004/11/17 13:48:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/mc-4.6.0-r12.ebuild,v 1.2 2004/11/17 13:50:57 lanius Exp $
 
 inherit flag-o-matic eutils
 
@@ -101,6 +101,9 @@ src_install() {
        doins ${FILESDIR}/ebuild.syntax
        cd ${D}/usr/share/mc/syntax
        epatch ${FILESDIR}/${P}-ebuild-syntax.patch
+
+       # http://bugs.gentoo.org/show_bug.cgi?id=71275
+       rm -f ${D}/usr/share/locale/locale.alias
 }
 
 pkg_postinst() {