From b1c53fa75eacc4f0970950ad42b65cbb62221acd Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Fri, 22 May 2009 15:45:38 +0000 Subject: add the charset.alias bashrc deletion to 6.2 too --- profiles/default-bsd/ChangeLog | 5 ++++- profiles/default-bsd/fbsd/6.2/profile.bashrc | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'profiles') diff --git a/profiles/default-bsd/ChangeLog b/profiles/default-bsd/ChangeLog index d38e057f63ba..24b8d3250360 100644 --- a/profiles/default-bsd/ChangeLog +++ b/profiles/default-bsd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for profile directory # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/ChangeLog,v 1.61 2009/05/22 14:12:37 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-bsd/ChangeLog,v 1.62 2009/05/22 15:45:37 aballier Exp $ + + 22 May 2009; Alexis Ballier fbsd/6.2/profile.bashrc: + add the charset.alias bashrc deletion to 6.2 too 22 May 2009; Alexis Ballier fbsd/6.2/package.mask: mask freebsd-cddl on 6.2 profiles as its fbsd 7 only diff --git a/profiles/default-bsd/fbsd/6.2/profile.bashrc b/profiles/default-bsd/fbsd/6.2/profile.bashrc index 4c9d5b96abc1..204de4da7374 100644 --- a/profiles/default-bsd/fbsd/6.2/profile.bashrc +++ b/profiles/default-bsd/fbsd/6.2/profile.bashrc @@ -2,3 +2,15 @@ alias make=gmake alias patch=gpatch alias sed=gsed alias awk=gawk + +# Hack to avoid every package that uses libiconv/gettext +# install a charset.alias that will collide with libiconv's one +# See bugs 169678, 195148 and 256129. +# Also the discussion on +# http://archives.gentoo.org/gentoo-dev/msg_8cb1805411f37b4eb168a3e680e531f3.xml +post_src_install() +{ + if [ "${PN}" != "libiconv" -a -e "${D}"/usr/lib*/charset.alias ] ; then + rm -f "${D}"/usr/lib*/charset.alias + fi +} -- cgit v1.2.3-65-gdbad