Fix build for hppa, bug 367583.

Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64

5 files changed, 47 insertions, 21 deletions

diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index ce830f182b34..90f41a2a6dca 100644
--- a/x11-libs/qt-dbus/ChangeLog
+++ b/x11-libs/qt-dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt-dbus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.102 2012/03/29 22:09:48 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.103 2012/03/30 14:48:08 pesa Exp $
+
+  30 Mar 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/qt-dbus-4.7-qdbusintegrator-no-const.patch, qt-dbus-4.7.4.ebuild,
+  qt-dbus-4.8.1.ebuild:
+  Fix build for hppa, bug 367583.
 
 *qt-dbus-4.8.1 (29 Mar 2012)
 
diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest
index 88385379819a..15576b5a476c 100644
--- a/x11-libs/qt-dbus/Manifest
+++ b/x11-libs/qt-dbus/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA512
 
 AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
+AUX qt-dbus-4.7-qdbusintegrator-no-const.patch 543 RMD160 829904d224ac16641bff538ce5ef5a713430f671 SHA1 45ee246c7518565562f0dc06e59b3da3fe154e82 SHA256 a05de8d906be14160e5c951856fae2796b6f6eed91ed4781e8197433e94ce922
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 RMD160 3e47b09663a89973b1c8628506c995dfc2a5387c SHA1 af9016aa924a577f7b06ffd28c9773b56d74c939 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
@@ -9,25 +10,25 @@ DIST qt-everywhere-opensource-src-4.8.0.tar.gz 238580694 RMD160 7506dce774321548
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 RMD160 538e626fae80ca8ca5aac575919f469a9827ad4f SHA1 a074d0f605f009e23c63e0a4cb9b71c978146ffc SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8
 EBUILD qt-dbus-4.6.3.ebuild 1073 RMD160 60a6d5471a8a628af6192289d9743e0c189d3177 SHA1 3d762db05eaa1f2957e910e81c55e4c4dbacdc85 SHA256 c6e5a0e90e06c6391a70be239eeeac5e29cc02363cb498a55764c8927fcbd48d
 EBUILD qt-dbus-4.7.2.ebuild 1003 RMD160 65fee1a4228ca3c5a121d2e65740eff0894eb2d3 SHA1 25a259c54a68f1611dac2f250d651d0da3bc9171 SHA256 b2f1382b6874fba3af0581d065200650643614dd0afba1a66dd4549c0817fac9
-EBUILD qt-dbus-4.7.4.ebuild 1000 RMD160 bb0ee530890c7aa78e4f966dc2bc7ab5998c8d7f SHA1 25292f4df51719fc99a35b9878c5897724b7d549 SHA256 ddf2f342bada772091c2c84fa1e8ee67a8cb3eed7c26106230935ce54f1457ae
+EBUILD qt-dbus-4.7.4.ebuild 1068 RMD160 8fe4dd8e978b2411fd1382eb1e3a21ff3a8af512 SHA1 7193aa6b0a91075b52db1776efab7bd3de9afdff SHA256 babfde1f3084316d33b53970c7280a40bbdf39f420def7d0811d5ee6bfc47a49
 EBUILD qt-dbus-4.8.0.ebuild 1187 RMD160 2fe6037c0a745f65759e32b067e7af8aecd75c2e SHA1 af4740c108a0f80c164a4d0ee294f1b15bc06e39 SHA256 eb6cab919f1a7bdb1b3f37847ad76a7fb47c2d06add2261367e1fa73c4606212
-EBUILD qt-dbus-4.8.1.ebuild 1096 RMD160 d88b8d1adad31b91d277cf823721d31c596f55d0 SHA1 5d00daaa7b31b4886462f88174ff87b8a5cc5d95 SHA256 788bd935e48c69264a8fab4dd970d713508e72864976ac0d5cb450a772add8a9
-MISC ChangeLog 12353 RMD160 97ec0e18a36d66a12ab5b9d6c96b308af2e2bafc SHA1 72b75c4156e9012d167fe6b9dcf3c4fa2fef329e SHA256 a7c592331c84d9945ee75b1d42d42c98845d5a3e9976b25835852c17ee5e8774
+EBUILD qt-dbus-4.8.1.ebuild 1165 RMD160 a7d1e5a5f49459f135c76ec3ca5722ce9060a99d SHA1 ed2ef01d8128fffddcf20e1373f801876e1cb93d SHA256 a91c451ac063bd369402b2acbead002ee1057c766ef746e2990417a04eff3b0d
+MISC ChangeLog 12537 RMD160 2c9bd8adb4007784a514eb8363ce7cad57b45c91 SHA1 5d5467108f5217869ebaabd26b5e578809e45225 SHA256 363d373f64d79ce364fb99f48005d35abaa7cb15c06050a92c650af4e9f32b17
 MISC metadata.xml 441 RMD160 f7143926e647f97392fcb495efa2fe81b6c54e09 SHA1 7fdde4585cdf940bf0d2ee85d1ad78700dd2f0eb SHA256 7a0f88519cf918727cd6de5bc790da0484ddc45eea342c7ec241915c0d4927ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPdN20AAoJENXLsxwXqFxyuCAQAJxNokrS8oW2bf/vSpOQ90B7
-P6EkX6woqqvyUSkJqVXYwnYD9YBf6tdufBEwJieWhbwohart9V7Ht15frWPDb15A
-QszJ3xDWb66SIoABt7aTEfkiaRY4RnKROjer4vbHlnuXUzjv8FK6E0LIOr9ew7ox
-wxGJSgKHh2AqrA95PrsjTn/d9+6JYL6nL7Tq2VpnvAWiOC6VirMidgmc4FvJGr26
-bjs69j2Jhj1TUyDSd43e8yCM9tsDOCUXL5Vsj/HiDEL8oK8TlnIhx8eXSSGTOkPa
-ZjaG22BLiRj2M8E3XlN0bNAHgxQ6JI9Yp1NwgqnUr5iFoO9OAN0hcLD1nNg4F13a
-FGFKGXtsbn9VOBbfwW2YmnfgVtocazdit+d4Jhg7WFstTXKrtr8kGSV9lW/tIosm
-BUVwX/XZrZKMhWJAzgtnF/OPEaDEBn8amqdeQ9UFcSpeZWe7jdBsCnuE4g5kCAOw
-rlf/D8qP6iZvJDi7R4hMxwOQ5oH4CRq2QnuWIHExv1yIy7/NfUYuhwEMnGFNkXmU
-vbcMGnoAEsxFlw3H0VbKiMh0wHXBloCjnj9vrtYYRoyP5XOSNyhKci+SUZpMnWGS
-Id1SW04OF618nA+rQpqJcYXmLilAwdtZk19+H2vq0bqLJVhyIgnFTTjo/+jwjHeG
-SV6DKbKadrroBKHxqqoU
-=V2TX
+iQIcBAEBCgAGBQJPdcexAAoJENXLsxwXqFxySq0P/iCpw/q4lgO/OZKTJlC0gLn/
+vv2PKEn1vhyqpM2DJx0nCc2t0sK5RvOY7FAId2fZhG7aboJnCT7SQh9DRLUo3YhP
+hsrL87mzfXT2gHDjiXBn21FXJPCVzd8TSWXIA2mrV3j1CwL7NafhW6rRjCrlBgqp
+R3ZT7bomak1YbtF9vWd/yb04uNuqjPOEINJCZQOa3FYWZqHc5MrE6+7wGeR/FL9o
+BpQQsUsn1VPGR30HoIsEomEqPNpj7Fd8Wl8DNpz1xQRPM1aM4KmCbuW+17laS00B
+c9I9jaIcVjSNuqnI1Wo9tNLWZBwBM7SSPtYnAvCIOZVL6KkfovSNn1CLZFJqmF65
+Cs88XUW2c0yITjIuEhmdZcDaW6HTU9WuuClxC2w+BIESNYfeyakNOqnGGmlg+iT9
+w4Dc2pHsNQVJpPbmZoM6RrIE+7BigVGcGpeiX3dc6SJsGG//wFYYa9hVQ+8PRPLL
+yUmnIKTs+6ftap7riUa9ciS3stzggw4vawWBoy+sHsLt621vCMIzJhG3XM68a1JE
+bf0XI7I0oCWprxXoHFmNZYgKWoFCC4A7GjKpI/SoVInUdV+8J862mLUae/ANZSI+
+Du9H0Fgto0SI9ZF1fPG1O0L7oLnLlIkTWi7sbA5Km/Cvstayuhk6UOT6AvcgtJzJ
+OFQBvuNpNb2rpk+CoC7H
+=U308
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-dbus/files/qt-dbus-4.7-qdbusintegrator-no-const.patch b/x11-libs/qt-dbus/files/qt-dbus-4.7-qdbusintegrator-no-const.patch
new file mode 100644
index 000000000000..086eb47a071c
--- /dev/null
+++ b/x11-libs/qt-dbus/files/qt-dbus-4.7-qdbusintegrator-no-const.patch
@@ -0,0 +1,11 @@
+--- src/dbus/qdbusintegrator.cpp.orig	2011-03-12 02:11:32.313467991 +0100
++++ src/dbus/qdbusintegrator.cpp	2011-03-12 02:11:03.795809176 +0100
+@@ -71,7 +71,7 @@
+ static bool isDebugging;
+ #define qDBusDebug              if (!::isDebugging); else qDebug
+ 
+-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS)))
+ 
+ static inline QString dbusServiceString()
+ { return *orgFreedesktopDBusString(); }
diff --git a/x11-libs/qt-dbus/qt-dbus-4.7.4.ebuild b/x11-libs/qt-dbus/qt-dbus-4.7.4.ebuild
index e2fa68fe6001..490ab9777d32 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.7.4.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.7.4.ebuild,v 1.4 2012/01/29 23:24:36 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.7.4.ebuild,v 1.5 2012/03/30 14:48:08 pesa Exp $
 
 EAPI="3"
 inherit qt4-build
@@ -14,14 +14,16 @@ DEPEND="~x11-libs/qt-core-${PV}[aqua=,debug=]
 	>=sys-apps/dbus-1.0.2"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
+)
+
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/dbus
 		tools/qdbus/qdbus
 		tools/qdbus/qdbusxml2cpp
 		tools/qdbus/qdbuscpp2xml"
-	QCONFIG_ADD="dbus dbus-linked"
-	QCONFIG_DEFINE="QT_DBUS"
 
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		include/QtCore
@@ -30,6 +32,9 @@ pkg_setup() {
 		src/corelib
 		src/xml"
 
+	QCONFIG_ADD="dbus dbus-linked"
+	QCONFIG_DEFINE="QT_DBUS"
+
 	qt4-build_pkg_setup
 }
 
diff --git a/x11-libs/qt-dbus/qt-dbus-4.8.1.ebuild b/x11-libs/qt-dbus/qt-dbus-4.8.1.ebuild
index 376286441e87..8bdd4491b6f1 100644
--- a/x11-libs/qt-dbus/qt-dbus-4.8.1.ebuild
+++ b/x11-libs/qt-dbus/qt-dbus-4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.8.1.ebuild,v 1.1 2012/03/29 22:09:48 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.8.1.ebuild,v 1.2 2012/03/30 14:48:08 pesa Exp $
 
 EAPI=4
 
@@ -21,6 +21,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
+)
+
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/dbus