[gentoo-commits] gentoo-x86 commit in profiles/default/bsd/fbsd: profile.bashrc

[Javier Villavicencio (the_paya)]

the_paya    09/01/24 21:58:18

  Modified:             profile.bashrc
  Log:
  Fix for the charset.alias collisions, bugs 169678, 195148 and 256129

Revision  Changes    Path
1.2                  profiles/default/bsd/fbsd/profile.bashrc

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/default/bsd/fbsd/profile.bashrc?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/default/bsd/fbsd/profile.bashrc?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/default/bsd/fbsd/profile.bashrc?r1=1.1&r2=1.2

Index: profile.bashrc
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/profile.bashrc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- profile.bashrc	24 Jan 2009 08:10:24 -0000	1.1
+++ profile.bashrc	24 Jan 2009 21:58:18 -0000	1.2
@@ -1,4 +1,20 @@
+#!/bin/bash
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/bsd/fbsd/profile.bashrc,v 1.2 2009/01/24 21:58:18 the_paya Exp $
+
 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" && -e "${D}"/usr/lib/charset.alias ]] ; then
+		rm -f "${D}"/usr/lib/charset.alias
+	fi
+}