Fix build if qt-test is not installed and add missing dep on qt-test, fixes bug #409131.

Package-Manager: portage-2.2.0_alpha93/cvs/Linux i686

4 files changed, 67 insertions, 18 deletions

diff --git a/dev-libs/grantlee/ChangeLog b/dev-libs/grantlee/ChangeLog
index e522b9695f05..968ca74c5331 100644
--- a/dev-libs/grantlee/ChangeLog
+++ b/dev-libs/grantlee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/grantlee
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/ChangeLog,v 1.10 2012/02/23 16:38:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/ChangeLog,v 1.11 2012/03/22 11:30:06 johu Exp $
+
+  22 Mar 2012; Johannes Huber <johu@gentoo.org>
+  +files/grantlee-0.1.9-qt-test-optional.patch, grantlee-0.1.9.ebuild:
+  Fix build if qt-test is not installed and add missing dep on qt-test, fixes
+  bug #409131.
 
   23 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> grantlee-0.1.8.ebuild,
   grantlee-0.1.9.ebuild:
diff --git a/dev-libs/grantlee/Manifest b/dev-libs/grantlee/Manifest
index 4ead8d18919a..743dc0c418eb 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX grantlee-0.1.8-arm.patch 704 RMD160 b3e9feb1dd07c7bc63797a345dac81dec0c67f7b SHA1 6fa68d534915b824e86d12c65d157b0bfe181d70 SHA256 4d2f67b6bfa6049e1103436da8ad86a22711444702730a017038482814b558c9
+AUX grantlee-0.1.9-qt-test-optional.patch 1428 RMD160 0b5a6c66eb4f7d35c9ff76f0f56b0914f9058334 SHA1 b147ef7341c13cde52d09ad6127880c867be9f39 SHA256 66c75a543a6dc04d85e2d1db6c3d0e0eba5d84c05967188b8bf4cdebcda76913
 DIST grantlee-0.1.8.tar.gz 669703 RMD160 b8e700726aa4764f267919df2ac06bd549e1615b SHA1 322a98e10ff7be2096274f510f262b038fe63387 SHA256 d7d530419960e90c6253358c5a951ca344c2174752a431b4d81d1fd378927a7c
 DIST grantlee-0.1.9.tar.gz 1124725 RMD160 a1a313aadbd833335f9da61a7145a2d5157c7323 SHA1 ca959294d1b45eecd848f6f079731a57832f33e4 SHA256 67f058a65ff3654d1d5f5de8e528332d1dddfd7963ec857de15d83d0acf55984
 EBUILD grantlee-0.1.8.ebuild 1174 RMD160 0dc535a94e774b3dceccd0effed25dd560a6dba5 SHA1 77c00067d6836f5c28b99167133617e395ab5643 SHA256 0f064034b083424dd6656b293362498765d8f75ccad465fdb645f18f5bd74afd
-EBUILD grantlee-0.1.9.ebuild 1135 RMD160 823d7ccdf245fa6e14078f79b4dcd61979ffc51f SHA1 3ae2ee9d133f5bf5421cf251a0154afa0984b04d SHA256 38bbfcec5041f810978add8163f02223975d4ff9db894791fcd2cd2c87451858
-MISC ChangeLog 1557 RMD160 cf58ee78f1eebbd5499e1eb7c0d7067270e91ce9 SHA1 bb463577f9ebc0d371ba3482f5978747702ad20b SHA256 0baca2a4e7ae53a664ce21010e0248bb7a42808445c9f5b9560d336843f91217
+EBUILD grantlee-0.1.9.ebuild 1222 RMD160 7421b0e44b0061c32a78398a3ea8d23ad70faccd SHA1 b0bc2c410ed463372ed0ea06b5fb60a72b9c88c8 SHA256 c174daf343df28827d431f6cfb630f44143a6b497ad9a5e49633283796f11f57
+MISC ChangeLog 1764 RMD160 2f0ef805ae8da1bc2645dd127123a3eaadc665c3 SHA1 8afc662c41db5b186c9c269ade446bf544b26bdd SHA256 08b94b2cf14eea4691b0bb0a1782da7fefae40e6501090c651f6854ba98f0f3a
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPRmuSAAoJEF0huFKJUZL5phUP/Rv+ciiGDePsVpM48oJF9tjY
-1p4DStFvaPVrzwJCcpW1/oeWDV4ts3ok2XOBtBVWhZrclCQ8+1vYMDO84DTyzN+P
-K037E/PIA8lB1hpPuCtrqgNHoWmaWBo+WOsVXwHUFpfly7GC0DO+EIUrqhgK05UO
-92ax1zG1TtACWREW1DuRezxMalIN/DvJiy8zH/YhrUJ+xlTeRoZM9r8Y7AvqrAXc
-Onz0UjU5G5v07qPTf7ncossyhv/WEun+BjFfZbOGU2KtOu17T+RRdvRRi1jbBl73
-09t6ylhBvvtU0trZzkfyQsJw7PPhSD9zvd5Cgj4J7olcZHqf2f7QwBXoSACBI4uH
-fZe+SFWO8n75d67xbfTdmEnNl5GcmYPiPW0qEFrVcu/+WlUSePJvTurjolsZbtEt
-zSqVFbwU4GNhnyCb6z+wni+jdjLS5j0IPAmHw4aY6Qq+A7GpenWMtAKw1aoL0/Vw
-iLo+rPa5ahNzt/SgPq7OiSsiJrqEbR/V6ipEBNXNQnLQNiwIj6FDdf0L2bNxQObl
-k0flzRBow9nKOjhp1F/y1vlPP5OPw+t6VwzUBjZ27Pf/HLnIeGz8Ka8O4tWKeJla
-ULj7Q3VA0ZVc6Ic/DzYswSEFtjSFmb8VweUK/8xf68troOHlfmroBjg6/I/TzcG9
-apoXeGmhXtioxARd0bXO
-=+gg8
+iQEcBAEBCgAGBQJPaw6lAAoJEO+t9ga+3I3aCy4H/3yFZT2yLC5OBCdzKsBIs4C/
+0gKGa5GG7y/OUby7xwvF4c5MUStDfoYBcrZ8Iwgq2clp7UZRN8TSSpHuNgIKYAMY
+sYm4usGnfFYaulO68c9J8LE3rUOMaaC7gFl3zh663va6Pp7TjwxVPmEKEQg1+TBl
+f52xuX5DFkqUTNcui6dDVgz8HPWKDeJEfMhfL9fjlnKhFMWFUhxqCkVEXOjYgTvG
+VkXF6WZXmxtBzxUKo5gXR+qay4GB2fNy9pvrT6A32Fj5PMiH6gLpv/odtcGfIUxb
+zo52d4WfWG/g11YtP+Y3gWjDJMLW7Y1BS08HY6JIyZXpst1R/NeIzNb2qPs1Rz4=
+=ga4U
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
new file mode 100644
index 000000000000..6af42cbab3fb
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-0.1.9-qt-test-optional.patch
@@ -0,0 +1,46 @@
+From ab40a1ce4bff38fe6c19931bcdb46cdf754e29ed Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Thu, 22 Mar 2012 11:37:57 +0100
+Subject: [PATCH] Search only for qt-test if test build option is enabled.
+
+Build fails on systems were no qt-test is installed and the build option
+for tests is disabled. See downstream bug report
+https://bugs.gentoo.org/show_bug.cgi?id=409131.
+---
+ templates/CMakeLists.txt    |    6 +++++-
+ textdocument/CMakeLists.txt |    6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/templates/CMakeLists.txt b/templates/CMakeLists.txt
+index 0594cc3..eec0f12 100644
+--- a/templates/CMakeLists.txt
++++ b/templates/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ 
+-find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
++if (BUILD_TESTS)
++	find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
++else (BUILD_TESTS)
++	find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
++endif (BUILD_TESTS)
+ 
+ include(${Grantlee_USE_FILE})
+ 
+diff --git a/textdocument/CMakeLists.txt b/textdocument/CMakeLists.txt
+index d456663..8fa2892 100644
+--- a/textdocument/CMakeLists.txt
++++ b/textdocument/CMakeLists.txt
+@@ -1,5 +1,9 @@
+ 
+-find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtTest)
++if (BUILD_TESTS)
++	find_package(Qt4 4.5.0 REQUIRED QtCore QtScript QtTest)
++else (BUILD_TESTS)
++        find_package(Qt4 4.5.0 REQUIRED QtCore QtScript)
++endif (BUILD_TESTS)
+ 
+ include(${QT_USE_FILE})
+ 
+-- 
+1.7.9.4
+
diff --git a/dev-libs/grantlee/grantlee-0.1.9.ebuild b/dev-libs/grantlee/grantlee-0.1.9.ebuild
index 1916ea63c9dc..74f889dc96ef 100644
--- a/dev-libs/grantlee/grantlee-0.1.9.ebuild
+++ b/dev-libs/grantlee/grantlee-0.1.9.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-libs/grantlee/grantlee-0.1.9.ebuild,v 1.2 2012/02/23 16:38:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.9.ebuild,v 1.3 2012/03/22 11:30:06 johu Exp $
 
 EAPI=4
 
@@ -22,6 +22,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) )
+	test? ( >=x11-libs/qt-test-4.5.0:4 )
 "
 RDEPEND="${COMMON_DEPEND}"
 
@@ -30,6 +31,8 @@ DOCS=(AUTHORS CHANGELOG GOALS README)
 # Some tests fail
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${P}-qt-test-optional.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build test TESTS)