On PA7200, uname -a contains a single quote and we need to filter it otherwise configure fails. See #125535.

Package-Manager: portage-2.1_rc3-r5

4 files changed, 35 insertions, 20 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index a5fbae00ac3a..5a27b6b2ae2b 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.216 2006/05/30 11:39:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.217 2006/06/03 18:08:15 gmsoft Exp $
+
+  03 Jun 2006; Guy Martin <gmsoft@gentoo.org>
+  +files/perl-hppa-pa7200-configure.patch, perl-5.8.8-r2.ebuild:
+  On PA7200, uname -a contains a single quote and we need to filter it
+  otherwise configure fails. See #125535.
 
   30 May 2006; <mcummings@gentoo.org> perl-5.8.8-r2.ebuild:
   Bug 134859, fixed USE=build removals on lib64
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index e0a6d1141f2f..0ffc80ab5364 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX CAN-2005-0156-suid.patch 703 RMD160 d1f50057744ef79428667ebbf1e37c09e1791e45 SHA1 9ee062e1c3db4ea4867bdfd7d0dfe31c0bed97a4 SHA256 123cc60410b2f09e4d10b892c151b3394a32c1b26dd216102c21fece64d45142
 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
 RMD160 d1f50057744ef79428667ebbf1e37c09e1791e45 files/CAN-2005-0156-suid.patch 703
@@ -85,6 +82,10 @@ AUX perl-h2ph-ansi-header.patch 446 RMD160 8baf89df0d3f916a8c4f437444fa1af01f5fa
 MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446
 RMD160 8baf89df0d3f916a8c4f437444fa1af01f5fa8b0 files/perl-h2ph-ansi-header.patch 446
 SHA256 dc28a8ccba56e0aa5e01b0ecf68a163ebfb9460917d201f1f6d9a1efef06c788 files/perl-h2ph-ansi-header.patch 446
+AUX perl-hppa-pa7200-configure.patch 446 RMD160 ab902e2b5cf7f96023e0e267f170401b036dd4f5 SHA1 fcb7e61cdf1ce1c9993f257507b3289ce45382d7 SHA256 4fe6a010dbdc39325f4003e7ccd02cb7996b4a99b64ab0fa8b12d6fe67f87a31
+MD5 cdbaaae0518844959e5f0b9c7986b647 files/perl-hppa-pa7200-configure.patch 446
+RMD160 ab902e2b5cf7f96023e0e267f170401b036dd4f5 files/perl-hppa-pa7200-configure.patch 446
+SHA256 4fe6a010dbdc39325f4003e7ccd02cb7996b4a99b64ab0fa8b12d6fe67f87a31 files/perl-hppa-pa7200-configure.patch 446
 AUX perl-noksh.patch 611 RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc SHA1 61bf5bb0955bd04a758d1381fa4260ed9fdbb1d1 SHA256 0861f7f54c184e99a0ffeebeab9420d969d2002f921bc3fb14841a1e24be1f5e
 MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611
 RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc files/perl-noksh.patch 611
@@ -160,18 +161,18 @@ EBUILD perl-5.8.8-r1.ebuild 19074 RMD160 784412857c3371f9d577cb66c082635baebfb31
 MD5 93fdd7eafa23f8326dc1462bd567348b perl-5.8.8-r1.ebuild 19074
 RMD160 784412857c3371f9d577cb66c082635baebfb31a perl-5.8.8-r1.ebuild 19074
 SHA256 764d53db5b63f74cd6a2fcccadd8126880075cacdb2aeaba254ce6fbae95ed80 perl-5.8.8-r1.ebuild 19074
-EBUILD perl-5.8.8-r2.ebuild 19087 RMD160 01fcc5c273675f3a97c37f38b40dbaf4da1f8ab5 SHA1 1541b24d150dd05f04a959b4d26202e5620065a1 SHA256 8748b3c482750fab7365544999685b3adea1499c94194f5eb07d4e53e499e338
-MD5 f2282c37afbdc68ef96ed6cd7fb5cefb perl-5.8.8-r2.ebuild 19087
-RMD160 01fcc5c273675f3a97c37f38b40dbaf4da1f8ab5 perl-5.8.8-r2.ebuild 19087
-SHA256 8748b3c482750fab7365544999685b3adea1499c94194f5eb07d4e53e499e338 perl-5.8.8-r2.ebuild 19087
+EBUILD perl-5.8.8-r2.ebuild 19255 RMD160 20031f1003ab4bc6ef6d7340f0c9659896f067e9 SHA1 bc297a36fe2687e08737061a6f65d8e4c9ea2716 SHA256 52b3164769de643977fb0273290c599095b19aeeda2ad72fd6aa257212c70bc4
+MD5 8b84bbbf8fa5ec418ce20d732c734657 perl-5.8.8-r2.ebuild 19255
+RMD160 20031f1003ab4bc6ef6d7340f0c9659896f067e9 perl-5.8.8-r2.ebuild 19255
+SHA256 52b3164769de643977fb0273290c599095b19aeeda2ad72fd6aa257212c70bc4 perl-5.8.8-r2.ebuild 19255
 EBUILD perl-5.8.8.ebuild 18728 RMD160 8a49d93e06083f117e61ead33306296db610688a SHA1 1b659cf8ec8270c224d8fecaea25028667a997e8 SHA256 0c95755dd47b9a63d91232ac4748fd41e46b7b3d6adde3302c2a137910e91774
 MD5 9981bea0123b51f5b13f7440608a28f7 perl-5.8.8.ebuild 18728
 RMD160 8a49d93e06083f117e61ead33306296db610688a perl-5.8.8.ebuild 18728
 SHA256 0c95755dd47b9a63d91232ac4748fd41e46b7b3d6adde3302c2a137910e91774 perl-5.8.8.ebuild 18728
-MISC ChangeLog 51050 RMD160 bcadbdd2f5b13259c483733db262d32de45de6a9 SHA1 0cdafa37133c71e01491171471e5e3712f4dbd7c SHA256 6dbf4b59e505dad695f853669582d9a19eb281fc4fb8d60d72b8a7c72f659e0c
-MD5 f266f54d4880738e313e23e971ef59ab ChangeLog 51050
-RMD160 bcadbdd2f5b13259c483733db262d32de45de6a9 ChangeLog 51050
-SHA256 6dbf4b59e505dad695f853669582d9a19eb281fc4fb8d60d72b8a7c72f659e0c ChangeLog 51050
+MISC ChangeLog 51272 RMD160 417480e54330e445e70f23c8241908ffc8af015d SHA1 c3d792b7994a596141ec2d5ab3d52c4ff03c78c8 SHA256 983b930e069909eaa2f165f1835acd7b5afa4cbc6c3fd723c7997888c10e2818
+MD5 d7b53ac8d00b0bb92724a9aa3f546e84 ChangeLog 51272
+RMD160 417480e54330e445e70f23c8241908ffc8af015d ChangeLog 51272
+SHA256 983b930e069909eaa2f165f1835acd7b5afa4cbc6c3fd723c7997888c10e2818 ChangeLog 51272
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
@@ -209,10 +210,3 @@ SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/di
 MD5 750a1b4341f04665c5ce30e14a302f96 files/digest-perl-5.8.8-r2 241
 RMD160 a339ac2a520b2fd2f458daf89cd89eb36a8c98b2 files/digest-perl-5.8.8-r2 241
 SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/digest-perl-5.8.8-r2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEfC8atG5z4I8BtQoRAhVLAJ42fP5jlV4i6WcklA82hVT6R4P02QCdH4hG
-TkCPewoOu2log7rLL7mgPaE=
-=Jtir
------END PGP SIGNATURE-----
diff --git a/dev-lang/perl/files/perl-hppa-pa7200-configure.patch b/dev-lang/perl/files/perl-hppa-pa7200-configure.patch
new file mode 100644
index 000000000000..396209af112b
--- /dev/null
+++ b/dev-lang/perl/files/perl-hppa-pa7200-configure.patch
@@ -0,0 +1,11 @@
+--- Configure.orig	2006-06-02 13:14:22.000000000 -0500
++++ Configure	2006-06-02 13:07:03.000000000 -0500
+@@ -2967,7 +2967,7 @@
+ : Try to determine whether config.sh was made on this system
+ case "$config_sh" in
+ '')
+-myuname=`$uname -a 2>/dev/null`
++myuname=`$uname -a | $sed -e "s/'//" 2>/dev/null`
+ $test -z "$myuname" && myuname=`hostname 2>/dev/null`
+ # tr '[A-Z]' '[a-z]' would not work in EBCDIC
+ # because the A-Z/a-z are not consecutive.
diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild
index 4c135ddd683d..a0ec4f3117ca 100644
--- a/dev-lang/perl/perl-5.8.8-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.8-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-lang/perl/perl-5.8.8-r2.ebuild,v 1.10 2006/05/30 11:39:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.11 2006/06/03 18:08:15 gmsoft Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -109,6 +109,11 @@ src_unpack() {
 	[[ -n $(test-flags -fno-stack-protector) ]] && \
 		epatch ${FILESDIR}/${PN}-regexp-nossp.patch
 
+
+	# On PA7200, uname -a contains a single quote and we need to 
+	# filter it otherwise configure fails. See #125535.
+	epatch ${FILESDIR}/perl-hppa-pa7200-configure.patch
+
 	use amd64 && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch
 
 	[[ ${CHOST} == *-dragonfly* ]] && cd ${S} && epatch ${FILESDIR}/${P}-dragonfly-clean.patch