Updated to not install charset.alias on macos.

5 files changed, 30 insertions, 19 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 3ae04f9b3d03..f1f0788123d1 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/glib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.96 2004/09/19 07:49:52 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.97 2004/09/29 04:22:39 j4rg0n Exp $
+
+  29 Sep 2004; Lina Pezzella <j4rg0n@gentoo.org> glib-2.4.4.ebuild, glib-2.4.5.ebuild, glib-2.4.6.ebuild:
+  Updated to not install charset.alias on macos.
 
   19 Sep 2004; Joshua Kinard <kumba@gentoo.org> glib-2.4.5.ebuild:
   Marked stable on mips.
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 0d291934a0d2..cafda7fc86ac 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0c721f40d810c3c834a02a1943ac0423 ChangeLog 11922
+MD5 373d7bfc686a864fff1de17fb22c0c14 ChangeLog 12079
 MD5 5d838e6c24b33f545fc2f507243b5ad4 glib-1.2.10-r5.ebuild 2284
+MD5 04c3a0c7f6f3912dba2f21f856622583 glib-2.4.6.ebuild 1381
 MD5 fd2f66a83b030b479ef059a02996017c glib-2.4.1.ebuild 997
 MD5 33374c66124d4339d26a7241a0fdd6c9 glib-2.4.2.ebuild 1046
-MD5 d50e35dcdb5699e25c6537153c373a9d glib-2.4.6.ebuild 1134
+MD5 cba6ad1f65d64c20d4e206ad643efd56 glib-2.4.4.ebuild 1388
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 f591a1799ed1b3ece0a3ef18fdf02b1d glib-2.4.4.ebuild 1143
-MD5 dd67a974b24406bb08ed2d26f495910d glib-2.4.5.ebuild 1123
+MD5 3021290a955dbc4d4a88418cf4ee7194 glib-2.4.5.ebuild 1370
 MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
+MD5 560ff41071c92560f9de1990dcdde70f files/digest-glib-2.4.6 64
 MD5 9409a054bd000d556e84987a855b10f0 files/digest-glib-2.4.1 64
 MD5 bb11efe8c19407a4742056f67df25dd7 files/digest-glib-2.4.2 64
 MD5 524c2c1cfb5ab43d0b402cefb8da4a9a files/digest-glib-2.4.4 64
-MD5 560ff41071c92560f9de1990dcdde70f files/digest-glib-2.4.6 64
 MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
 MD5 4f50760a1f3a23a715d8c07ff936bcf6 files/digest-glib-2.4.5 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBVBxeHTu7gpaalycRAvOJAKDQHOVn380zlxWEHp4u6dTeEXaohACgvSUV
-q0hztU2ByA8fSZK4qMHkzqI=
-=GUuy
------END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.4.4.ebuild b/dev-libs/glib/glib-2.4.4.ebuild
index c41ee9302e53..c0f564f8e906 100644
--- a/dev-libs/glib/glib-2.4.4.ebuild
+++ b/dev-libs/glib/glib-2.4.4.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/dev-libs/glib/glib-2.4.4.ebuild,v 1.10 2004/09/16 01:49:52 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.4.ebuild,v 1.11 2004/09/29 04:22:39 j4rg0n Exp $
 
 inherit libtool
 
@@ -43,6 +43,12 @@ src_install() {
 	# einstall || die
 	make DESTDIR=${D} install || die
 
+	# Do not install charset.alias for ppc-macos since it already exists.
+	if (use macos || use ppc-macos); then
+		einfo "Not installing charset.alias on macos"
+		rm ${D}/usr/lib/charset.alias || die "Cannot remove charset.alias from the image"
+	fi
+
 	# Consider invalid UTF-8 filenames as locale-specific.
 	# FIXME : we should probably move to suggesting G_FILENAME_ENC
 	dodir /etc/env.d
diff --git a/dev-libs/glib/glib-2.4.5.ebuild b/dev-libs/glib/glib-2.4.5.ebuild
index d70a68ff6805..aaac9341465e 100644
--- a/dev-libs/glib/glib-2.4.5.ebuild
+++ b/dev-libs/glib/glib-2.4.5.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/dev-libs/glib/glib-2.4.5.ebuild,v 1.10 2004/09/24 13:08:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.5.ebuild,v 1.11 2004/09/29 04:22:39 j4rg0n Exp $
 
 inherit libtool
 
@@ -39,6 +39,12 @@ src_install() {
 	# einstall || die
 	make DESTDIR=${D} install || die
 
+	# Do not install charset.alias for ppc-macos since it already exists.
+	if (use macos || use ppc-macos); then
+		einfo "Not installing charset.alias on macos"
+		rm ${D}/usr/lib/charset.alias || die "Cannot remove charset.alias from the image"
+	fi
+
 	# Consider invalid UTF-8 filenames as locale-specific.
 	# FIXME : we should probably move to suggesting G_FILENAME_ENC
 	dodir /etc/env.d
diff --git a/dev-libs/glib/glib-2.4.6.ebuild b/dev-libs/glib/glib-2.4.6.ebuild
index 6f38ccadffab..f42f3eecd4fe 100644
--- a/dev-libs/glib/glib-2.4.6.ebuild
+++ b/dev-libs/glib/glib-2.4.6.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/dev-libs/glib/glib-2.4.6.ebuild,v 1.4 2004/09/24 13:08:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.4.6.ebuild,v 1.5 2004/09/29 04:22:39 j4rg0n Exp $
 
 inherit libtool
 
@@ -42,6 +42,12 @@ src_install() {
 	# einstall || die
 	make DESTDIR=${D} install || die
 
+	# Do not install charset.alias for ppc-macos since it already exists.
+	if (use macos || use ppc-macos); then
+		einfo "Not installing charset.alias on macos"
+		rm ${D}/usr/lib/charset.alias || die "Cannot remove charset.alias from the image"
+	fi
+
 	# Consider invalid UTF-8 filenames as locale-specific.
 	# FIXME : we should probably move to suggesting G_FILENAME_ENC
 	dodir /etc/env.d