Remove charset.alias always, not just in ppc-macos case.
authorDiego Elio Pettenò <flameeyes@gentoo.org>
Thu, 1 Sep 2005 07:40:32 +0000 (07:40 +0000)
committerDiego Elio Pettenò <flameeyes@gentoo.org>
Thu, 1 Sep 2005 07:40:32 +0000 (07:40 +0000)
Package-Manager: portage-2.0.51.22

sys-devel/gettext/ChangeLog
sys-devel/gettext/Manifest
sys-devel/gettext/gettext-0.14.5.ebuild

index bd157ff08aba4e47ecfeae8879c2db549cc391f4..f73dde657d37a6ead3a54b754ab08825ff1b815f 100644 (file)
@@ -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)
 
index e2bf54a4ddd42ddaa2f905f26d796a5c44246f5f..977a687c0470ae3d3c0a797921d776e3a0df60ad 100644 (file)
@@ -1,31 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 c74bbdb62b8f3e4b8669fa8133d070c2 gettext-0.14.5.ebuild 3595
-MD5 f46f927893861e2d082d7b836f597ef7 gettext-0.14.2.ebuild 3509
-MD5 0890c612ec51d74a5cefbb0ca3ab8ae7 gettext-0.12.1-r2.ebuild 2543
-MD5 1a23652bed7c1d1ca6f1c43c29696d68 ChangeLog 11923
-MD5 ac4041bb4e436a9935d04cd63b40d425 gettext-0.14.1-r1.ebuild 2886
+MD5 6ab5b7895e1feb50772ed206d325a045 ChangeLog 12062
 MD5 430e22b4c52c95f6c61427e5ec6d9439 gettext-0.14.4.ebuild 3578
+MD5 ac4041bb4e436a9935d04cd63b40d425 gettext-0.14.1-r1.ebuild 2886
+MD5 0890c612ec51d74a5cefbb0ca3ab8ae7 gettext-0.12.1-r2.ebuild 2543
+MD5 f46f927893861e2d082d7b836f597ef7 gettext-0.14.2.ebuild 3509
+MD5 74cb934f6a57bae6d8592fde32bf43bd gettext-0.14.5.ebuild 3590
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 fada337fd753f2580b6849dc560498ff files/gettext-0.12.1-tempfile.patch 2226
 MD5 095399be17e9cf19b7b02ffcd1fb95a5 files/gettext-0.14.1-tempfile.patch 2636
+MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.14.1-without_java.patch 2743
+MD5 44ad3082200305087e6244f5a2665892 files/digest-gettext-0.14.2 67
 MD5 3077319e6090fcd6262e2d8fd463441f files/gettext-0.14.1-lib-path-tests.patch 707
-MD5 2a60a632eb22d99acfa09d16828fe073 files/gettext-0.14.1-no-java-tests.patch 2885
-MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
 MD5 dfcc1d12d05c42f262de0dada08ed90d files/gettext-0.14.2-fix-race.patch 417
 MD5 bc7e7f683a64a5f805af77b1ed851b65 files/digest-gettext-0.14.4 67
-MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.14.1-without_java.patch 2743
-MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1-r2 67
-MD5 fada337fd753f2580b6849dc560498ff files/gettext-0.12.1-tempfile.patch 2226
+MD5 2a60a632eb22d99acfa09d16828fe073 files/gettext-0.14.1-no-java-tests.patch 2885
 MD5 b56837fdd725fc00c173b57b951b90cc files/gettext-0.14.2-no-java-tests.patch 2524
-MD5 38756cea2e4f8e36c2e45b890f1a7463 files/50po-mode-gentoo.el 183
 MD5 ba2eaf73c69d33eeb6f259f2c2da4ded files/digest-gettext-0.14.5 67
 MD5 0e4a00cc30a91523c838cd17b5841399 files/digest-gettext-0.14.1-r1 67
-MD5 44ad3082200305087e6244f5a2665892 files/digest-gettext-0.14.2 67
+MD5 38756cea2e4f8e36c2e45b890f1a7463 files/50po-mode-gentoo.el 183
+MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
+MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1-r2 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDFqTTgIKl8Uu19MoRAnQtAJ95wC1RS0d/jNmqADurIKtKeRLIUACfWiXP
-OqMgwMoJ2b4uTUCJHGOiJ6A=
-=2XgG
+iD8DBQFDFrCFj5H05b2HAEkRApI+AJ0ddb281y6fbEmFZ1cfw7Hg5v/3qACcDD/y
+h8EenZNstleJ/k4yW4xGce4=
+=nbhn
 -----END PGP SIGNATURE-----
index 8ba18e62e521ccff74605567db757afaec76d66c..789c90adfb43e7f27754f9192e4e53dfd9ae14a2 100644 (file)
@@ -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