Backport patch from upstream fixing build with cmake-2.8.10.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 46 insertions, 12 deletions

diff --git a/kde-base/qyoto/ChangeLog b/kde-base/qyoto/ChangeLog
index d3cfb245bf69..652f3ef35510 100644
--- a/kde-base/qyoto/ChangeLog
+++ b/kde-base/qyoto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/qyoto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/ChangeLog,v 1.43 2012/11/13 20:21:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/ChangeLog,v 1.44 2012/11/18 12:52:41 kensington Exp $
+
+  18 Nov 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/qyoto-4.9.3-cmake-2.8.10.patch, qyoto-4.9.3.ebuild:
+  Backport patch from upstream fixing build with cmake-2.8.10.
 
   13 Nov 2012; Johannes Huber <johu@gentoo.org> -qyoto-4.9.2.ebuild:
   Remove KDE SC 4.9.2
@@ -161,4 +165,3 @@
   27 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> +qyoto-4.7.0.ebuild,
   +metadata.xml:
   Version bump KDE SC 4.7.0
-
diff --git a/kde-base/qyoto/Manifest b/kde-base/qyoto/Manifest
index 5aee7e9ef47b..99c5e4b9d8cc 100644
--- a/kde-base/qyoto/Manifest
+++ b/kde-base/qyoto/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX qyoto-4.9.3-cmake-2.8.10.patch 1205 SHA256 ad9bb5aaf4f8778d2553b8d8f63cde3dc925e440234290d63bc243f779d89336 SHA512 5b51c24f1591c19d37edf575f7cf08ca4b8d8eebb94da0bd3d37653d3a39bb588c9e23b51902a6479e3fc66e9e39fa33df5e22c79164721482277ae8a981d578 WHIRLPOOL e4a774ad8d2c243b5da9f4e03d2019eafc465d3720b8ec3a366efeae8b8eec8baa3937276935b5ab449bdaa81f4489ef7974a7191342b32616303cac807c7048
 DIST qyoto-4.8.5.tar.xz 536124 SHA256 984157b7d754e89fc48161a02ddd5127be1b36a0962f442ce1c80222255dbf88 SHA512 130c5a1b65a3f5dbc2217143c16d41bf8a67a8f785c62dc5789397008e9077a6ec30908fbf6b671ee50dad351933c309833e1826a341db17ae57d1c4a50c04ca WHIRLPOOL 6ab5b9f857d2def6af1be86f7dcaf90b842cf925396b2e3847182bf535da272b8dfd353f9a82ddf5424bf86c1e80f0ace02af3267c8877532d82dcd958a9a6a5
 DIST qyoto-4.9.3.tar.xz 509164 SHA256 018b50c4793ac3c4392c2cc0f0b276dd9007987d593f3b54870003ad6e21cdf4 SHA512 73c9b3a1358f8890facf0c967d204e6b6b7f9b38145615757a023fd26ad90c888fe9157a8916197558f033426c782b961f76c31200fcd732a8d0df07a1c367c8 WHIRLPOOL a6f49d96f8a112ed569486194e036898740a2d08480608bf1dcfbdae47a4dbcc8c7c4b61a0596756d19430fa89026e3e8bd52e8bf5bbf2bbe7955419f0279432
 EBUILD qyoto-4.8.5.ebuild 789 SHA256 d70e54089fd0035a0982410fde8d5d0f58f9faf99260e1f9df7d8b89eddfd69e SHA512 b2e5cf11f4feb854d982f334abca4c74150f5953249c0520fb1c9436f9160545a860a201d84865b8fc6cbc7888a3e4bfb5b9a4e6fe4d7c781723c737fc74e663 WHIRLPOOL 94a782bca2bcaa37d50a540ad2d3cca657a047cd56f5770e5b3d7e9109c7d914148c93631fd914590e25d2e60206e90eeed80be278e6a7804e378c3c18d8c968
-EBUILD qyoto-4.9.3.ebuild 772 SHA256 7a4a49782f768acd7def190b5a914bda483c5884fa1051de219efa8102dca452 SHA512 7d0a43b38ec95fd4664832cd49c4b3bc71f89ca83231e7e21ebe95b181437028ee07ff185d4ae559b0b9dec00fc8bf06a071294166c56062d97c7eb918ea8212 WHIRLPOOL 15fdb2219b5b1107fcf7b663574b7297cf293397307b9dea47341ecfb173507db30decf0ad33c61273e3a19d5d540692337e96dbd5c6297d78b82d1e3d0b1f15
-MISC ChangeLog 4896 SHA256 d5bd11d81d025439badcf157423dbf8d63449f4955fdd906530dde450dfef7d8 SHA512 feb741e4375eb1c50c5ad5b9e30f2c78c6c7496b2bfd26098501a614f6fe31f9ea142677cf7857625a445486a733a1d59291c7ebbe199de8da93211173579898 WHIRLPOOL 7c0db1111e40baae6fd287dc946975f14e61069000d22a5afc61b71df8ad1571e82874980f75ec9ea10d8e9322a71da381d7a59c9a54027fa97bbf27879b13d3
+EBUILD qyoto-4.9.3.ebuild 825 SHA256 ccdee9512fc4eccfb7065bef1e50d2d3334cf65f4568c47b862a1670d7ee84b4 SHA512 c1c059d92bf3f1e7f203e8b68e30da6754b0828792a3c471deb240423b781834134f7d153060b8b7e8dbbec1635494e3d3fa15679ccd76b9680d762d7de5b2ab WHIRLPOOL 9de4ff86bc6006a51a408332c3c9ad5294a4e3b32d96b3decf3a44f50f95d1a5787d5a3992d6af925680694c9384470ed57c7400e129f205eaa7ca70d253054a
+MISC ChangeLog 5082 SHA256 a77c3f47853895cdf151b158205e7b9c4fafcb0de606b079a20ff5f9a39453b9 SHA512 d0aac599016f0ddddcc42ed4d076d6a9aefc7a8e1f016b453472300c9b6178f1e2c2d0a9c4aaec030a0b2da1d4aaca976c43d85d36d148647e3d4d0a98cf8ac8 WHIRLPOOL 0c11886624418938748292c86ad6d275ad581a6e56b48ee193e26283b76f487d860e96f1072647f3ffba80f250fe995415909aee867c51ad0809bf8d89ac29d3
 MISC metadata.xml 391 SHA256 324edafa3df71be31f5b41d6c4658ccb950997cc867454fdd683a2179c1c64f8 SHA512 4609c8fe4b74b7d1c88491713fe39be2cd1acbc0c85e7bf50556fed6b57a07318f61fa95ab0f392454484843d4d99ccb972f57fa84548c80d7c4f8e3b436d83f WHIRLPOOL 14dd4b9e98c12a278c8156a9d041b71692b11033702f8c556eea0a834e42d095586b382e8fbf8c394c8e53c4bf72a11f05fdcde9ef39027bd6078d9ecad7a56d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQorpaAAoJEO+t9ga+3I3aQK8H/1U+v5q5o2lRxDAEt6w3M1yt
-J+9MllpIblMfqhdvkOxcWp7JbUdAdpYi1RKhyyka+giN+IUmPsvmvlISm5W/Nkwa
-KDUuykSZfCyKAo/jcV0frX84D3bXLSjD7dOteANOLy84+MKBrDe+7Dki98GCFB34
-0ybE45aB/tO7IViYSUXds28a+0vdtylQqXw9eN/4JlHobGPvQisICKVLBDSSwYI5
-yGJfEIa40kT6LYfFI3OU2tYzO7wBTxCiHN4wWAVmKWwhVeM8zWqBmNvgtWR8AHdz
-HFs/Cwayo7KcN7y3EG5NZsfB+/XSMjIsupXyD41pcclmhZAi3bVKJDxaY3C/SDY=
-=K/f7
+iQEcBAEBCAAGBQJQqNm2AAoJEMbwO6tnXQ0sNyIH+gMFHI2nT2ECmNE5rtJZNUzf
+WBEbtAmMrrfE9xJqerrvDroCRQ0X0tQexg9X8lp/G9dEglzhfh6UXzAv3jZxeQkB
+f76qG2i+peR6W6fRqyGvGLZ4+WwzIpXkLPp6OdfGKRouYiVWG1Ix6CR5RyzPteMl
+U/cOWUSuGyOBg4izQyt/jmsPnDFxONNQ4oAdIEqs0SttHhhy/a6PgDemqJBNw3S9
+AFOkgzBfMtkYHAOy6jmL0xIbIDaOvdeXgujr4uEckn7gJ6Jw83hSedh4Mw9/7PB/
+twyHx8MPddnDn1u49xQ7EEYStta7t+ju1QbhIUCHpzcAGN5Adg5ySZNNUYRCh0w=
+=Ispm
 -----END PGP SIGNATURE-----
diff --git a/kde-base/qyoto/files/qyoto-4.9.3-cmake-2.8.10.patch b/kde-base/qyoto/files/qyoto-4.9.3-cmake-2.8.10.patch
new file mode 100644
index 000000000000..5fd9d24766fe
--- /dev/null
+++ b/kde-base/qyoto/files/qyoto-4.9.3-cmake-2.8.10.patch
@@ -0,0 +1,28 @@
+From 6921fafa99726cec24cce0ce3b0be71944812ef7 Mon Sep 17 00:00:00 2001
+From: Arno Rehn <arno@arnorehn.de>
+Date: Thu, 15 Nov 2012 18:12:28 +0100
+Subject: [PATCH] Apply a patch from Fedora to fix the build with cmake 2.8.10
+
+---
+ cmake/CMakeDetermineCSharpCompiler.cmake | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/CMakeDetermineCSharpCompiler.cmake b/cmake/CMakeDetermineCSharpCompiler.cmake
+index 29c0eb8..862d9b4 100644
+--- a/cmake/CMakeDetermineCSharpCompiler.cmake
++++ b/cmake/CMakeDetermineCSharpCompiler.cmake
+@@ -84,6 +84,9 @@ endif (CMAKE_CSharp_COMPILER)
+ get_filename_component(script_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
+ 
+ # configure variables set in this file for fast reload later on
+-configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
+-  ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
++ if(NOT CMAKE_PLATFORM_INFO_DIR) # pre-2.8.10
++   set(CMAKE_PLATFORM_INFO_DIR ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
++ endif()
++ configure_file(${script_dir}/CMakeCSharpCompiler.cmake.in
++   ${CMAKE_PLATFORM_INFO_DIR}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)
+ set(CMAKE_CSharp_COMPILER_ENV_VAR "CSC")
+-- 
+1.8.0
+
diff --git a/kde-base/qyoto/qyoto-4.9.3.ebuild b/kde-base/qyoto/qyoto-4.9.3.ebuild
index 325b598572d8..038bd0995fa4 100644
--- a/kde-base/qyoto/qyoto-4.9.3.ebuild
+++ b/kde-base/qyoto/qyoto-4.9.3.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/qyoto/qyoto-4.9.3.ebuild,v 1.1 2012/11/08 23:26:36 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qyoto/qyoto-4.9.3.ebuild,v 1.2 2012/11/18 12:52:41 kensington Exp $
 
 EAPI=4
 
@@ -20,6 +20,8 @@ RDEPEND="${DEPEND}"
 # Split from kdebindings-csharp in 4.7
 add_blocker kdebindings-csharp
 
+PATCHES=( "${FILESDIR}/${P}-cmake-2.8.10.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with phonon)