Add fix for pkgconfig usage, bug 414659 and others

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

4 files changed, 89 insertions, 19 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index ee44651dcbbb..51f2dfec3f99 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.194 2012/05/06 18:52:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.195 2012/05/06 19:05:27 dilfridge Exp $
+
+*cmake-2.8.8-r2 (06 May 2012)
+
+  06 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cmake-2.8.8-r1.ebuild, +cmake-2.8.8-r2.ebuild,
+  +files/cmake-2.8.8-pkgconfig.patch:
+  Add fix for pkgconfig usage, bug 414659 and others
 
   06 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.8-r1.ebuild:
   Remove keywords until bug 414659 is fixed
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 8f2004eede75..dbaa8fa8a044 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -24,6 +24,7 @@ AUX cmake-2.8.7-FindLAPACK.patch 1744 RMD160 c10a0c33a440c69640680bf6f879b6b108c
 AUX cmake-2.8.7-FindOpenMP.patch 3265 RMD160 d37d4c56b1a15e33fa62931f5332cf4d78005b8c SHA1 e78974bb5390952cc351ea88dca45dc098803480 SHA256 0bd38ba40fc6dcc1ab462c6e27e4f3a3dca6451881ba46c1ff87b1af3b200c40
 AUX cmake-2.8.8-FindPkgConfig.patch 658 RMD160 ceb6f34658c3596b65395c610dc0735987945150 SHA1 a50b46a14821e2e6ad5f43a3207458a3c5ea2582 SHA256 3261fce9682f476f121aa3d30126e4f8d866b138c887c19d6f47b60df3de9cbe
 AUX cmake-2.8.8-more-no_host_paths.patch 3126 RMD160 bef5042501214f9282226d74375dab746f6be297 SHA1 d3461ab7176ae738fc79ae1268b74f5c1375a7c9 SHA256 1eda7ecfaffdcf296b473ab619cd21cdbc5bf9f3069c2c491b9ef0313d040e64
+AUX cmake-2.8.8-pkgconfig.patch 2773 RMD160 bbf797ce9c5f84baf44e9203601e1d8ccb53a4cb SHA1 c4b9cdc71ad23c32085c72587f7b2c4ed051b765 SHA256 6e9fd1a691b74facf59dbce344d1dd92fc95da0e8acfc77feb8bf5bab06f50bd
 AUX cmake-2.8.8-tests.patch 2492 RMD160 0f0cad620a3dcf365912c5de39234863fad32976 SHA1 10e95291764413df9d000b1dfc3806b1fbc64065 SHA256 07800482bcbf336eafc9132037a26dc16bffc3d31cda8732604c847ea1c1c860
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.8.6.tar.gz 5583905 RMD160 c3095a4776367496f895b8075fda373568f01878 SHA1 7c2cbd42d27e26580cd4923892197b84b2a90675 SHA256 e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e
@@ -32,23 +33,23 @@ DIST cmake-2.8.8.tar.gz 5691656 RMD160 db60999fd4d1b3e2e28368d45035a058ed7e7639
 EBUILD cmake-2.8.6-r4.ebuild 4912 RMD160 7fe756b422a8ac4ccb9d8d79ff29513ccc51c23b SHA1 61daa882ac8098115515898f10c56c7ecdbb854f SHA256 9a4240c99fc284d50066c3c93b770f9a246bf80820e68b2413ace735e8fc602a
 EBUILD cmake-2.8.7-r4.ebuild 4882 RMD160 bc30106ec2f12f2b1e666ae1ea9703bc38f99179 SHA1 33e8d40b9783f6912f3cecfe74fb82d74b982ab6 SHA256 78fc4f9582ffadcf02effbf05813d6431235df8f1f856874f6434927445ac558
 EBUILD cmake-2.8.7-r5.ebuild 4892 RMD160 4dda099c0046f413328f6c1b1e0f681b07a08a16 SHA1 f924494c504d97869eaefc0187f56c1ae2cbfc1a SHA256 b5b73cf76f595b5033ef05be3a98d13b64e91ebc23228887ab9b129e88676a51
-EBUILD cmake-2.8.8-r1.ebuild 4820 RMD160 c106db2887c02793dbec03212fce8fe94b14c3ed SHA1 8dd7e19d868abc2e55ed426d862354cf4cd0abb7 SHA256 19f0ab6d0fe11ac351adfbb0de617c7b3a2a10606a85ed66b06061a8c0753024
-MISC ChangeLog 31533 RMD160 6a60e26f04dfc51a0b1c24b480b666262b52f124 SHA1 eaefc0b95da2e5c590ff342ec74eed0b6391f766 SHA256 28c0f9ac2cd45c038b0045df97f47d6bbfff980bf5a43024a8246ff4405924b4
+EBUILD cmake-2.8.8-r2.ebuild 4850 RMD160 7c928b27af3d7cee64bc103f27645e5a12b9e008 SHA1 1b120dc8d8633fddd56c969f29d570bf8a39d7d9 SHA256 f9482241b9a8ca704aa1b8e29b6c303d0d4f2800125995c3b426155e56f37ddb
+MISC ChangeLog 31763 RMD160 c63706ba56eaaca9f95dc34f5db937a7c95bb585 SHA1 c46900bd67a3daa12097355ebfee753cc83eb8a5 SHA256 e8e6379868ba6666c158caf5c60f842e836652f738adfbb7776f0b29b940b2c6
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPpsiLAAoJENwGBM22xffevd0QAJ/8PJBvhl3hfKWFD7oMw4AA
-PdF3hr2cXLGUFvEoWXLeEJNcCT8bnzMVDbGzXgKYasWzFSCXJnUIUvj3pNDiYs8G
-TVoTdM1kES+qdWHEBQVFZaWbBuihgteAfxPWzPq+wdd7QevHe+w5Ei34N0uFB5pA
-fWu0Zs6kj1C/ZMDkOR+V/pS6gqIhHIqh2RviHtUujELtj//4Ao9AooLUQgyIe/5x
-ADWXnSjCK3eoDY+5wgBjO9FQVDhTQnF9G/zdojP7AVeX440qBV/yq1G0Z4qGsij7
-VZRy5+kXUqTjQvYfpWA2EXnw/ZoTVJ0+OmS5yDt3vyD7Xzxqb+57OuNWVSNU/mJE
-e83V5SBwwJ7QfTHDqhOlZJiEg+5K+dyDKP8sc2uMWNi0bw+8UBKcfWwQbL0mwLI3
-BcCWbZN9BaxVj4vzewIYqkYl6QmTjNulGaY92mPOUiBj3GuLEjahNgoqSV8iFTlu
-ic02mltFq4MyKHwEVMVGtgi9RshKzX+gZ79GbGGuYlM2bUfJK1DZn2/EY+kwhDjN
-iyt5qnsJrMhhtVtWRlY2MoAvNq6vUF3uCNQPEfH2O+773Epqk84VF2AyGXfjg0T7
-hJUwTNoldDyrsDpLBXtpGfxqca6F/t1FIpGnA+fiReTYwfBz3VRfqHQwFNVcaEJ6
-aSG7cIt9/K64E6DRkJv6
-=dkRF
+iQIcBAEBCgAGBQJPpsuVAAoJENwGBM22xffeFJAP/jl3XCbz5+m6oAzHh4vdLNKH
+qJ72WU/Eg8HxfbZSR2UAqEAeH7sBNcByCuXBRjqwCa7Yxwmu0kQSJAb8Htg9QRwc
+9sONGqgeFguz6WzbJ/KVKL7TDXuWMVJ3JIqwQvTxOAHB+Yyjr8zbnnmfqX/9lKBb
+URgC0WdlJ3/jEU1JFLj6HuprPYQXza1sp8M/uWo1ncKb/UgiWwbSEwhmlIhINt5q
+UureRMM+drFsFg3qJo+zNLVg8Eh5KYld8iAgIt2tdycODuXiIb92ZoDr0OdN4w2Y
+RpoxuYSVGhS+vLBV7NhzHmumCAUNzW1MY3SuP27GKTzcZR4J5AoONFXJRpCGaWAA
+lRO3nhckaEj7HPRG8IiyyREwliOdtDxF/FGAqWNj8PPnQbGRWRXkVfzaIGkJIk7E
+j6f7kbwt4z2t33+rXxFlNbdftULkhCfUDu6gnZy21P9bVBNU4oIPyDdCHFqwB9X8
+fpmfiwcCuU7idDUmCVJRSKg90xU/i+4WYCTURhOS3ndkZMekdlv5bor4Plmz+nmy
+twrG7+vZG5d9YORXx0zQTQGYG0tk4ShH99ESiC0lQ4ATuwO+wxz2JGLengcPmp9r
+acBTsAjqt/aILf8X1qDLwrHnaeYrXeieu5RCLZQ0GM4t+nXzpR1mkIqOYOKeqA4P
+X8SnjoHqWVPhpTC7Wn0F
+=f3xo
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.8-r1.ebuild b/dev-util/cmake/cmake-2.8.8-r2.ebuild
index ee62927acd67..9ff6373b4080 100644
--- a/dev-util/cmake/cmake-2.8.8-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.8-r2.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/dev-util/cmake/cmake-2.8.8-r1.ebuild,v 1.3 2012/05/06 18:52:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.8-r2.ebuild,v 1.1 2012/05/06 19:05:27 dilfridge Exp $
 
 EAPI=4
 
@@ -14,8 +14,7 @@ HOMEPAGE="http://www.cmake.org/"
 SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
 LICENSE="CMake"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"
 
@@ -58,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
 	"${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch
 	"${FILESDIR}"/${PN}-2.8.8-tests.patch
+	"${FILESDIR}"/${PN}-2.8.8-pkgconfig.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-2.8.8-pkgconfig.patch b/dev-util/cmake/files/cmake-2.8.8-pkgconfig.patch
new file mode 100644
index 000000000000..e5eed4d405d0
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.8-pkgconfig.patch
@@ -0,0 +1,62 @@
+From 3ea850a5023060b84dcc0e6f0098c32c28b15807 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Fri, 13 Apr 2012 08:50:49 +0200
+Subject: [PATCH] FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)
+
+The real fix is from Yury G. Kudryashov while I added the surrounding cleanups.
+An additional hint to really get this fixed came from Rex Dieter.
+---
+ Modules/FindPkgConfig.cmake                   |    8 ++++++--
+ Tests/CMakeOnly/AllFindModules/CMakeLists.txt |    3 +--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
+index 5d93ab1..39d3a76 100644
+--- a/Modules/FindPkgConfig.cmake
++++ b/Modules/FindPkgConfig.cmake
+@@ -13,11 +13,10 @@
+ # When the 'QUIET' argument is set, no status messages will be printed.
+ #
+ # It sets the following variables:
+-#   PKG_CONFIG_FOUND          ... true if pkg-config works on the system
++#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #   PKG_CONFIG_EXECUTABLE     ... pathname of the pkg-config program
+ #   PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
+ #                                 (since CMake 2.8.8)
+-#   PKG_CONFIG_FOUND          ... if pkg-config executable was found
+ #
+ # For the following variables two sets of values exist; first one is the
+ # common one and has the given PREFIX. The second set contains flags
+@@ -104,6 +103,11 @@ find_package_handle_standard_args(PkgConfig
+                                   REQUIRED_VARS PKG_CONFIG_EXECUTABLE
+                                   VERSION_VAR PKG_CONFIG_VERSION_STRING)
+ 
++# This is needed because the module name is "PkgConfig" but the name of
++# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
++# handled by FPHSA.
++set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
++
+ # Unsets the given variables
+ macro(_pkgconfig_unset var)
+   set(${var} "" CACHE INTERNAL "")
+diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+index 6604208..fc65e58 100644
+--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
++++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+@@ -71,7 +71,7 @@ endmacro(check_version_string)
+ # reported.
+ 
+ foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
+-        JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB)
++        JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
+     check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
+ endforeach(VTEST)
+ 
+@@ -82,4 +82,3 @@ endforeach(VTEST)
+ 
+ check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
+ check_version_string(SUBVERSION Subversion_VERSION_SVN)
+-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)
+-- 
+1.7.0
+