Add build fix. Thanks Alphat-PC <AlphatPC@gmail.com> for patch. bug #394921

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

4 files changed, 48 insertions, 18 deletions

diff --git a/kde-misc/polkit-kde-kcmodules/ChangeLog b/kde-misc/polkit-kde-kcmodules/ChangeLog
index b46baf583ac2..028f5cd70ae5 100644
--- a/kde-misc/polkit-kde-kcmodules/ChangeLog
+++ b/kde-misc/polkit-kde-kcmodules/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/polkit-kde-kcmodules
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/ChangeLog,v 1.5 2011/11/05 20:19:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/ChangeLog,v 1.6 2011/12/16 14:46:08 johu Exp $
+
+  16 Dec 2011; Johannes Huber <johu@gentoo.org>
+  +files/polkit-kde-kcmodules-version-check.patch,
+  polkit-kde-kcmodules-0.98_pre20101127.ebuild:
+  Add build fix. Thanks Alphat-PC <AlphatPC@gmail.com> for patch. bug #394921
 
   05 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org>
   polkit-kde-kcmodules-0.98_pre20101127.ebuild:
diff --git a/kde-misc/polkit-kde-kcmodules/Manifest b/kde-misc/polkit-kde-kcmodules/Manifest
index 551a9c1b2466..63cdb683b42b 100644
--- a/kde-misc/polkit-kde-kcmodules/Manifest
+++ b/kde-misc/polkit-kde-kcmodules/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX polkit-kde-kcmodules-version-check.patch 1484 RMD160 2a81e8894ca7dd1d4381c9717b36d7eb3c5b9775 SHA1 30c364d2e493c43766f20f86103b5f942bb8fd1c SHA256 2ebd85f9e6e984471c24ec4f8d34e25338cba9edb06370a0971cc8d509aa99cd
 DIST polkit-kde-kcmodules-1-0.98_pre20101127.tar.bz2 25790 RMD160 fde7ad1819962e4606cbb1edcc72087c955912a3 SHA1 8b9127b8e25dc6cd9584ffe77b499d780c5459e6 SHA256 0634bd83b7f4e415c2cb9bce8bffb860a7eb8abb6c6d9b2dc3230ce501da5e3e
-EBUILD polkit-kde-kcmodules-0.98_pre20101127.ebuild 819 RMD160 d783c6dea88b51de8c62c91f6ef72ada28edad33 SHA1 acc28537b82369fe8a8283e72d436e44bb901ddf SHA256 3d7dc386d2e04faac839798a099eeec3e6b9d669f637750d8468ff8ae5b20a81
-MISC ChangeLog 959 RMD160 09d0bd338cad9e3c8d6f30a141be413b627fa53b SHA1 21128ac40327e1188b4a67aaed6182998bf4ad11 SHA256 a4ede627ce037e269de66fc380abac40efb6d420b873fbb4e777969947b18018
+EBUILD polkit-kde-kcmodules-0.98_pre20101127.ebuild 867 RMD160 5a966af3872487bf228d7ae7a00ddd85b865b2d7 SHA1 d6b626b764a089055be5f1bb286f7720b0c4d361 SHA256 57ff3326816ab7f9299fe48ee0929d257710133d2f69cb0f103aef2f01e1d4ff
+MISC ChangeLog 1179 RMD160 d55c184b2aefa608673ea8bef7cada7df8c175a6 SHA1 a1cd542fb3ffb370914fa39e444df592445ad52d SHA256 8e6f568b87b2984972510d5e13f53befa369a8bf5ad10e3b4d1f6a093122c0d7
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOtZpWAAoJEF0huFKJUZL505YP/2Hk+UMazRbbyaPH620RUrjS
-yZsnK3nReAHOB7MBRr+NNuMCziEXqY36jY+nvQrPSbz1TKya3Si/WJ9T9Ol75Ww4
-fZ4xStVQZMHRj8+E19jCGpTIclS6Di20FG5/KSZMq9+NNv+akc7o7W5wy7QXWmBm
-8ChI8GCKOfm8jp74vGkBRP8E9DG24u6GjqXLYFhRKD5VlzJhFUmnC0eWk0AQ+Rbi
-/eKEs/5GPDNSYbzmm7ZYcfz2xfUvnHb6cmW6E/xJaZqW2HcpRAI0UEXbsg3vKnND
-lzD7DUoizZcYY0ut9VDg6sSupoKlYZVe+Ldi2Ke6yq+82k7NC4TTsFEnPUw5tf06
-Gm2XQho0DitYQHxVLQssQ/y1sd7e+E0BPktJOf5UUmSm5W9nyURMksk5KIRnsph1
-I+qJcP8qh4t+KJREtkELxRxlbrGqQ4xh4UZOp/KvVAvInYgVMbOrnvxG7rsXaeD8
-mu5Oamx4YYdDqdby9BC2NumZmBZyCoWmIvazwg7jbFTRaU4mZXo/HfFP+G1p1Fra
-GWmEoEJ6hCA+nzRsDAH85r0iGsKKOeLZvC1++MNbSzFG7OO8Tn+DHFupzPay11bb
-Iru9Nkk/ST53WaenQRTRo+vRqKrTEGb9SJGvIOoLDFgRe3hWg9r2o4qvIkBzoT8W
-w4ZOY3gnhKl3VONGuG19
-=WMFs
+iQEcBAEBCgAGBQJO61mnAAoJEO+t9ga+3I3a4Q4IAL+FN1cGiuYvSc119cKCW11+
+WEbyksdNU+ibJjgR+UZBFFLaFOSD7XL8dW/IJIphpHT5ez5s+FV6S4A3KYm7FqDZ
+RBq2CTlCqryys0UIlSwUrPxwZcc1cLLgqPYLnfxZIBpYjwBcW23borGEuuvF6AY8
+qHhpHxJexdHAcO7w90NLgtVpF3UsG1sAYsVrb6YZ3oLa6BdrlpmcQ8SfE3eiyM7Y
+KiSYUOb/KgcFKipF8BJ9r35g+rzS6JwWonGdJdEDLDpBF8W36yrnc+qxdzIDUCNA
+JALufKUDfs0QAUxNXGcUpHxa8Ao+qhkvShyZ0rt82ldHNgR2kYWrLePu4nhAwQI=
+=DsJA
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/polkit-kde-kcmodules/files/polkit-kde-kcmodules-version-check.patch b/kde-misc/polkit-kde-kcmodules/files/polkit-kde-kcmodules-version-check.patch
new file mode 100644
index 000000000000..42fb559e2778
--- /dev/null
+++ b/kde-misc/polkit-kde-kcmodules/files/polkit-kde-kcmodules-version-check.patch
@@ -0,0 +1,26 @@
+ cmake/modules/FindPolkitQt-1.cmake |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindPolkitQt-1.cmake b/cmake/modules/FindPolkitQt-1.cmake
+index 0bc86d5..5f51535 100644
+--- a/cmake/modules/FindPolkitQt-1.cmake
++++ b/cmake/modules/FindPolkitQt-1.cmake
+@@ -47,14 +47,16 @@ if(POLKITQT-1_VERSION_FILE)
+   
+   if(POLKITQT-1_VERSION_MATCH)
+     string(REGEX REPLACE "POLKITQT1_VERSION_STRING \"(.*)\"\n" "\\1" POLKITQT-1_VERSION ${POLKITQT-1_VERSION_MATCH})
+-    if(POLKITQT-1_VERSION STRLESS "${POLKITQT-1_MIN_VERSION}")
++    if(POLKITQT-1_VERSION VERSION_LESS "${POLKITQT-1_MIN_VERSION}")
+       set(POLKITQT-1_VERSION_OK FALSE)
+       if(PolkitQt-1_FIND_REQUIRED)
+         message(FATAL_ERROR "PolkitQt-1 version ${POLKITQT-1_VERSION} was found, but it is too old. Please install ${POLKITQT-1_MIN_VERSION} or newer.")
+       else(PolkitQt-1_FIND_REQUIRED)
+         message(STATUS "PolkitQt-1 version ${POLKITQT-1_VERSION} is too old. Please install ${POLKITQT-1_MIN_VERSION} or newer.")
+       endif(PolkitQt-1_FIND_REQUIRED)
+-    endif(POLKITQT-1_VERSION STRLESS "${POLKITQT-1_MIN_VERSION}")
++    else(POLKITQT-1_VERSION VERSION_LESS "${POLKITQT-1_MIN_VERSION}")
++      message(STATUS "Found PolkitQt-1: version ${POLKITQT-1_VERSION}")
++    endif(POLKITQT-1_VERSION VERSION_LESS "${POLKITQT-1_MIN_VERSION}")
+   endif(POLKITQT-1_VERSION_MATCH)
+ elseif(POLKITQT-1_INCLUDE_DIR)
+   # The version is so old that it does not even have the file
diff --git a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild
index d5019542752b..9c7bdd5796dd 100644
--- a/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild
+++ b/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild,v 1.5 2011/11/05 20:19:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/polkit-kde-kcmodules/polkit-kde-kcmodules-0.98_pre20101127.ebuild,v 1.6 2011/12/16 14:46:08 johu Exp $
 
 EAPI="3"
 
@@ -29,3 +29,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 [[ ${PV} = *9999* ]] || S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-version-check.patch"
+)