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
commit9f9406d0757d05f47233009eeb9a9d8adff50be1 (patch)
tree65cb6ec1d186835dff3f2ab4cc0554f6cc2b7913 /sys-devel/gettext
parentBump,add metadata (diff)
downloadhistorical-9f9406d0757d05f47233009eeb9a9d8adff50be1.tar.gz
historical-9f9406d0757d05f47233009eeb9a9d8adff50be1.tar.bz2
historical-9f9406d0757d05f47233009eeb9a9d8adff50be1.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/Manifest14
-rw-r--r--sys-devel/gettext/gettext-0.12.1-r1.ebuild5
3 files changed, 15 insertions, 9 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/Manifest b/sys-devel/gettext/Manifest
index f6299cc18dc3..8b5c5b523a65 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,12 +1,12 @@
-MD5 f643729082bd0c72666ec4d208e62c1c gettext-0.12.1-r1.ebuild 2193
-MD5 288ddb0080322741d63f71cc3b65df37 gettext-0.12.1.ebuild 1977
-MD5 ce9e28faaca888cc5a756e47ff9c38d2 gettext-0.11.5.ebuild 1449
+MD5 51731463c61e88ca4e7c8d286391a096 ChangeLog 6690
MD5 3eea23ad0de6397faf36613e3872bc46 gettext-0.11.5-r1.ebuild 1874
-MD5 210a730edcd6eb274708d2d3a4a6118b ChangeLog 6587
+MD5 ce9e28faaca888cc5a756e47ff9c38d2 gettext-0.11.5.ebuild 1449
+MD5 d5a39db60ccc8a5c56bdf81b4a267030 gettext-0.12.1-r1.ebuild 2288
+MD5 288ddb0080322741d63f71cc3b65df37 gettext-0.12.1.ebuild 1977
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e846923f9b90ce853b73bfd6756a7cab files/gettext-0.12.1-bootstrap.patch 51612
-MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5 67
-MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1 67
MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5-r1 67
+MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1 67
MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1-r1 67
+MD5 e846923f9b90ce853b73bfd6756a7cab files/gettext-0.12.1-bootstrap.patch 51612
+MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
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