Fixed HPPA patching.

Package-Manager: portage-2.1.1_pre5

5 files changed, 31 insertions, 27 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 6c0790ef7b1a..af13944c99b7 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.338 2006/08/11 12:57:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.339 2006/08/14 11:00:28 jer Exp $
+
+  14 Aug 2006; Jeroen Roovers <jer@gentoo.org> files/qt4-parisc-linux.diff,
+  qt-4.1.3.ebuild, qt-4.1.4.ebuild:
+  Fixed HPPA patching.
 
   11 Aug 2006; Markus Rothe <corsair@gentoo.org> qt-4.1.4.ebuild:
   Stable on ppc64; bug #134341
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 85d467f0c9f2..2cdbaac1ebaf 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -82,10 +82,10 @@ AUX qt4-nomkdir.patch 866 RMD160 fea6ac45ebf4b457fc3e1d3c8f860e6661d52b0c SHA1 c
 MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
 RMD160 fea6ac45ebf4b457fc3e1d3c8f860e6661d52b0c files/qt4-nomkdir.patch 866
 SHA256 14b9bda1bfdf41b37816559e6c7833b15636c89b016c8f2c2224ebf5dbb5274f files/qt4-nomkdir.patch 866
-AUX qt4-parisc-linux.diff 1248 RMD160 10dd26edbfb943779689b76f2076353d12fbbd4a SHA1 d1bf049537dc59c0a9e578de31830edc1477bd2f SHA256 7f30899f9be7ba4330dcfb1b8f2608ae7e73845d3fbc3c08e97370b4819af136
-MD5 36bb1510a9affb9df03bdf8d8f6d6229 files/qt4-parisc-linux.diff 1248
-RMD160 10dd26edbfb943779689b76f2076353d12fbbd4a files/qt4-parisc-linux.diff 1248
-SHA256 7f30899f9be7ba4330dcfb1b8f2608ae7e73845d3fbc3c08e97370b4819af136 files/qt4-parisc-linux.diff 1248
+AUX qt4-parisc-linux.diff 1004 RMD160 3fdfdb7cb5acf9a43eae83b8aa549cd2130be3b9 SHA1 3c990b46c712b2ef8daf6160adbfcc79d296bc88 SHA256 28ee040bbafd5bf07c47b496ae64ecd76e4ccbaa818e185f7422064db894b2da
+MD5 a0defbda40e1906b6e6dc5c8fe8d9f23 files/qt4-parisc-linux.diff 1004
+RMD160 3fdfdb7cb5acf9a43eae83b8aa549cd2130be3b9 files/qt4-parisc-linux.diff 1004
+SHA256 28ee040bbafd5bf07c47b496ae64ecd76e4ccbaa818e185f7422064db894b2da files/qt4-parisc-linux.diff 1004
 DIST qt-x11-free-3.3.4.tar.bz2 14439722 RMD160 3298331d545511956eb0910cbc5867a2a453ea1e SHA1 cb5f452bcdc9d2ed0201481f4b8f152edfda9523 SHA256 4e47251eddb0cef058e1bfd89c3320c03d966eba12760a781c95cf5468bf30b3
 DIST qt-x11-free-3.3.6.tar.bz2 14565843 RMD160 84c0b6bc6dc727d40a5a8df29a81aafc743c0161 SHA1 bbb075054b8a2923a8a7f5afff1c4c7a8bf5a946 SHA256 04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae
 DIST qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 RMD160 c2d7269e9b22167bd8c2e10c13c6905440406b12 SHA256 67555c1655f394f43dd67293df6e8acf40f842f14faa392ed6752e0ddf6ff1a6
@@ -106,22 +106,22 @@ EBUILD qt-4.1.2.ebuild 6462 RMD160 5120d104f5289d8b166f61ee36567f004ba57934 SHA1
 MD5 62f686832113e857034ae0686b05a742 qt-4.1.2.ebuild 6462
 RMD160 5120d104f5289d8b166f61ee36567f004ba57934 qt-4.1.2.ebuild 6462
 SHA256 374c5cf5ae971a567ad375ea5728293c962d6f51575ead927e446672a14f1dd5 qt-4.1.2.ebuild 6462
-EBUILD qt-4.1.3.ebuild 6373 RMD160 c565c90c754fafcbf91c573b12ec462f499c3e33 SHA1 25e8dd6b6c9e013c58354f6c4572080b87273161 SHA256 7ec14455009971c4a954f0b0669d6b8f611217b0b36ded414a739eb6a44db8aa
-MD5 fff8ded25019cb7bb148ae326258ecb6 qt-4.1.3.ebuild 6373
-RMD160 c565c90c754fafcbf91c573b12ec462f499c3e33 qt-4.1.3.ebuild 6373
-SHA256 7ec14455009971c4a954f0b0669d6b8f611217b0b36ded414a739eb6a44db8aa qt-4.1.3.ebuild 6373
-EBUILD qt-4.1.4.ebuild 6443 RMD160 72f708337f81b576c024754077bee9c0f526198b SHA1 855ece67eff26ec67db63dece99c6e7723cc521e SHA256 8fecd4464869d477da0d2a172a7a26eebd4b894334caccea45f8d718b6f09c37
-MD5 4f308690103f236110e33edd12bc6791 qt-4.1.4.ebuild 6443
-RMD160 72f708337f81b576c024754077bee9c0f526198b qt-4.1.4.ebuild 6443
-SHA256 8fecd4464869d477da0d2a172a7a26eebd4b894334caccea45f8d718b6f09c37 qt-4.1.4.ebuild 6443
+EBUILD qt-4.1.3.ebuild 6367 RMD160 2e52b940e95950282f199a8a673211bb9e0eac34 SHA1 492934ed445a694414fc16cee59d6d68f4b4630a SHA256 a00d5b65b171fd3ebb2ba8a79d30bcf692dacce456868c113b0e8956308a1cbd
+MD5 6c5dd8d31125c5e8302c7dd3204aab22 qt-4.1.3.ebuild 6367
+RMD160 2e52b940e95950282f199a8a673211bb9e0eac34 qt-4.1.3.ebuild 6367
+SHA256 a00d5b65b171fd3ebb2ba8a79d30bcf692dacce456868c113b0e8956308a1cbd qt-4.1.3.ebuild 6367
+EBUILD qt-4.1.4.ebuild 6438 RMD160 be2e474c8020ea82f0f10f66db33c4b8fe6c33e7 SHA1 97a8d2904778ffceedb5ac1d3429cae0256c7005 SHA256 d5fcd1987d06fe2a051d1291859d46d204cd3ab3e6039d2dd6e179c4ea67b33d
+MD5 260214a4867f9e4d339b5c17c56c5962 qt-4.1.4.ebuild 6438
+RMD160 be2e474c8020ea82f0f10f66db33c4b8fe6c33e7 qt-4.1.4.ebuild 6438
+SHA256 d5fcd1987d06fe2a051d1291859d46d204cd3ab3e6039d2dd6e179c4ea67b33d qt-4.1.4.ebuild 6438
 EBUILD qt-4.2.0_pre1.ebuild 6762 RMD160 513ed299d2569446d828b9944be27365e1ac003d SHA1 e4e2ce72f9c8740a0ab3ad892e01d47573d3988a SHA256 1a2bd88dd2f2dcc80a67751a616acde40f0b3d975b474265d798af2389b99787
 MD5 6da936209086fa1942928a69fe1c4111 qt-4.2.0_pre1.ebuild 6762
 RMD160 513ed299d2569446d828b9944be27365e1ac003d qt-4.2.0_pre1.ebuild 6762
 SHA256 1a2bd88dd2f2dcc80a67751a616acde40f0b3d975b474265d798af2389b99787 qt-4.2.0_pre1.ebuild 6762
-MISC ChangeLog 13336 RMD160 c3f5c6d1857cd89d8dca7aa8a40bf2d670cf086f SHA1 f69141a30e82b4b1c1bdcc633f530e66fcfa3420 SHA256 669bce0208d459c67ecd2fa4c92d79653507640fea0737f7d5845674866e7f8d
-MD5 c29e0ac774708c88cc3ae86349ffcd38 ChangeLog 13336
-RMD160 c3f5c6d1857cd89d8dca7aa8a40bf2d670cf086f ChangeLog 13336
-SHA256 669bce0208d459c67ecd2fa4c92d79653507640fea0737f7d5845674866e7f8d ChangeLog 13336
+MISC ChangeLog 13468 RMD160 c81f3e48d4bd72bb598428b57e9aeb0e9645a3f0 SHA1 1010ca728b39884f3e5496502b53e5a302fcd99b SHA256 84da3a070c32e20a05ddf29c850ce2bb9022e756cbb335dbc06725a6b7178aa5
+MD5 fd5374744c94e43cd92e3de07b261e4d ChangeLog 13468
+RMD160 c81f3e48d4bd72bb598428b57e9aeb0e9645a3f0 ChangeLog 13468
+SHA256 84da3a070c32e20a05ddf29c850ce2bb9022e756cbb335dbc06725a6b7178aa5 ChangeLog 13468
 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/qt4-parisc-linux.diff b/x11-libs/qt/files/qt4-parisc-linux.diff
index 5e7c262fac03..a3fd326114c9 100644
--- a/x11-libs/qt/files/qt4-parisc-linux.diff
+++ b/x11-libs/qt/files/qt4-parisc-linux.diff
@@ -1,6 +1,6 @@
-diff -uNr qt-x11-opensource-src-4.1.3.orig/src/corelib/arch/parisc/arch.pri qt-x11-opensource-src-4.1.3/src/corelib/arch/parisc/arch.pri
---- qt-x11-opensource-src-4.1.3.orig/src/corelib/arch/parisc/arch.pri	2006-06-02 15:35:32.000000000 +0200
-+++ qt-x11-opensource-src-4.1.3/src/corelib/arch/parisc/arch.pri	2006-06-02 15:39:49.000000000 +0200
+diff -uNr src/corelib/arch/parisc/arch.pri src/corelib/arch/parisc/arch.pri
+--- src/corelib/arch/parisc/arch.pri	2006-06-02 15:35:32.000000000 +0200
++++ src/corelib/arch/parisc/arch.pri	2006-06-02 15:39:49.000000000 +0200
 @@ -8,6 +8,14 @@
  DEPENDPATH += $$ARCH_CPP;$$ARCH_H
  
@@ -18,9 +18,9 @@ diff -uNr qt-x11-opensource-src-4.1.3.orig/src/corelib/arch/parisc/arch.pri qt-x
 +}
 +
  
-diff -uNr qt-x11-opensource-src-4.1.3.orig/src/corelib/arch/parisc/q_ldcw-Linux.s qt-x11-opensource-src-4.1.3/src/corelib/arch/parisc/q_ldcw-Linux.s
---- qt-x11-opensource-src-4.1.3.orig/src/corelib/arch/parisc/q_ldcw-Linux.s	1970-01-01 01:00:00.000000000 +0100
-+++ qt-x11-opensource-src-4.1.3/src/corelib/arch/parisc/q_ldcw-Linux.s	2006-06-02 15:36:02.000000000 +0200
+diff -uNr src/corelib/arch/parisc/q_ldcw-Linux.s src/corelib/arch/parisc/q_ldcw-Linux.s
+--- src/corelib/arch/parisc/q_ldcw-Linux.s	1970-01-01 01:00:00.000000000 +0100
++++ src/corelib/arch/parisc/q_ldcw-Linux.s	2006-06-02 15:36:02.000000000 +0200
 @@ -0,0 +1,11 @@
 +
 +	.align 4
diff --git a/x11-libs/qt/qt-4.1.3.ebuild b/x11-libs/qt/qt-4.1.3.ebuild
index bd97357c709c..1738d6638e33 100644
--- a/x11-libs/qt/qt-4.1.3.ebuild
+++ b/x11-libs/qt/qt-4.1.3.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.3.ebuild,v 1.6 2006/07/09 06:04:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.3.ebuild,v 1.7 2006/08/14 11:00:28 jer Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -79,8 +79,8 @@ src_unpack() {
 
 	unpack ${A}
 	epatch ${FILESDIR}/qt-4.1.3-mysql4-support.diff
-	epatch ${FILESDIR}/qt4-parisc-linux.diff
 	cd ${S}
+	epatch ${FILESDIR}/qt4-parisc-linux.diff
 
 	sed -i -e 's:read acceptance:acceptance=yes:' configure
 
diff --git a/x11-libs/qt/qt-4.1.4.ebuild b/x11-libs/qt/qt-4.1.4.ebuild
index 4c9c13713376..60ed820062e1 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.6 2006/08/11 12:57:57 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4.ebuild,v 1.7 2006/08/14 11:00:28 jer Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -78,8 +78,8 @@ qt_mkspecs_dir() {
 src_unpack() {
 
 	unpack ${A}
-#	epatch ${FILESDIR}/qt4-parisc-linux.diff
 	cd ${S}
+	epatch ${FILESDIR}/qt4-parisc-linux.diff
 
 	sed -i -e 's:read acceptance:acceptance=yes:' configure