[gentoo-commits] proj/kde:master commit in: dev-libs/grantlee/, dev-libs/grantlee/files/

["Johannes Huber" <johu@gentoo.org>]

commit:     0b0410fb8b691311e324a89aff9cb647c4123969
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 11:49:17 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 11:49:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0b0410fb

[dev-libs/grantlee] Fix build if qt-test is not installed and add missing dep on qt-test, fixes bug 409131.

(Portage version: 2.2.0_alpha93/git/Linux i686, unsigned Manifest commit)

---
 .../files/grantlee-0.1.9-qt-test-optional.patch    |   46 ++++++++++++++++++++
 dev-libs/grantlee/grantlee-0.2.0.ebuild            |    3 +
 dev-libs/grantlee/grantlee-9999.ebuild             |    3 +
 3 files changed, 52 insertions(+), 0 deletions(-)

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 0000000..6af42cb
--- /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.2.0.ebuild b/dev-libs/grantlee/grantlee-0.2.0.ebuild
index 3c93aef..8fc5cbb 100644
--- a/dev-libs/grantlee/grantlee-0.2.0.ebuild
+++ b/dev-libs/grantlee/grantlee-0.2.0.ebuild
@@ -23,6 +23,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-${QT_MINIMAL}:4 )
 "
 RDEPEND="${COMMON_DEPEND}"
 
@@ -31,6 +32,8 @@ DOCS=(AUTHORS CHANGELOG GOALS README)
 # Some tests fail
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build test TESTS)

diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild
index ad22812..6f3de7d 100644
--- a/dev-libs/grantlee/grantlee-9999.ebuild
+++ b/dev-libs/grantlee/grantlee-9999.ebuild
@@ -23,11 +23,14 @@ 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-${QT_MINIMAL}:4 )
 "
 RDEPEND="${COMMON_DEPEND}"
 
 DOCS=(AUTHORS CHANGELOG GOALS README)
 
+PATCHES=( "${FILESDIR}/${PN}-0.1.9-qt-test-optional.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build test TESTS)