summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando J. Pereda <ferdy@gentoo.org>2008-06-09 08:07:57 +0000
committerFernando J. Pereda <ferdy@gentoo.org>2008-06-09 08:07:57 +0000
commit451f4ef21db73aa980e164d568f5a49f775a0faf (patch)
tree0622256b58f676408d1d22295239131a101238e3 /app-i18n/man-pages-es
parentFixes build with glibc-2.8, bug #225393, thank Tobias Senner and Jose daLuz f... (diff)
downloadgentoo-2-451f4ef21db73aa980e164d568f5a49f775a0faf.tar.gz
gentoo-2-451f4ef21db73aa980e164d568f5a49f775a0faf.tar.bz2
gentoo-2-451f4ef21db73aa980e164d568f5a49f775a0faf.zip
Remove file collision as per bug #206361
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-i18n/man-pages-es')
-rw-r--r--app-i18n/man-pages-es/ChangeLog8
-rw-r--r--app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild7
2 files changed, 11 insertions, 4 deletions
diff --git a/app-i18n/man-pages-es/ChangeLog b/app-i18n/man-pages-es/ChangeLog
index 79123151ac6e..e8c5133e3708 100644
--- a/app-i18n/man-pages-es/ChangeLog
+++ b/app-i18n/man-pages-es/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/man-pages-es
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-es/ChangeLog,v 1.9 2007/05/13 18:28:40 bangert Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-es/ChangeLog,v 1.10 2008/06/09 08:07:57 ferdy Exp $
+
+ 09 Jun 2008; Fernando J. Pereda <ferdy@gentoo.org>
+ man-pages-es-1.55-r1.ebuild:
+ Remove file collision as per bug #206361
13 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
add <herd>no-herd</herd>
diff --git a/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild b/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild
index ee53acbcbb09..dd6a512e3b9c 100644
--- a/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild
+++ b/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild,v 1.7 2006/11/12 00:31:34 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-es/man-pages-es-1.55-r1.ebuild,v 1.8 2008/06/09 08:07:57 ferdy Exp $
manpagesextra=${PN}-extra-0.8a
S2=${WORKDIR}/${manpagesextra}
@@ -26,6 +26,9 @@ src_install() {
# These are provided by sys-apps/shadow, see bug #154140
rm -f {"${S}","${S2}"}/man{1/{passwd,su,newgrp,login}.1,8/{vigr,vipw}.8}
+ # This one by app-misc/mc, see bug #206361
+ rm -f {"${S}","${S2}"}/man1/mc.1
+
dodoc man?/{LEAME,README}
dodir /usr/share/man/es/man{1,2,3,4,5,6,7,8}