summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2005-10-23 14:41:23 +0000
committerMichael Januszewski <spock@gentoo.org>2005-10-23 14:41:23 +0000
commit769ab456e2eda7f029d9243675425a57debd3742 (patch)
treeb6e2b81d7055dcb359e9a1b4f9aecc52cd801767 /www-client
parentVersion bump. (diff)
downloadgentoo-2-769ab456e2eda7f029d9243675425a57debd3742.tar.gz
gentoo-2-769ab456e2eda7f029d9243675425a57debd3742.tar.bz2
gentoo-2-769ab456e2eda7f029d9243675425a57debd3742.zip
Modified the ebuild so that /usr/share/locale/locale.alias is never installed by elinks (since it conflicts with glibc).
(Portage version: 1.589-cvs)
Diffstat (limited to 'www-client')
-rw-r--r--www-client/elinks/ChangeLog7
-rw-r--r--www-client/elinks/elinks-0.10.5-r1.ebuild5
2 files changed, 9 insertions, 3 deletions
diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 589433cb1239..4f76c4020909 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-client/elinks
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.23 2005/10/02 14:02:29 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.24 2005/10/23 14:41:23 spock Exp $
+
+ 23 Oct 2005; Michał Januszewski <spock@gentoo.org>
+ elinks-0.10.5-r1.ebuild:
+ Modified the ebuild so that /usr/share/locale/locale.alias is never
+ installed by elinks (since it conflicts with glibc) (bug #109752).
02 Oct 2005; Michał Januszewski <spock@gentoo.org>
elinks-0.10.5-r1.ebuild:
diff --git a/www-client/elinks/elinks-0.10.5-r1.ebuild b/www-client/elinks/elinks-0.10.5-r1.ebuild
index 39f86eb51bd8..4fa8e538b372 100644
--- a/www-client/elinks/elinks-0.10.5-r1.ebuild
+++ b/www-client/elinks/elinks-0.10.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.5-r1.ebuild,v 1.3 2005/10/02 14:02:29 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.10.5-r1.ebuild,v 1.4 2005/10/23 14:41:23 spock Exp $
inherit eutils
@@ -105,8 +105,9 @@ src_install() {
# are more or less the same. -- Fabian Groffen (2005-06-30)
if use ppc-macos; then
rm -f ${D}/usr/lib/charset.alias
- rm -f ${D}/usr/share/locale/locale.alias
fi
+
+ rm -f ${D}/usr/share/locale/locale.alias
}
# Disable it as the only test available is interactive..