Fix compilation on Solaris, --force for non-existing? libxkbcommon dep

Package-Manager: portage-2.2.01.20430-prefix/cvs/SunOS i386
RepoMan-Options: --force

4 files changed, 37 insertions, 20 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 743f84ce3378..225d37352525 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.588 2012/05/05 03:52:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.589 2012/05/06 14:55:32 grobian Exp $
+
+  06 May 2012; Fabian Groffen <grobian@gentoo.org> gtk+-3.4.2.ebuild:
+  Fix compilation on Solaris
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gtk+-2.24.5-r1.ebuild,
   gtk+-2.24.8-r1.ebuild, gtk+-2.24.9-r1.ebuild, gtk+-2.24.10-r1.ebuild,
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 6c285efef953..235d2aa8e830 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
 AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2
@@ -49,6 +52,13 @@ EBUILD gtk+-3.2.4-r1.ebuild 7010 RMD160 78e324b317bea6108d22ddbc9d5f59ca90b301cc
 EBUILD gtk+-3.2.4.ebuild 6902 RMD160 3091f6cd25f61fcbc020b998b3dc16ccb4ff1674 SHA1 9165077fe3ae579e4c2a705fd67fe3cbc7934817 SHA256 b2aba078836967bf1479b807b09d815978991a186e5dc29c3c2114de987041b5
 EBUILD gtk+-3.4.1-r1.ebuild 7126 RMD160 3711bd05b5d2cc0c63329c6601632094fcefdd48 SHA1 1909af84e98d2e0a6ea0e755a24e08e7b24b89b8 SHA256 2965cb0775769d3a488cee6e1b39f55c257615264161c1813c88267e13f23e9f
 EBUILD gtk+-3.4.1.ebuild 6934 RMD160 6f91b98214aba215afad9b0b622d32801dc2a274 SHA1 35d6d32e68e37e1841256f3d95d2b152cddbf30d SHA256 03bc0da89fbf702fc404b01272596dda5de3b98a527059874a4cd86ac2e61892
-EBUILD gtk+-3.4.2.ebuild 6934 RMD160 d7a547d99c65b278afd89ffcd3bf2a2c7cb2c237 SHA1 70908cad4d281714060706d9161c1178bb0292ab SHA256 3b540e8e839da863a9e1c8620957eb2199a48f6a69ada0c8a86c4f1665c29661
-MISC ChangeLog 90956 RMD160 272bd63368b066b4706c4a7c4e2f0a31bffc867d SHA1 5f5cbe79fd95cc683e923307ab1b52253a1ed84c SHA256 6bf1d08fbbf58668b81a173b8bf3f3f07fc7fd82c94f124e02d8f5217607cdb5
+EBUILD gtk+-3.4.2.ebuild 7111 RMD160 49ca0ba851cc52ff4ad71249a133467b66c239a7 SHA1 f4f0108b0374295f697a93d4ef07bae5acd2cccf SHA256 f181cb56765247871fac8ec838cddf56b1e82244893543ed4580ab0dd706a49d
+MISC ChangeLog 91057 RMD160 a06e7acaecd974f719001d4cbf0e811d4b6b1a28 SHA1 d8a0c16745dcda867c2e9d0e8dee73f2bbc80556 SHA256 4ff86fde7658ece204378c77b3fde328173858a7e1f16eed763cfd8d5d2f106a
 MISC metadata.xml 870 RMD160 a94fb5c6acb8fb9015e5f4c40c8b9b1eb3ddf9d8 SHA1 2769a95a236ce2a234c7d5bd75231de142345445 SHA256 90835d0edfdbbc25c781b0c7bcf9b7b6db82ce5f412082ec56d250891e1853ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (SunOS)
+
+iEYEARECAAYFAk+mkOkACgkQX3X2B8XHTomdSQCfXXDgap1fWaHrcZ8CzNdrMLGo
+EowAn0EvJEHIpvRyl/1OB5KnYwwzuA0d
+=gZa+
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.4.2.ebuild b/x11-libs/gtk+/gtk+-3.4.2.ebuild
index 5fb8c121dc5f..dd98ec3d7563 100644
--- a/x11-libs/gtk+/gtk+-3.4.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.4.2.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/gtk+/gtk+-3.4.2.ebuild,v 1.2 2012/05/05 03:52:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.4.2.ebuild,v 1.3 2012/05/06 14:55:32 grobian Exp $
 
 EAPI="4"
 
@@ -103,6 +103,10 @@ src_prepare() {
 	# Apparently needed for new libxkbcommon headers; bug #408131
 	epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
 
+	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
+	[[ ${CHOST} == *-solaris* ]] && \
+		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
+
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
 		-i gtk/tests/testing.c || die "sed 1 failed"
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 25cde6ce96ea..462a84f93841 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -15,24 +15,24 @@ DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 RMD160 538e626fae80ca8c
 EBUILD qt-core-4.6.3-r1.ebuild 5128 RMD160 c4415638e41f79147a94c36f6e089654c5040874 SHA1 1169313a308c4b01a0b8a74742550704d6b5bb2e SHA256 e403781b7f9188ffaa8a58c5e82d2fb1c802e50a8d9fd4efea8e26f141ef1f97
 EBUILD qt-core-4.7.2-r2.ebuild 5153 RMD160 931395bd70ce9f80d79754377034856ee56aaff3 SHA1 338a4265d9955067e3b923bcf1ebbbc44d589bb5 SHA256 c8f26fea402bcdfe0e6cd9d2a0267599e5d483024ee8d357d2bfd15826096f66
 EBUILD qt-core-4.7.4-r1.ebuild 5173 RMD160 a8f8118c4df899024978d80e0339f9153c999dc6 SHA1 c4978513baafbac348a492a6082aef879aa0a906 SHA256 5bd26485ff70124ba2dd7f529f39c495f79d3577845b917d580b87371c9fa8be
-EBUILD qt-core-4.8.1-r1.ebuild 4749 RMD160 f35c36608bc25dc2b12487cd4da4384829c9a3c3 SHA1 18f174f893f842f878454743fb7f665b1ae21b5e SHA256 db95c63eb377822e21a06e37d28df630c9275f07061d0c5cab1dca2086fca703
-EBUILD qt-core-4.8.1-r2.ebuild 4800 RMD160 fd9a90af18dedf7b7615cedb6da445d8475f7552 SHA1 8f22e90e78f70516cee14862e1c46fa1c43281ea SHA256 5d345fa015e69eb896c3096d279e370e49e1edf9f549b91099b9b71dd1862cbd
-MISC ChangeLog 21806 RMD160 36c85c9cb39c3172102325a3de9fb9c5953c7605 SHA1 e8b3aaf9e4af2c40d137c1b94cd1b8dad115451a SHA256 71a6f8a0a014cb3fa82914763ec2bb2124b388d3dc05152dfcc2b7593466f22b
+EBUILD qt-core-4.8.1-r1.ebuild 4696 RMD160 02910e69df8cecca40b7baf01ebba70037df33ef SHA1 f9a760b186e31b8b9e39fa785135f98222e40aca SHA256 33deff45f06c8e842ae5857e5fe6ff5200727ffe00711134c3aa5ff9d1e01a27
+EBUILD qt-core-4.8.1-r2.ebuild 4747 RMD160 57ea90f48e19b4ded5a4d24aeacc3c67dfcdaba6 SHA1 f3636d76310c8a0b998693f53c4696edd66a8547 SHA256 161bac667fca32dceb6491a02495ba8e725d362d1e4ffc6ac8a744103ed9b557
+MISC ChangeLog 21933 RMD160 768a78534ae91e9834992f9a54eee6bea1f7c084 SHA1 419a8d25f8683864c1126bb90d8185b4a5a68958 SHA256 d2835581260cc92ebbb451b9106897c8ef9e3718101df9749c066e77024bcdb4
 MISC metadata.xml 942 RMD160 e6e15c516510312f8e71e6f2518f126bd0fa77c3 SHA1 6a8b4d7d8a04b7d7a548a8eff98f3d5599c5dec2 SHA256 3b57581e80ed0df200a4f20843f4fc1592bac336c779dce8864881d19785cdf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPpA9+AAoJENXLsxwXqFxy/NoP/1fNs0e9IOw/HCz4ISIQzY3K
-v6Z/67+bAf3HdvzvxEg6ahp5Ag9BvpK0P7GWJhDnWZJPnMrVvhF23mm03zolAsMg
-PAvKiBEHZ8+qDaygf8UNPE8yd9e8l4TYOK7y+/5zP0eJ0NqiVB4AhGufesGgSIDv
-jDT/bU7W4tN6ZAcHjMLxIrGPKwUxHd1A1cJuzfPUC8Vcftphhm1s2UwTTdz6Ihv4
-2RZPTIaURKQjeFngWk//U6GD/PcvGIDik7MdZwQodgeAmDY0HRzySUfZBL+YiiIf
-d8oYjBXKMr5RoGnSk5ItqXFPIzOd5I88VGZUDJTepN/NBdjnYyBK4QhZ3FIgGtZH
-CgQA4ErVa9eu34+lB2BhjRwQ1FHRsrJvLHCyWBdSE/aaU8Ddh2i0q29MOuNAXpgA
-+qXShhHEAQi82lHSsftYPgs9EdN2TgYajLhMsdEP0gVTN54756mlBKuO+qbDfZH1
-/NiFxaoyVn5HF/kt+O3RaCaa3rHwKeoyrOh0VM9lcjYD/Y/suri4p1Ln2pGvdjN0
-WnnjaJckBrK1LUD0KEWTCbwOjoHM2Zmtdm6T1xqswJ6WJFdBHgym9pwYe1gjt75q
-ikyNSI1OJLU34AJ0/cimEkG2ARfrGBp48cW5Tp5fPM2VnL4+NU18PLzEutq+gc3u
-pLc+TKClJo8wTdn6Qk+l
-=lnG+
+iQIcBAEBCgAGBQJPppG8AAoJENXLsxwXqFxynugQAIzzHMSfrLtYOWuP7ISyypG/
+KJJ8qlFlZcmRJCVrZdyObh05KG4E68jTaUpD31Jb1ubzFxZx/s19otXUeDgguxTi
+XlLk27PoGnVfHFgjaZCh8kWJ73k/Zc7pmHR4xaixSneaui1BoG2xa6bo1Nq3dyjK
+nE79DN/kLSFWFq54Ogo4W8Hc/Eksva6t6FDR30G/VinPv7m4UWK4tpbSvj2c8Hl6
+SjgKAXf1diZ/M94TdgvaaIVx8jaSrtLGGfVMlFBKr1R4fLbP7vmFnFprJV0pHICw
+lD4rF3bTc0eZP6bfKbMGN18b001nYhk1em11EZq1ATyyi3unWTUjEgy/NdKG/S6m
++m/wR+TEaDfR6DpdfoUvoUpQOocMPcj5XGE34FWIyv3SFf4f7kzGFodEet9x0WbB
+bgNKtWPP0y90HbrYALYviTO8HlfZ5qIim9diYLgb3HAjQZ6BpMIkIZrRZdBR3/kC
+27C0cGaY4xhg11FdOVKtilDeHqRS3wgMtO89RpyOfYlW4tPnHNSGg8V7Fx+3v/y2
+5OBy3vpN5LjIfOQYyQDIc/rBINUyUQEg3yTJ6tzN4vcld5KalMj5P9GUyV1cUdz1
+/aQbuN+cgPfVAFI7NXlkxhlRFElBqcx7r5VKml+Uf2cMssCaOfEhOX9iPewxelgY
+ny/WSJ4zzCkyb6yuy4ji
+=5jEl
 -----END PGP SIGNATURE-----