Add patch to solve build failure due to missing include directories, wrt bug #495148.

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

4 files changed, 40 insertions, 23 deletions

diff --git a/kde-misc/kgtk/ChangeLog b/kde-misc/kgtk/ChangeLog
index 2b534505ba5d..46f97a01c746 100644
--- a/kde-misc/kgtk/ChangeLog
+++ b/kde-misc/kgtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kgtk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/ChangeLog,v 1.31 2013/03/02 21:30:12 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/ChangeLog,v 1.32 2014/02/26 17:00:08 kensington Exp $
+
+  26 Feb 2014; Michael Palimaka <kensington@gentoo.org>
+  +files/kgtk-0.11.0-include.patch, kgtk-0.11.0.ebuild:
+  Add patch to solve build failure due to missing include directories, wrt bug
+  #495148.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> kgtk-0.10.1.ebuild,
   kgtk-0.11.0.ebuild:
diff --git a/kde-misc/kgtk/Manifest b/kde-misc/kgtk/Manifest
index 260948edfcff..a65f182e1237 100644
--- a/kde-misc/kgtk/Manifest
+++ b/kde-misc/kgtk/Manifest
@@ -2,28 +2,28 @@
 Hash: SHA256
 
 AUX kgtk-0.10.1-glibc-2.10.patch 624 SHA256 487fdc0649e7ba2508e83dacc688f03670f606b66582fc35e5652ca6911a3f89 SHA512 e67ebcc093ca5a4cdf29f55e5590b1878a8bd311bda6c789d525a3d6daaeded5541d6073d15f5676aba5b3ca389aeeeab190a04d9feaefb8845f3aeca0a60bf5 WHIRLPOOL 5c3aec1be8d19fbe7d4d265384599ecdf122a3a219209e2ef59cc9a9967147d9f9c0e301b6af29c073f676aa827da43092eca5e4ad0fb0522eb04d07074a0810
-DIST 36077-KGtk-0.11.0.tar.bz2 41195 SHA256 3ddfc2ab8ac918868feb085d12e78ad8913dd9ad18ff8816790bb444afa14856
+AUX kgtk-0.11.0-include.patch 653 SHA256 91690bbc48a287e6972db5cf03bea95caff5d862accfd007f586268cfd84ea2b SHA512 5d4239724307e00978c81da06ac6a558f074c040ca19494b879d3c5ee87b5335025529d640e012ad50e5d392aa389383c2db153fccd856fb46b33f0a0cd5a09c WHIRLPOOL 1017a39d5e96ca6e77380d2f8278aa384a08f43a1369b2cb09ccd141cf7938480974c8c3d5f0b97d91e1c3d8e591ca8250e63ae3f753e5bb733d7e0b417ff72e
+DIST 36077-KGtk-0.11.0.tar.bz2 41195 SHA256 3ddfc2ab8ac918868feb085d12e78ad8913dd9ad18ff8816790bb444afa14856 SHA512 9a2c573f89abfce11155ec71b3fcff51c658bcd93c8dd0a4065e50a322d9a89011d40e3d67d08df5f2b511ab69dee68566d071db573b43b3410ed39faf389617 WHIRLPOOL b72f6e77d097d12ad656825f23e040693caf7736869b5c3b263c7f7fe812a43fdc4ea0acf6f3b778d650e3b72f0de8f89298cc6442a9bc4f86f9b1ae577d4a67
 DIST KGtk-0.10.1.tar.bz2 44548 SHA256 453f60142c1ce333220ebf27d20c9053e3c8e79fbbe215a29d0942bfb3f2c509
 EBUILD kgtk-0.10.1.ebuild 1311 SHA256 01a1d11a380a8dd3a798f7a1c79c74450d7f18b856f3b59bb6d966e91ed4d425 SHA512 05b90946304e7df6723a94f0b9529601fa064668a587db1be9294c8175989a59f81b91aa65b36613098504f555fa47dc49deacfa7823ef295a35c3c91769a4ee WHIRLPOOL 28d641ee1c53566bc844275585ed081483869dfc0601a86de03d00495a4dccbb74ae00c8a634e0cf0b9a9d048e7e9d0a2a9fdc4f6faa0ed82c0edcb4970948b4
-EBUILD kgtk-0.11.0.ebuild 1240 SHA256 5ee70bdfba5382c98e40bdb43b823cdf32b081accd18c0085c97910dd2b392b3 SHA512 99f7cf98428fa5f3e3b75e29d0acd66b3ee857a336de3008b8fdf3535ba370a4fb7ef483a9e7abdaea1f56c987c06efbc1ddfb5c137501699fd56cdf0af3d396 WHIRLPOOL 1eb78fc7991295e04c63d6e9623b353bc767c4f07ee44c65248c52b9ec60468e4ea98c369fe85f887f87e965909d403946dd92d1d1ba0fb5bc50768bf9213795
-MISC ChangeLog 4854 SHA256 882b27b1ecac4596811c04e3a5f475036c9dfb3d12964b6bfe686be840b97633 SHA512 de7fd0fdc3a6a350e2c1d40c6b8952046aa77e9bb12323577be57c246d5363a9cd96acf275228445bc2c341579f4236715e90bcf1ccde56712dc9eeec71acdfd WHIRLPOOL a0e8d8dd6281a80c48e5be5a1c71acc711eaea2bdcaf6502d85f57f394a29fc9614b729496c871eb7e7a8a71db7558bf7b811cfc3aee35887464c5f5b504f378
+EBUILD kgtk-0.11.0.ebuild 1287 SHA256 27f20424c92ab8a46f4ebc42ae0cf20622863c07ce638a375000fa8ecbd5836d SHA512 dc9349a53b2fce2650c3489e6225bd9f35ccc7b77412b0d36ae6b652aa8896acec233783fea52d4f64308a5def22262c9d5a8e30064141fc904d286415645fcb WHIRLPOOL 0a7f905fa44396fa64015d963d517204d8c86207c614de8f3d3d11ae1f370ffb47f5f32884b59486ce23cf749180056ff7cdb8732b6a023017fee3f8a2f0cbae
+MISC ChangeLog 5059 SHA256 68e9d337929bbcd6596ca3229408e48180e732cdff139ec1abe6048a3a5e1a57 SHA512 cac0801371d7c8438dd9f012dd7d43c7e1e164b74dc0bddad3afc0f296da9afe50a43256b7f280c58bdbeb666a6fe3fc9752f01428e2a945522a7b3995a680be WHIRLPOOL 13d6b5baa43ea961d0e85233acd6adeb78cd6952f0c51c26a4369538bd17807afb259b036a9ab8be01a6c30d2b531f9bb365627dc6d8ebb0f76c750b8abf0c06
 MISC metadata.xml 158 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2 SHA512 a9f1d39008120816359e4198157b5613ab427fde9b8503e24346193fe9c84edc9a62860b90fd56c4adf4526bb7873a489a0f98efc75b52caa913e911ffd50f12 WHIRLPOOL 22e1f5aef99c4356a076c106161a1a73b40367e9f95e3ddc38c66a153674daef83871f77d765dd7d1bd7d970b72fd3841577176e361fcdb9936bf0309fd28635
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMm9jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88WbsP/jp4jNGhyAUYxpBX0maBJ7jn
-1li+kgEbHErCQ1daiaSo9a9LIQM6fKGiVIwcIVkPoeHK9UAIO9zkGmNfJuviqEl2
-d2tcwiz6fbCqKlT36hHyrn0N56ttGhWyMKOyIGedfBHVYBdbK1MmDwXJkHzHGKT1
-NngCN6PJ9IMKsqOotVwCK6gryslsrLcJbdJnrodhvfM6XlNYVOzSnMZKdEF5/Uch
-trnX3BtAmbHFZ4jmHXFzF1zndK1ZKxm33DbS/ixBq/j8Oys04nlqhcjyb0xnptbB
-vmQrMIfXAeXeXOjxqPnK2HBmb/nSnfUGyS87j76Rs+CbiNdeOKjKBVzb6Z5LhRmS
-v1ZUvp6In9aCZ3XrABk2ZaPaqKzKqHvtPlU+LmW8D1wgspKMEol/hBbuoIzimtIV
-LbDyIAkciITtWudOnNaU7HfYQkO3Ji0ccucv0FNIEwx4TLtmbYowFeRJHkhKZilo
-hsndHUZabqmNItwJUF4aMM8JvMUkmZFwF8X64lzBet5wd8e6VYtuS0sPjpj0cZIb
-y9M90MvB0z4o0gnQVtxQlenV9H45CL43V0zx7Qg7EyuWZn2ridBgOBgSjE6Qp3tq
-BRva+8kXlLQBsNOD7ZulOsEA57KMWRqQd/gamIJdcYS/qmDCuz5P36GbKFJ88yXu
-6065Cfh5n2j+f8yBwIQX
-=o+jp
+iQJiBAEBCABMBQJTDh2bRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7OWSD/0V8zFPcKRo0Y4msVehoOu8DIIaiPxEc+fAgUqkuOZ2KLdVsCWp2ah+RJ1u
+la4nxuRZDY9Km4ibTax9wsINcuFF5jrhrAboht0cChRczlYrBGcnZ4fxhfkxzUyl
+vWWN8q8OB54pyXeCEhaedEXeSRkDATwvF/KvOC+d84lZ60WoxbN5Hrqc8d6ljzJt
+APBFBfRc9UidrpVdOLNPLCa+apBEDx4JiK/936jGh7S6i3cAQSS0em3Odj5qyujB
+kIwuWdP+6M/bdxlt0AhhwJWxalp7/y2KBQW9oFaBV3b8TszcVAQy9VTGgG5sDWJ+
+ISwbXQuMbOQtdRDcC0IsSfHf3sJ71LvuBoLXul6wYrejrQVSEyg2cU0+74Ad+Zcb
+WbR+VpFkWhlBMo6OF6mT1cnn8gYbj8a4Vz7V8C+nIGPDXuFT/IQvVxHNaZ0Q+DQy
+TZ0/NQ/0A2YG0MRL/Fvmp2lpr64aGE/6OceVu3R1lZ1FuDyR2RvbN/x1xjUz45xE
+tnkk1KCdWSMhN9udVxRRQYLg73MkSjqmmRUE+jgSCXbjQeDKtxMJsI6YaC6fZPPU
+vI96ODmIZDdj2gO3N+BOJUmzPqUQiuWseZGie2v4j7wHjaIzGoBsGfgea4ZnFdCo
+t+Q83Nw9titdtc8yRx48sWxv/PmsNwFWdZuLT0WqfGnCQdsGTQ==
+=TRb5
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kgtk/files/kgtk-0.11.0-include.patch b/kde-misc/kgtk/files/kgtk-0.11.0-include.patch
new file mode 100644
index 000000000000..d54cdb202115
--- /dev/null
+++ b/kde-misc/kgtk/files/kgtk-0.11.0-include.patch
@@ -0,0 +1,11 @@
+KDE4_INCLUDES also contains Qt includes required by KDE.
+See FindKDE4Internal.cmake for more details.
+
+--- kdialogd4/CMakeLists.txt
++++ kdialogd4/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/common ${CMAKE_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDE_DIR})
++include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/common ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QT_INCLUDE_DIR})
+ set(kdialogd4_bin_SRCS kdialogd.cpp)
+ kde4_add_executable(kdialogd4_bin ${kdialogd4_bin_SRCS})
+ set_target_properties(kdialogd4_bin PROPERTIES OUTPUT_NAME kdialogd4)
diff --git a/kde-misc/kgtk/kgtk-0.11.0.ebuild b/kde-misc/kgtk/kgtk-0.11.0.ebuild
index 892a601f7dbb..3451d61b7f1c 100644
--- a/kde-misc/kgtk/kgtk-0.11.0.ebuild
+++ b/kde-misc/kgtk/kgtk-0.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/kgtk-0.11.0.ebuild,v 1.2 2013/03/02 21:30:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/kgtk-0.11.0.ebuild,v 1.3 2014/02/26 17:00:08 kensington Exp $
 
 EAPI=4
 KDE_LINGUAS="cs de en_GB es fr it pt_BR ru zh_CN"
@@ -30,6 +30,7 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${MY_PN}-${PV}
 
 DOCS=( AUTHORS ChangeLog README TODO )
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
 
 pkg_postinst() {
 	kde4-base_pkg_postinst