Fix build issues on ppc, bug #130175.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 26 insertions, 20 deletions

diff --git a/dev-libs/klibc/ChangeLog b/dev-libs/klibc/ChangeLog
index a62cd332dcc6..7df6b2a04e3e 100644
--- a/dev-libs/klibc/ChangeLog
+++ b/dev-libs/klibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/klibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.26 2006/07/08 16:14:01 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/ChangeLog,v 1.27 2006/07/09 16:19:49 azarah Exp $
+
+  09 Jul 2006; Martin Schlemmer <azarah@gentoo.org> klibc-1.2.1-r2.ebuild,
+  klibc-1.4.9.ebuild:
+  Fix build issues on ppc, bug #130175.
 
 *klibc-1.4.9 (08 Jul 2006)
 
diff --git a/dev-libs/klibc/Manifest b/dev-libs/klibc/Manifest
index a4f21e9c60d5..c8ad4150d04a 100644
--- a/dev-libs/klibc/Manifest
+++ b/dev-libs/klibc/Manifest
@@ -53,18 +53,18 @@ EBUILD klibc-1.2.1-r1.ebuild 4598 RMD160 2fc5aa187a3729f9222152b7a0c3bc59a848b70
 MD5 390734c3bd8ebf1c25a8b2124f24f737 klibc-1.2.1-r1.ebuild 4598
 RMD160 2fc5aa187a3729f9222152b7a0c3bc59a848b70a klibc-1.2.1-r1.ebuild 4598
 SHA256 86b2e8fc5b2b8fddc12e95d8fa4885db76a65ebbe55d1384371d876cc965e5fa klibc-1.2.1-r1.ebuild 4598
-EBUILD klibc-1.2.1-r2.ebuild 5280 RMD160 8bf086d5e8aee7b9cd611ba59f9f292a250f4770 SHA1 b60bcbc38692938b7481327f6d6543e496a5ea48 SHA256 cae8b8f69305d56500a4dec1485312ed54630f65b58194a0d02327f87b598345
-MD5 2bc5e6b1ea4a1050bd23b4e7bb09de49 klibc-1.2.1-r2.ebuild 5280
-RMD160 8bf086d5e8aee7b9cd611ba59f9f292a250f4770 klibc-1.2.1-r2.ebuild 5280
-SHA256 cae8b8f69305d56500a4dec1485312ed54630f65b58194a0d02327f87b598345 klibc-1.2.1-r2.ebuild 5280
-EBUILD klibc-1.4.9.ebuild 6167 RMD160 953173322f52c9314b0039c01715d340e93ed020 SHA1 a7e92d7e45b166f39e96c58de11ea855ee6cd592 SHA256 62591bed32dd0b3086c312612b0a0b33141a721e8f03d27119a66f4153b8ddd2
-MD5 7772763d1b6b8b9436995a83e4f06722 klibc-1.4.9.ebuild 6167
-RMD160 953173322f52c9314b0039c01715d340e93ed020 klibc-1.4.9.ebuild 6167
-SHA256 62591bed32dd0b3086c312612b0a0b33141a721e8f03d27119a66f4153b8ddd2 klibc-1.4.9.ebuild 6167
-MISC ChangeLog 4724 RMD160 16f1034ea7d8249b613eb5ed09bd27f8d7051d80 SHA1 c5439d288f5337b72d26e99281c47a510c7787e9 SHA256 44fd2aeb4ba6bc80ad4135a202788b2730c5b32bb9860568cfe6ea6461d3a585
-MD5 63af65d1f12c408e37042d0c9d78c392 ChangeLog 4724
-RMD160 16f1034ea7d8249b613eb5ed09bd27f8d7051d80 ChangeLog 4724
-SHA256 44fd2aeb4ba6bc80ad4135a202788b2730c5b32bb9860568cfe6ea6461d3a585 ChangeLog 4724
+EBUILD klibc-1.2.1-r2.ebuild 5323 RMD160 74b65d6173fdc7767031da40e93bedac9fa73cc4 SHA1 ad828aca56f5e7b886d2b12a074d2c45ae5a493c SHA256 d510a22c9a777557a08c61bc523c0ad11e8fa8413e0601fb179d40ce6dbc7bd4
+MD5 02bf69a127bc7f81b3aef5a37c11026b klibc-1.2.1-r2.ebuild 5323
+RMD160 74b65d6173fdc7767031da40e93bedac9fa73cc4 klibc-1.2.1-r2.ebuild 5323
+SHA256 d510a22c9a777557a08c61bc523c0ad11e8fa8413e0601fb179d40ce6dbc7bd4 klibc-1.2.1-r2.ebuild 5323
+EBUILD klibc-1.4.9.ebuild 6210 RMD160 8465af846a86115e2d92b892873406abc541d169 SHA1 4d724b2a8162ad225ada685bcd49b8eac08a8a2d SHA256 b484d988bbbd93624bef254ec1b94b7c9fd16bf272c9d06137f4abc95e6a0b48
+MD5 b057715f65cb37fb35a4d6e629df2c87 klibc-1.4.9.ebuild 6210
+RMD160 8465af846a86115e2d92b892873406abc541d169 klibc-1.4.9.ebuild 6210
+SHA256 b484d988bbbd93624bef254ec1b94b7c9fd16bf272c9d06137f4abc95e6a0b48 klibc-1.4.9.ebuild 6210
+MISC ChangeLog 4862 RMD160 3a0e38082f06f34ee6825a5c01edaf5613095e68 SHA1 574081dbd9af86d315520cb63abeda6e806b4d5f SHA256 3c258690c26a3eb9f3d841d57dff53c9c617826fac51ae6faa8eca98a2f1d582
+MD5 840ebf9135f0dfdb902cfaa677738245 ChangeLog 4862
+RMD160 3a0e38082f06f34ee6825a5c01edaf5613095e68 ChangeLog 4862
+SHA256 3c258690c26a3eb9f3d841d57dff53c9c617826fac51ae6faa8eca98a2f1d582 ChangeLog 4862
 MISC metadata.xml 223 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a SHA1 dc0e52cb5b43de4cfe293e3ad0c06d2ce1e5a83e SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a metadata.xml 223
@@ -87,7 +87,7 @@ SHA256 17a5887d09ccda088ccbc8d35140be5bf3f099aeb7f05fad5f6d1c144320243f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEr96P1ZcsMnZjRyIRAhrsAJ0a99pbHAUVdNYNUQcM40QgJbJZngCgsLLM
-7CA2rILvF/rbsNvh5TDu7f0=
-=Lstr
+iD8DBQFEsS0P1ZcsMnZjRyIRAuxwAJ0fIstguxHnmGwRtEuRI+mtMIA2iwCdGqfb
+8QPthwC8BcELECRD9qFDr/E=
+=xzjA
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/klibc/klibc-1.2.1-r2.ebuild b/dev-libs/klibc/klibc-1.2.1-r2.ebuild
index 89fab32a4dcd..5a8a9380e907 100644
--- a/dev-libs/klibc/klibc-1.2.1-r2.ebuild
+++ b/dev-libs/klibc/klibc-1.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.2.1-r2.ebuild,v 1.1 2006/07/07 13:34:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.2.1-r2.ebuild,v 1.2 2006/07/09 16:19:49 azarah Exp $
 
 inherit eutils linux-info multilib
 
@@ -74,7 +74,8 @@ src_unpack() {
 		die "Could not guess klibc's ARCH from your CTARGET!"
 	fi
 
-	kernel_arch=$(readlink "${KV_OUT_DIR}/include/asm" | sed -e 's:asm-::')
+	kernel_arch=$(readlink "${KV_OUT_DIR}/include/asm" | sed -e 's:asm-::' | \
+	              sed -e 's/powerpc/ppc/')
 	if [[ ${kernel_arch} != $(guess_arch) ]] ; then
 		echo
 		eerror "Your kernel sources are not configured for your chosen arch!"
diff --git a/dev-libs/klibc/klibc-1.4.9.ebuild b/dev-libs/klibc/klibc-1.4.9.ebuild
index 5d07d846a514..16a871af5bd4 100644
--- a/dev-libs/klibc/klibc-1.4.9.ebuild
+++ b/dev-libs/klibc/klibc-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.4.9.ebuild,v 1.1 2006/07/08 16:14:01 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/klibc/klibc-1.4.9.ebuild,v 1.2 2006/07/09 16:19:49 azarah Exp $
 
 inherit eutils linux-info multilib
 
@@ -78,7 +78,8 @@ src_unpack() {
 		die "Could not guess klibc's ARCH from your CTARGET!"
 	fi
 
-	kernel_arch=$(readlink "${KV_OUT_DIR}/include/asm" | sed -e 's:asm-::')
+	kernel_arch=$(readlink "${KV_OUT_DIR}/include/asm" | sed -e 's:asm-::' | \
+	              sed -e 's/powerpc/ppc/')
 	if [[ ${kernel_arch} != $(guess_arch) ]] ; then
 		echo
 		eerror "Your kernel sources are not configured for your chosen arch!"