Fix multilib build when dev-libs/qjson is missing wrt bug #541438.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 22 insertions, 17 deletions

diff --git a/dev-libs/libdbusmenu-qt/ChangeLog b/dev-libs/libdbusmenu-qt/ChangeLog
index 829d11792ca8..2ee3229d5299 100644
--- a/dev-libs/libdbusmenu-qt/ChangeLog
+++ b/dev-libs/libdbusmenu-qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libdbusmenu-qt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.40 2015/02/26 12:41:00 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.41 2015/03/01 15:33:37 kensington Exp $
+
+  01 Mar 2015; Michael Palimaka <kensington@gentoo.org>
+  libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild:
+  Fix multilib build when dev-libs/qjson is missing wrt bug #541438.
 
 *libdbusmenu-qt-0.9.3_pre20140619-r1 (26 Feb 2015)
 
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index a8a96ccc8fb9..e4c3e0f38537 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -6,25 +6,25 @@ AUX libdbusmenu-qt-0.9.3_pre20140619-optionaltests.patch 383 SHA256 ecd136a04d75
 DIST libdbusmenu-qt-0.9.2.tar.xz 242888 SHA256 ecd1108f637c4c58946aff2aba70010f8060bd87c1acc85a917c2b3f43cf406d SHA512 93471a03cfc127babc58cf07b1caa30ae901ad2d213790d5085117f331a6cea0d2ab6b5ba21abdf582c40f172ff8e8168a185fa1a27d7d367a01a3b6ed731155 WHIRLPOOL b38e23c9def7802040c8ce94bcce6a644cf5e088a90fda091a2ba75b5a332b36d97f00d998f8c1b1942101eceecdb8c78612fcb3ee5f0604de98f65aa33cb3f7
 DIST libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz 46641 SHA256 e531b29388317f48e22c652c7111e9c7750aa7d429a72742c49a1c8af1e61968 SHA512 791c1904a1c960a94bba2c624469d8a9c1c76e14fc40917feb5aeb8c55acc6c68a0b03509037440f35ad8416710cbe705c1b117b23a9a684b6ff0d919d1d5e18 WHIRLPOOL b76294a4c9cdf943594f685aeae13e12db8d6f0b85f4a86031023c15072cdae619ff70c95e8db40eaeb9acb8d234e48e45ca79899c835b068387df040f688160
 EBUILD libdbusmenu-qt-0.9.2.ebuild 1584 SHA256 d5d2e3da65c5fb7b5e6d7a50a2b97999046e37082abca4f1456093f70a701294 SHA512 49af1dd63fd3bd975df7a2642f4758e89c2d30ca7fe6bfef6e1be5080f3afabe27d5512c17a769d7abe5d54894f39fd5b91b4a36200311a69d697320629048b3 WHIRLPOOL c213dde5f85466f8c3f964f9439e4146b6e09e527ef846b1da35c081842e41fd9c5ab9ef22cf3af92e80d2517365e4a4b9c07e5e1965ffc9baa1ce8897a5f850
-EBUILD libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild 3125 SHA256 677d29573d0c33fb3cccbcb6d4360f6dcf9ec9dbaf729f2a3e2fe9f36aaf9d32 SHA512 5e080b03c157371cf42f36fe7e5e61c5193814e275f18fa4468c0bb2a28519e6d5cb549a772c764e9a30edff94a7a9d0f9f4571ad63da324d41ae4e86124f337 WHIRLPOOL f291f01e3a4befb9353f2ead89337336a2bdb522fe4a6056762dcb12f43786481eb9a5247390ab8d00a2c6cd084b8ec480f2ced45d3187de71eb24eb4c478c2d
+EBUILD libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild 3157 SHA256 2244a9e7a7fb740a6594b58e4c9fbcf64248072a746d9532582ce605fbd067ae SHA512 2c12b5cfa3367dc9f1128f2df87d23099cce2975cbc160e37826b818cc4d5a2f57a35a6f0da9537d0f3c7c477d665c240956755d42efd9a17056a54d50accfe5 WHIRLPOOL 7ec075595008cfcfa526d0691a6ae73419893782072c822a53a1f13888c136561bfacfc1bd02ea7f56a8b0e7cce95e06c6775f45fcda0eb59f801e5472b44566
 EBUILD libdbusmenu-qt-0.9.3_pre20140619.ebuild 2341 SHA256 19640c1957284cb36100b73e2c7325132b2fc53a38ec13a6316c8ffc9441bb1a SHA512 6dc1c277b3cae007df65567819f502fe5807f8f31b8c746d59aed684afb1f4204ad40cdbfa69ac169d79a085b95477ba5ebe061a0fe7153ffd8a019a74f8af65 WHIRLPOOL 6c0e10dec4057a84a11f56276093165b6383bcd29a37d476de869b6b87e2ad3313f765a5fab8423b7745407b320b31e070368f73a016bb8a17e2187f75dc4395
-MISC ChangeLog 6187 SHA256 45f60e4af104539dfd683cfee2b4d6c6e594929379eb9e160b7f6c5e77a31ec9 SHA512 3d1208b23e54ab51244f4395259a2239e51ba7247677dd9f2a071fe738b0ddf20bf82fac4e08ab7baa72ad36ec73757b969acf323e8d467ad958a9e5afac79ac WHIRLPOOL c8ca1f013e615a64758b49bd376509e0849cbee2006d72a60bf6f420592fc05b13b424d6346d8680cde3614a14d8c43ebc513c69bd6a4a1bacc628fd729c5829
+MISC ChangeLog 6359 SHA256 43282a027ecfbc5ae55400a06967c7b90808784b5f2797e66e2161ec6d0ba51e SHA512 20ac803541e26368e8d318dc160a2f5210777f093cd9058f4ae25d2a9a92effe26dea4e2cd131e9c97cac1f5f420991285144d46a9e77f7da44ec3a80ade06c7 WHIRLPOOL 6fd6d3c77520adab72c36577a691e9d7ff26b127025d10c5db4aceee0dc7390b07f04a83b5a9c954e981eb30501620fc423818326fb709f126664ada9013dc8d
 MISC metadata.xml 255 SHA256 dc41bad6a32aa70aaf9724aa119a3bfbe4b0c81e29add0cd88c3f71223344984 SHA512 b8add7d8b375b51c03bce2893170e1dea441882876963cf799f349a0bf894312f397d0f7373914e10073b4aa2f0efcd0ad824dde519f1d28aeff46b0c1cc1675 WHIRLPOOL 790f2d96fc4ca8e044eba597c3954a9ebd1a3fd0a372f4b443a1d61c9155d0c7c9ab3d27393568e1112ac376ef87652772b5313945d5b4691f17cfe4603d3efb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJU7xSQRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJU8zFVRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7OJjEACZhv68BbJJEdYB+EwpxBUAIR0hB9+nO+v2nDM9PZIAK0Sma+WYW9LlLsoz
-JgV4n8gRa3GX4AlsYhYhv1b36f5a2C7AU2X/PYJPWmSDjLjTk/uZfDitvzf46vjO
-Z6Hu3CCAIMAZlpJP/6WL6qHZWpy5rtLBRZNzcQkhpCgzjuDlQ8oiCRiuGZxEc3fF
-PxAHhB9JhOP8wtNP3aAV9t0YQsILnRuZcVnuHVmKq7Zx+dHoHmSIhe55pNl5jchU
-muJK2THlHTSGiaeRG1Lod/QaHPwQoZgfQgbM2lEbA9wRydav+TcblZCnfmdWaENr
-tcFJmaPCfOGoaMIn1LONrqwWaVWUUphHZtAuXvpON6gDK4YZtlUdHKQW7TxCL/VB
-VIHS3gZaOsbomVomv/BC1hK+gJK0aHs5HA6t0UwKUNNoJBzmap9feQVsB7blF7JX
-Ou5xYLWiF76K0OEAw3gS4VbWQz0RyCE/yUDnN4Bpn7MSQawv+rh2vlYJDHmHhX2q
-2mnM2wE5v+nOS65u162JXcqcooh/M/IIb2SPR5/03lPnfm+TWVpGiVJ7pXUFgkKx
-CtpDGYxUoagADwAVH1QZ9r8+p7qAx+/sBeSQ9XHQ8EefHoQ+6XJbD089rrWXyIap
-hisyb6LcgPPZk1jVoSnstQxMKbcArNWbNJ6Qp84zuS8/qYt/3A==
-=9b9q
+7PVIEACVZ9ZhbAmyA772DYaLzSb0Nxucn4KhYz7FgxhTD35xb4G9LuGxKvgWetLF
+N60/15XLofhG+MUGNl+A2umNA5QLPQh8Y2WuK9ejPTCGFI+DlxjO1Bqn4dyR4psl
+RpMUh8TlaV2hGMGGocT4IXpwdNtCWj8QUk8xi2ilxf3KWDyvtPiHLXYdrWb5CQc1
+Rdu48gKjrUmY3NBW1xQwO/D5h0T1IST7S6wAMMs7aYMRAl9GTbFwsWcWhbOm39M8
+3V1atab8gaFGRYjIPa2pUROUERIPaJewfDkKxcl9MCB90UEJAUJqKytuOlsbXSoL
+Jn+qBX2+Rk4bPMC/n995Lo/0oAwN/QCTyNFK+UDyRA7gNlmdXMxlCjqzft18NpnH
+QeTjawrwNtCYGySdupZ54uNSxAvRLdOSWe7aTwuRPXXD9+Iiqz0pSuWERoe//H0n
+jgVaBrEWbgLOGuXs751yZs4UScyxdgmOzSqk3aSBrTpFlSUBvfUui+gJQzscIFSz
+DHl/yPNiTp/mm14ttNaypdBQe2pXQWNzYlfUw+KceLnWu+WVMVz8GWZvNwlYgpLp
+lkW3GEej3LEo7Xo8gYOiZ+SqgvyBX3sWRsDp/xSQ+1iYyWtLtMWmLWR+srADFrU3
+i4uCh4d7N06Bpa1mARRwOICArqWAMIjJ6+naLe9CrSRqbEG4jw==
+=U2gh
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
index e10d9d896c74..5dc5f1359c26 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild,v 1.1 2015/02/26 12:41:00 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20140619-r1.ebuild,v 1.2 2015/03/01 15:33:37 kensington Exp $
 
 EAPI=5
 
@@ -65,6 +65,7 @@ src_prepare() {
 	[[ ${PV} == 9999* ]] && bzr_src_prepare
 	cmake-utils_src_prepare
 
+	comment_add_subdirectory tools
 	use test || comment_add_subdirectory tests
 }