Add a patch which detects Sparc for Linux, from bug #134341

Package-Manager: portage-2.1.2_pre1

4 files changed, 34 insertions, 10 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 16b6264cee03..d53b16efad46 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.350 2006/09/22 17:42:59 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.351 2006/09/29 11:33:59 caleb Exp $
+
+  29 Sep 2006; Caleb Tennis <caleb@gentoo.org> +files/qt-4.1.4-sparc.patch,
+  qt-4.1.4.ebuild:
+  Add a patch which detects Sparc for Linux, from bug #134341
 
 *qt-4.0.1 (22 Sep 2006)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 612fc507192d..56d3efa377ea 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -70,6 +70,10 @@ AUX qt-3.3.6-visibility.patch 5554 RMD160 db15a594a913fd1c1837a731e168b1197d19da
 MD5 49aad9f3e7911c03c9e5da8824ed71d5 files/qt-3.3.6-visibility.patch 5554
 RMD160 db15a594a913fd1c1837a731e168b1197d19da62 files/qt-3.3.6-visibility.patch 5554
 SHA256 b33b2415f280ef25f070bbe7308659ee3e5a5c1999e2ef419271f11e59160407 files/qt-3.3.6-visibility.patch 5554
+AUX qt-4.1.4-sparc.patch 475 RMD160 1af71a9748963bca0a24911b880d11f1384543e2 SHA1 240486510de64c4e9e4deb0454cc5783bdd67298 SHA256 c9700bbe6b57ec448e67a77443dff534daf8093c5834c9d4ebaa8b3de29b118a
+MD5 838314a6c48d8f188ccd6c7d4c938a56 files/qt-4.1.4-sparc.patch 475
+RMD160 1af71a9748963bca0a24911b880d11f1384543e2 files/qt-4.1.4-sparc.patch 475
+SHA256 c9700bbe6b57ec448e67a77443dff534daf8093c5834c9d4ebaa8b3de29b118a files/qt-4.1.4-sparc.patch 475
 AUX qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 SHA1 2f09deb7e354797ee72aa65a35c882a5ed5fd86c SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d
 MD5 dcd3368171f2b284381e1cbc0de6a5a5 files/qt-ulibc.patch 355
 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 files/qt-ulibc.patch 355
@@ -105,18 +109,18 @@ EBUILD qt-4.0.1.ebuild 5926 RMD160 4403976a13e9f9f5f53017b1f9c4c6b1f8d5b5a8 SHA1
 MD5 90c09342512c6e13f8e2ae2fc451c3de qt-4.0.1.ebuild 5926
 RMD160 4403976a13e9f9f5f53017b1f9c4c6b1f8d5b5a8 qt-4.0.1.ebuild 5926
 SHA256 4e4f2bea1dace6368d79b3d11d5fdaa937571ca33a9efcb0fbf6b5186d7039d5 qt-4.0.1.ebuild 5926
-EBUILD qt-4.1.4.ebuild 6752 RMD160 77709d3a7c72a3a64e2e46b44164ed1ad3fe04d0 SHA1 f8ea73ec0352d39827fac91a4d697d652a0c5fe0 SHA256 149481eae2815f9e65922d72026b096299f19368a3f1af0704d6dacc0eb9bb3e
-MD5 69c90c718544b9afaea468265802b111 qt-4.1.4.ebuild 6752
-RMD160 77709d3a7c72a3a64e2e46b44164ed1ad3fe04d0 qt-4.1.4.ebuild 6752
-SHA256 149481eae2815f9e65922d72026b096299f19368a3f1af0704d6dacc0eb9bb3e qt-4.1.4.ebuild 6752
+EBUILD qt-4.1.4.ebuild 6793 RMD160 14027c203ddb890863f799897ca96d1936f2bc47 SHA1 94056120041f3c71a54ae2d61818f969ad972ec1 SHA256 38e318ffadf90c30c3a419097649f0f99e7374d20be150386c41e12b41212f57
+MD5 c96caf9c6750af6e4db124a64ced26f3 qt-4.1.4.ebuild 6793
+RMD160 14027c203ddb890863f799897ca96d1936f2bc47 qt-4.1.4.ebuild 6793
+SHA256 38e318ffadf90c30c3a419097649f0f99e7374d20be150386c41e12b41212f57 qt-4.1.4.ebuild 6793
 EBUILD qt-4.2.0_rc1.ebuild 6706 RMD160 f4fa747c12eaf38ff31c51ab749cad93ca521fb8 SHA1 f99cbaf0f3a2fae7690e40e37624c84d58756d70 SHA256 0ea021121d7d43ae3a07c1c551f49cd4b9ecf76d12e93462ff23182f04a21253
 MD5 427399b875cf9a84de35c3faee3b757b qt-4.2.0_rc1.ebuild 6706
 RMD160 f4fa747c12eaf38ff31c51ab749cad93ca521fb8 qt-4.2.0_rc1.ebuild 6706
 SHA256 0ea021121d7d43ae3a07c1c551f49cd4b9ecf76d12e93462ff23182f04a21253 qt-4.2.0_rc1.ebuild 6706
-MISC ChangeLog 15275 RMD160 524bdb2722044d4e6a6a84d4f73f693c474ed0ba SHA1 aabfa4671be7d318e723560e0016a6ba5afc1557 SHA256 f3b9eafd3852f139c096846b958fc71f38fe4fdf8ab54b2fbb082bb3edcf9b82
-MD5 457f1ae08d7a9c27e64aadbab5b2bfdc ChangeLog 15275
-RMD160 524bdb2722044d4e6a6a84d4f73f693c474ed0ba ChangeLog 15275
-SHA256 f3b9eafd3852f139c096846b958fc71f38fe4fdf8ab54b2fbb082bb3edcf9b82 ChangeLog 15275
+MISC ChangeLog 15433 RMD160 c104ec95ba9301ff0be0657850944a6c61697b7a SHA1 d4d0987162061b0d2c6f0803ee0b307d2ffd8a3f SHA256 918a5a9d26858cf3aacf6c176807274a983fa5f381d468b107873780dc265838
+MD5 81df661f87eed26b14aa64253a759f48 ChangeLog 15433
+RMD160 c104ec95ba9301ff0be0657850944a6c61697b7a ChangeLog 15433
+SHA256 918a5a9d26858cf3aacf6c176807274a983fa5f381d468b107873780dc265838 ChangeLog 15433
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
diff --git a/x11-libs/qt/files/qt-4.1.4-sparc.patch b/x11-libs/qt/files/qt-4.1.4-sparc.patch
new file mode 100644
index 000000000000..0f9c8059bcbf
--- /dev/null
+++ b/x11-libs/qt/files/qt-4.1.4-sparc.patch
@@ -0,0 +1,15 @@
+--- qt-x11-opensource-src-4.1.4/configure.orig	2006-09-22 15:47:43.000000000 -0600
++++ qt-x11-opensource-src-4.1.4/configure	2006-09-22 21:17:12.000000000 -0600
+@@ -1821,6 +1821,12 @@
+     	fi
+     	ARCH=s390
+     	;;
++    Linux:*:sparc*)
++        if [ "$OPT_VERBOSE" = "yes" ]; then
++            echo "    Linux on SPARC"
++        fi
++        ARCH=sparc
++        ;;
+     *:*:*)
+         if [ "$OPT_VERBOSE" = "yes" ]; then
+             echo "    Trying '$UNAME_MACHINE'..."
diff --git a/x11-libs/qt/qt-4.1.4.ebuild b/x11-libs/qt/qt-4.1.4.ebuild
index a6b8306cf2af..e719c5edd5a1 100644
--- a/x11-libs/qt/qt-4.1.4.ebuild
+++ b/x11-libs/qt/qt-4.1.4.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/x11-libs/qt/qt-4.1.4.ebuild,v 1.12 2006/09/14 14:07:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4.ebuild,v 1.13 2006/09/29 11:33:59 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -101,6 +101,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/qt4-parisc-linux.diff
+	epatch ${FILESDIR}/qt-4.1.4-sparc.patch
 
 	sed -i -e 's:read acceptance:acceptance=yes:' configure