Save and reexport Boost header location, bug 434144; patch by Alex Turbov

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

4 files changed, 42 insertions, 11 deletions

diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index cdbf443d22e4..ebdef0368559 100644
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.160 2012/09/04 18:45:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.161 2012/09/10 14:40:55 dilfridge Exp $
+
+*kdepimlibs-4.9.1-r1 (10 Sep 2012)
+
+  10 Sep 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -kdepimlibs-4.9.1.ebuild, +kdepimlibs-4.9.1-r1.ebuild,
+  +files/kdepimlibs-4.9.1-boostincludes.patch:
+  Save and reexport Boost header location, bug 434144; patch by Alex Turbov
 
 *kdepimlibs-4.9.1 (04 Sep 2012)
 
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index 42bfd9f41061..a25fdb84442d 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,22 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kdepimlibs-4.9.1-boostincludes.patch 934 SHA256 2c4659c63b231662c3b6cae1205e46d9214240616f0c47591cf63a147a25f610 SHA512 61066f97d1fd2906bb96e4dc26dfa9aa2d758b5bea4198af5775c488c7390b17e77214d1ce1371587e4fb1c608b905bbaab0d3daf1b99de968e720a00bdac10f WHIRLPOOL cbc8de75304342ef2c6ae3956ae670975e42dfaeedd4c48bb23928edfd86f5638dd629a2487aefa1fd9fc92905aa4b65f42a99ab207d227ba42c9976ab7ee8b9
 DIST kdepimlibs-4.8.5.tar.xz 2862088 SHA256 fff0b8465635b337d33e9885a8087515af17b2ff07bbf69394b29fc460bf08aa SHA512 e53e1dc9e1f9e5e45cad2588ec37c305d3bb464929a3b765c7c55112ffd3e7dc3295d86e7869efcdae21c9c6d2b080ab8c76a55ceb29ed2c4359b7f3dc3f550e WHIRLPOOL a5b995e081e67ffc8527e2ea0e00e477b6b0859d3e7c8951c5021125dbfdc3ea6c1c734dfc1f5d6b2344b3e07cc68d2416e1b218a8ba77a9aaac73c2a864676e
 DIST kdepimlibs-4.9.0.tar.xz 2581896 SHA256 99bf8944b9264852478d18f6f06a2f7f5e0c3f4d8d6aaf1772f2d875c97d8326 SHA512 8bf27502c6377d17653502e7b3293302ff151ba071cb30405cfe7e7de614ed9d260efafdd33dc3ccd5a582a8e62f2366aa1813771b43a72c8e1125edc4fa950b WHIRLPOOL 625eaa9f763a315ef2c70214155197de8ba652b6b96b57b5b2ce324d6e6b40ef3b48ca621623778f465eb61c61459a544b20345061e05131100c2844b33909bf
 DIST kdepimlibs-4.9.1.tar.xz 2583516 SHA256 ff7e720cc80dec58baf32b8de1b4a7e487236fc5069379f9b97922a25a4928d6 SHA512 26ca0a749f81335f9b794baf42d60b497000566a8183458f266319c47352ed7a50bd9264ccd754fd1f6fdfaf1c23730715282ff80dd08597040f5bcae5e8cdce WHIRLPOOL 258dd91f31405e46ae6368ee97fd24a75ad22185983f1dd648d3c69221a52eedeeb5725881f4cb601e1c3ffc50ed6028bf8ed230e7770c4499a5d8f45163c3ec
 EBUILD kdepimlibs-4.8.5.ebuild 2144 SHA256 ce52f436f4aaa048d8082f156e52cdbf3bac58f5427d5616688b484286a38c0f SHA512 de3ac233748f553d5d5810e18ce205ac98014a42174dce49475e296ec848fcd30e601fa733e612b91ec19745bf87cf71cfff21daef0de2fdc48e8cb054d95fe4 WHIRLPOOL f0c7006408913941ba647dfc235e54443d2b67095d409a0309a7436dfe6a3440973fec32ce374e867286e474262eb63418faafe403d720fe82ff7dad07bb6dd7
 EBUILD kdepimlibs-4.9.0.ebuild 2125 SHA256 396263b0def5bf29b3c95b93e808475a879bc3c16d28fc1f43f0e8d85f12d730 SHA512 4db866937fb3f2dad4b228d079eeafdd7d3fc4a0292ab916178546739e4a4b64602af3135752102cc1a608395856f61a599d849a45db901080b2c55b0b2cab8a WHIRLPOOL 872c9103b4952eb8750dac23d9f5335898411d4a0e6144c27c3363f42c31803804d46e22118d4940cbd51a63453e87dcbc5d3a834eb54076e7a538ba5d8531db
-EBUILD kdepimlibs-4.9.1.ebuild 2111 SHA256 e87a1d571c19311e79e0f2beda26e9487250b314ed50430c63118b1afca2c67a SHA512 f315cd03780346874430bf54b482882e0502ee6466b759c1f284197088978b1db4b75bd868959b506849c2b8a352c7d7522dd49fe5326562c9399a8685d6e8c6 WHIRLPOOL fc4e09b3c5d7d6cac9c349bfe7aa2a7402acd8405d09329152a7c69e3093c3ef926296a56d4b275e69b61f3db1f583bbf518712b35e5a77a7635324d469dc28e
-MISC ChangeLog 20596 SHA256 068e44e2976e6580dc0d513e3bfa4be2796b04c621ac35dcbb65b39a1ef32333 SHA512 5e4c389844657853b21941e77b47fbbb460ccddd1a0a17b4ca5dc1737b408b0069b951086915ddb4bd840b144d62b8306e643f5fd28670963588913de51a477d WHIRLPOOL 232e38a3e1689b8ed8863a9f2a9f2ea28225524296eca253e36824d824e987386615d58a04aa6dd3f1a0202fafd7fa78510e428136cac3eab7382f78c9e8d69c
+EBUILD kdepimlibs-4.9.1-r1.ebuild 2178 SHA256 729df953b20a2df445c060a7d0bf9f5af1faac4d8c648318b9c8033d0b66bc1e SHA512 6610c88618365b10f3fcf9d4871048282bd6361da4d2ba2f8ccc5fb8aa5721c9a0b087eb4efa79627219fdecefb085e6e55d3258d5e7054faa72c6d9354b66a1 WHIRLPOOL d8a24ce3d6af9d327de2b69c10b06c654e03ffc3e788167a2d3eebcf5742c20533e0e91813029e4ffe9da54bbbedb87d140cffa9a4e3d1d963a79194f7c992f7
+MISC ChangeLog 20875 SHA256 3f0af2c380bb582c6167e8feb75de7163e06afb56af06b17b4212da15dcf6feb SHA512 e2da7af5ab1e6ee3c6501fbfddbe33e535a0f68437e8d577626ba16f66551bdb9f355388d1f983c6356035973e685fa9397232f9cd4fdae789d2fb3325859984 WHIRLPOOL 35969bf857a1a449cbc134e383df5e750300a39ed80b741915304ceb38a8548e10e2828012941663df8d8fa13630a5ee4e25adf4981cf8fe59574fbe4805d74e
 MISC metadata.xml 240 SHA256 03a8b64042d6629d65428d94ce09d848c1f6346abf57819562485dfe2759c9e1 SHA512 f4485bd63199f8fdba6ca707fe59557e26c3ad859f291a42d19708f475e9a5f174b8f9823f31c1ac21e147f5fec1d5489a8785dcee2d8fd88e5272ac80cfe564 WHIRLPOOL d82da2bbbbc6a288e141eda054db6800b8602e98197e67daf442f44daac191eb47f04a0b64d67dc95d0b4017ee006f76e5890c25843701158b2e70f39c9bffb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQRkzKAAoJEO+t9ga+3I3a6J0H/1hqVPeV4T+ty5SMWF9ynvrV
-Z8nMqvtK8J1IZaLuNfqyI2yCzBj9lxffAs28iYPPcw0NOMbEoj/J282dbhkQBhyL
-q+O0gys0AIuox5cucihHMxCfK3sApQ0osCvgVsR3hJxxQjhgtQYb0TJD3itR1Lby
-uCwFSSBtxX5QM1J1YrfjrDQkLp7G+uv4/p/EjQ4NJj9JunCYiODkGMjWV1eTZ/Qs
-FkQPvx6WLS4VTcwVq+Dxqu9dDtJ4Wa7wkJtJogD6vseUflDkxmprgU1obkOxWb0w
-WT4LSQHDnz6jk+bogh39dX+baU2zwBfQoV53sIQG33QP/qViq16qRRuTJKqTDho=
-=35Gk
+iQIcBAEBCAAGBQJQTfxvAAoJEEb+UGWnxTyHt7IP/1hoQsZDgMXbrEdS5bHXDhI8
+Nh8CGe13jpH+R/dLPRzpkerNazRIy6DHcBQmlCcN48XNj1jKt3V0txbu+IXRicsk
+06jq+uncq7kvBdRmNguIwnd6iVIadmprsEbukTS7QRw7XfnKubjHUOrVcfrGSiD2
+KpbAPK9696BoXnVsrVAWC3w/Rr/MuHhhy2VOutrOo5uTr9RMY6W7km9G8ojLIQOa
+Xd6PmE59D63u8WqAJZySiKgzwTKwuHDlyTCS8ob70JlS0sGdEWuvRRbh79UBZadx
+gGPdlfsLWFWrME9VTtUCvedk0DC6TiIKbgHs/poLITqXFqi19cN/0q7m8BJFUcmG
+lTS4BM+KBiJY0QcKwSRPreh40by0l+CtYo+AVM6fFLH3l8wLXC5CjChH0ngBaYy2
+zNZme0YEDqvfOgSa82Wn671ViWmoPAfejaBOWRkoHLw2aQ/fQuXuPz6tg3c+7wfc
+LMJ21i6qcH6BrWU5XDz7IKqFn6pNH8Ku1Pvhag9MrSdm6ht4Ad646zJ/k1sr1jX7
+SodbFAhRVUv8UUGmXQcCq1jrr53+yyinT8vBmY8E7eNttCcpYwsduOh1NzRTvLOL
+8LXNYIvOdtM2yHISROqKcA8yx0zEKXd2jRo3Fv6qawT4q1JP6Lc3mEuaA7H+lOyU
+00mX1PFKw8CiP55rrm0z
+=p/4e
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch
new file mode 100644
index 000000000000..2df44a733084
--- /dev/null
+++ b/kde-base/kdepimlibs/files/kdepimlibs-4.9.1-boostincludes.patch
@@ -0,0 +1,15 @@
+Make sure that the Boost headers are actually found, since they are
+referenced in the kdepimlibs headers. 
+Patch by Alex Turbov, see https://bugs.kde.org/show_bug.cgi?id=306323
+
+--- KdepimLibsConfig.cmake.in.org	2012-08-13 12:46:24.000000000 +0400
++++ KdepimLibsConfig.cmake.in	2012-09-06 08:53:53.000000000 +0400
+@@ -15,7 +15,7 @@
+ set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@")
+ set(KDEPIMLIBS_DBUS_SERVICES_DIR   "@KDEPIMLIBS_DBUS_SERVICES_DIR@")
+ set(KDEPIMLIBS_INCLUDE_DIR         "@KDEPIMLIBS_INCLUDE_DIR@")
+-set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE")
++set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE" "@Boost_INCLUDE_DIR@")
+ set(KDEPIMLIBS_LIB_DIR             "@KDEPIMLIBS_LIB_DIR@")
+ set(KDEPIMLIBS_BIN_DIR             "@KDEPIMLIBS_BIN_DIR@")
+ set(KDEPIMLIBS_LIBEXEC_DIR         "@KDEPIMLIBS_LIBEXEC_DIR@")
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.9.1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.9.1-r1.ebuild
index 6a77803e8c0a..cc37d4141528 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.9.1.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.9.1-r1.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/kde-base/kdepimlibs/kdepimlibs-4.9.1.ebuild,v 1.1 2012/09/04 18:45:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.9.1-r1.ebuild,v 1.1 2012/09/10 14:40:55 dilfridge Exp $
 
 EAPI=4
 
@@ -37,6 +37,8 @@ DEPEND="
 # bug #418071
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" )
+
 src_prepare() {
 	kde4-base_src_prepare