Apply ia64 patch, thanks to armin76

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 62 insertions, 4 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 1100806f1308..b5fcb2592c6b 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.49 2009/05/15 18:38:43 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.50 2009/05/26 16:19:30 tampakrap Exp $
+
+  26 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  qt-core-4.5.1.ebuild, +files/qt-core-4.5-boilerplate.diff:
+  Apply ia64 patch, thanks to armin76
 
   15 May 2009; Tobias Klausmann <klausman@gentoo.org> qt-core-4.5.1.ebuild:
   Stable on alpha, bug #266201
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 1c3758bb9b11..07047c18370c 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0167-fix-group-reading.diff 895 RMD160 7b272aed4d3bc2931238d5ffe9d43fbbfb21ec7f SHA1 2d620aa9dd0a464de39fefbb2caadab16a4a4db3 SHA256 92a40c35517b6dbe9bda279ed71ae0bcd9740297c160773ce760abea38649162
 AUX 0253-qmake_correct_path_separators.diff 2951 RMD160 2731a8eda8539d2b1fcee313274ed4ee42a231cb SHA1 8a64d7e615ec4b18003d8b01b05c26a585e05208 SHA256 8fd5b5a2abd0d5ac564a2fe14b55d2a6cac3cc1e0dd5af1e9652bcc89bc1dd01
 AUX 0257-qurl-validate-speedup.diff 734 RMD160 cf93218fb0a49295dc2f61d32d892c8adda99676 SHA1 fe87c84e984b7266b27261f31c37c64e77b85876 SHA256 36684d26dace32475caac4a2fa8e6d051f0bd0fb831a4f323b2d244e79272bc4
 AUX moc.pro 2769 RMD160 42bd282eb8e24cf291a512766270e7afed6e56be SHA1 941513c6c83813992bb91f4584d3e015295baa07 SHA256 e0898c630e079db9693fe494bf37f6b395c291373ed7edbd0827ed7d1e085a2e
+AUX qt-core-4.5-boilerplate.diff 2306 RMD160 bd761cda5fe6ddb92aa583e538633b505de377f6 SHA1 27af275633825f9efd4da9aa38e3b4c670d1446c SHA256 1ecabe6ff860f2ac97b5cc9e38f0a06d6d9bc267637359fd02cc2c420086df03
 AUX rcc.pro 3440 RMD160 42e65efa8dc027f8a2b6c933243a91c1cac96092 SHA1 017ea0aea74a27012608f8be8f301d3cda3dd2b7 SHA256 b09c74046a97ec87b19a05abfe08d959040b737430e498269fb0d0c00bf0a38d
 AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff37256b5c966e4d21b0fb6cb64b717f3d07 SHA256 904084b6d936fb9bab33d3592ec69dc9872708a74834f0cb498e8153f784c7fc
 DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff
@@ -9,6 +13,13 @@ DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0df
 DIST qt-x11-opensource-src-4.5.1.tar.bz2 114667436 RMD160 702d7c6bb9787cd5602dcb8afce52bdfcfd52179 SHA1 50ba9b6d2eb7056e47dc53775be509c4ff6ec015 SHA256 b994c40e41386c9d82f025dd9198e1161717021216680adef97da3f1b8947c75
 EBUILD qt-core-4.4.2-r2.ebuild 5414 RMD160 894edb588c540b203ba0b66df806484dd751f020 SHA1 68502342bf8441a027f540a9ca86d3e3ff5e9489 SHA256 1514221df5fba68ae7716e0ed711d21996c8608f753a813b4a82945fa5f14c86
 EBUILD qt-core-4.4.2.ebuild 5145 RMD160 f2717b2c4566239f5b47ff564df86b5313c42ce5 SHA1 9c0086c24e4bf13185aec6ec642c93e5df57529b SHA256 adea55093263608cf0c38bee1c0476e046b0ac8223ad47038addc1da49b5a525
-EBUILD qt-core-4.5.1.ebuild 6030 RMD160 98f45b0b730c436b023f22fd93f7670d6f3e78f0 SHA1 a63c549de84b1d1bcfab7f732874f04ecf03c72e SHA256 7d056597278066eeeb3111b24e3765b5b0953ad727d55d4f57fd3abd29f2838b
-MISC ChangeLog 6709 RMD160 a7ef0496edb62f7d159797ec27845324338c62c5 SHA1 cd8751df6f485966cb10e16be42d83151a0f8aef SHA256 d4c8981bb2b7df4ed0527e6feb21f6d7f278daa1823e354b51f442fa64d91af5
+EBUILD qt-core-4.5.1.ebuild 6124 RMD160 e87af47031268b63d567868e84cd771ef4fda1dc SHA1 21854baea0a925248cefabc3ab69456083883e5f SHA256 8a24daa1e1250651f373eb547cc0eb1bb2d2a1d97791a09c78e1174da73011ae
+MISC ChangeLog 6866 RMD160 018b1ee3ccccaab59505f50f9c9ffa880a1abbec SHA1 d32bab4eb884758b5eda23dd836efb922466d4f8 SHA256 818601cac87fa518088631ebe1d927e3748a4aa7922365dfa0264c56a431096d
 MISC metadata.xml 405 RMD160 7ad4cec9a392e8164062dae2935e2c59ba52b503 SHA1 104a2a88f1cf174e9e4827b639a73d79bd0fba2d SHA256 cce5d387ade0a1412bf70c58c7b0ab28fd488cc60e458ac66296ee632d893bf8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkocFpwACgkQjDdoMVfcAHgdCACglkUpqDEv9AjYQ8HfBpb8D8O9
+BXAAn2dQBEa0WSjpR4+aLXkHHXQJ7cSJ
+=NVWf
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/files/qt-core-4.5-boilerplate.diff b/x11-libs/qt-core/files/qt-core-4.5-boilerplate.diff
new file mode 100644
index 000000000000..ca9c028774a8
--- /dev/null
+++ b/x11-libs/qt-core/files/qt-core-4.5-boilerplate.diff
@@ -0,0 +1,40 @@
+
+--- src/corelib/global/qlibraryinfo.cpp
++++ src/corelib/global/qlibraryinfo.cpp
+@@ -525,35 +525,6 @@ void qt_core_init_boilerplate() __attrib
+     asm ("syscall\n"                            \
+          : : "a" (SYS_exit), "D" (0)); _exit(c)
+ 
+-#  elif defined(QT_ARCH_IA64)
+-#define sysinit()                                               \
+-    asm volatile ("{.mlx\n"                                     \
+-                  "      nop.m  0\n"                            \
+-                  "      movl   r2  = @pcrel(boilerplate);;"    \
+-                  "}\n"                                         \
+-                  "{.mii\n"                                     \
+-                  "      mov   r10 = @ltoffx(boilerplate)\n"    \
+-                  "      mov   r1  = ip\n"                      \
+-                  "      adds  r2  = -16, r2\n;;\n"             \
+-                  "}\n"                                         \
+-                  "      add   r1  = r2, r1;;\n"                \
+-                  "      sub   r1  = r1, r10;;\n"               \
+-                  : : : "r2", "r10")
+-#define syswrite(msg, len)                                              \
+-    ({ const char *_msg = msg;                                          \
+-        asm ("mov    out0=%1\n"                                         \
+-             "mov    out1=%2\n"                                         \
+-             "mov    out2=%3\n"                                         \
+-             ";;\n"                                                     \
+-             "mov    r15=%0\n"                                          \
+-             "break  0x100000;;\n"                                      \
+-             : : "I" (SYS_write), "I" (1), "r" (_msg), "r" (len)); })
+-#define sysexit(c)                                                      \
+-    asm ("mov    out0=%1\n"                                             \
+-         ";;\n"                                                         \
+-         "mov    r15=%0\n"                                              \
+-         "break  0x100000;;\n"                                          \
+-         : : "I" (SYS_exit), "O" (0)); write(1, 0, 0); _exit(c)
+ # else
+ #define sysinit() (void)0
+ #define syswrite(msg, len) (msg); (len)
+
diff --git a/x11-libs/qt-core/qt-core-4.5.1.ebuild b/x11-libs/qt-core/qt-core-4.5.1.ebuild
index a4099fcf3ec7..bc7e23a62203 100644
--- a/x11-libs/qt-core/qt-core-4.5.1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.1.ebuild,v 1.5 2009/05/15 18:38:43 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.1.ebuild,v 1.6 2009/05/26 16:19:30 tampakrap Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -49,6 +49,9 @@ src/3rdparty/sha1/
 src/script/
 translations/"
 
+#patch for ia64 requested from armin76
+PATCHES=( "${FILESDIR}/${PN}-4.5-boilerplate.diff" )
+
 pkg_setup() {
 	qt4-build_pkg_setup