From 11ca013cf72a70c6d7584c57cabbede65fedb588 Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Sun, 23 Oct 2005 14:41:23 +0000 Subject: [PATCH] Modified the ebuild so that /usr/share/locale/locale.alias is never installed by elinks (since it conflicts with glibc). Package-Manager: portage-1.589-cvs --- www-client/elinks/ChangeLog | 7 ++++++- www-client/elinks/Manifest | 10 +++++----- www-client/elinks/elinks-0.10.5-r1.ebuild | 5 +++-- 3 files changed, 14 insertions(+), 8 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 + 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 elinks-0.10.5-r1.ebuild: diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest index fccfb01075f8..b1a5e5bfc819 100644 --- a/www-client/elinks/Manifest +++ b/www-client/elinks/Manifest @@ -4,8 +4,8 @@ Hash: SHA1 MD5 cc608dd1c0f7b525296b4830621c796f elinks-0.10.3.ebuild 3186 MD5 166bcca8eca86c5303b39043887e950b elinks-0.10.5.ebuild 3530 MD5 6ea6b66b701a92460771bc83faf03885 elinks-0.10.2.ebuild 3186 -MD5 ce7939ec14c168b858a578c769b79682 elinks-0.10.5-r1.ebuild 4097 -MD5 872bc4ad2dff595b0ac56ab856b7783b ChangeLog 10503 +MD5 14f92ff0f29901c3703bb6e8015cb5ba elinks-0.10.5-r1.ebuild 4097 +MD5 cf689ff00e0f7be81b6caf24db970fea ChangeLog 10724 MD5 ce907c96ecafd726a064b6f2b4a466de elinks-0.10.4.ebuild 3192 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255 MD5 db4038d1a62b31535db38c97c40928d8 files/digest-elinks-0.10.5-r1 132 @@ -17,7 +17,7 @@ MD5 db4038d1a62b31535db38c97c40928d8 files/digest-elinks-0.10.5 132 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDP+iTchej4aZK9/cRAtAJAJ90XYJ1QTJ1AdtxRxprkp0Hx077UQCfdyrc -QI64FMk2HNGDcr1jqtbs494= -=gMFx +iD8DBQFDW6Euchej4aZK9/cRAvx4AJ9mfDwVmbgUGAtnozRbAmF18bhY8gCdGQ37 +qySNuH+0wAq+Uk/Lj17Ttxk= +=3iVa -----END PGP SIGNATURE----- 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.. -- 2.26.2