summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-09-01 07:40:32 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-09-01 07:40:32 +0000
commit08dfd85fc5a172f46361d7b7fa0afc94c8f814c2 (patch)
tree3ca817805bb22a64aa9142b9a21aceebad03722f /sys-devel
parentNew PHP packages masked for now (diff)
downloadgentoo-2-08dfd85fc5a172f46361d7b7fa0afc94c8f814c2.tar.gz
gentoo-2-08dfd85fc5a172f46361d7b7fa0afc94c8f814c2.tar.bz2
gentoo-2-08dfd85fc5a172f46361d7b7fa0afc94c8f814c2.zip
Remove charset.alias always, not just in ppc-macos case.
(Portage version: 2.0.51.22)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gettext/ChangeLog5
-rw-r--r--sys-devel/gettext/gettext-0.14.5.ebuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index bd157ff08aba..f73dde657d37 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-devel/gettext
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.95 2005/09/01 06:50:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.96 2005/09/01 07:40:32 flameeyes Exp $
+
+ 01 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gettext-0.14.5.ebuild:
+ Remove charset.alias always, not just in ppc-macos case.
*gettext-0.14.5 (01 Sep 2005)
diff --git a/sys-devel/gettext/gettext-0.14.5.ebuild b/sys-devel/gettext/gettext-0.14.5.ebuild
index 8ba18e62e521..789c90adfb43 100644
--- a/sys-devel/gettext/gettext-0.14.5.ebuild
+++ b/sys-devel/gettext/gettext-0.14.5.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/sys-devel/gettext/gettext-0.14.5.ebuild,v 1.1 2005/09/01 06:50:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.5.ebuild,v 1.2 2005/09/01 07:40:32 flameeyes Exp $
inherit flag-o-matic eutils toolchain-funcs mono libtool elisp-common
@@ -76,13 +76,12 @@ src_install() {
rm -f "${D}"/usr/include/libintl.h
rm -f "${D}"/usr/$(get_libdir)/libintl.*
fi
- rm -f "${D}"/usr/share/locale/locale.alias
+ rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
# older gettext's sometimes installed libintl ...
# need to keep the linked version or the system
# could die (things like sed link against it :/)
if use ppc-macos; then
- rm -f "${D}"/usr/lib/charset.alias
if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then
cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/
touch "${D}"/usr/$(get_libdir)/libintl.2.dylib