summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2004-07-19 17:27:15 +0000
committerMamoru Komachi <usata@gentoo.org>2004-07-19 17:27:15 +0000
commit07d446f101e97c1727c14295ad80540c64106bcb (patch)
tree48ed6ad08c05512542a78e826868da9ad2dce7a4 /sys-devel/gettext
parentBump,add metadata (Manifest recommit) (diff)
downloadgentoo-2-07d446f101e97c1727c14295ad80540c64106bcb.tar.gz
gentoo-2-07d446f101e97c1727c14295ad80540c64106bcb.tar.bz2
gentoo-2-07d446f101e97c1727c14295ad80540c64106bcb.zip
Fixed file collision on macos
Diffstat (limited to 'sys-devel/gettext')
-rw-r--r--sys-devel/gettext/ChangeLog5
-rw-r--r--sys-devel/gettext/gettext-0.12.1-r1.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 9f5419b4b7fc..e1d0ab79ffa7 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-devel/gettext
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.46 2004/07/02 08:39:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.47 2004/07/19 17:27:15 usata Exp $
+
+ 20 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.12.1-r1.ebuild:
+ Fixed file collision on macos
02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
gettext-0.12.1-r1.ebuild, gettext-0.12.1.ebuild:
diff --git a/sys-devel/gettext/gettext-0.12.1-r1.ebuild b/sys-devel/gettext/gettext-0.12.1-r1.ebuild
index 9d28923caaef..e41cc26c8824 100644
--- a/sys-devel/gettext/gettext-0.12.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.12.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r1.ebuild,v 1.17 2004/07/15 03:28:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r1.ebuild,v 1.18 2004/07/19 17:27:15 usata Exp $
inherit eutils
@@ -67,6 +67,9 @@ src_install() {
# Again, installed by glibc
rm -rf ${D}/usr/share/locale/locale.alias
+ # /usr/lib/charset.alias is provided by Mac OS X
+ use macos && rm -f ${D}/usr/lib/charset.alias
+
if [ -d ${D}/usr/doc/gettext ]
then
mv ${D}/usr/doc/gettext ${D}/usr/share/doc/${PF}/html