Build tests conditionally, backporting a patch from upstream to correct a dependency issue. Fixes bug #434670.

(Portage version: 2.1.11.24/cvs/Linux x86_64)

3 files changed, 56 insertions, 4 deletions

diff --git a/dev-libs/libattica/ChangeLog b/dev-libs/libattica/ChangeLog
index fa60c9d82e04..f5eca60e69ce 100644
--- a/dev-libs/libattica/ChangeLog
+++ b/dev-libs/libattica/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libattica
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/ChangeLog,v 1.33 2012/08/22 13:40:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/ChangeLog,v 1.34 2012/10/04 13:05:41 kensington Exp $
+
+  04 Oct 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/libattica-0.4.1-automagic.patch, libattica-0.4.1.ebuild:
+  Build tests conditionally, backporting a patch from upstream to correct a
+  dependency issue. Fixes bug #434670.
 
   22 Aug 2012; Agostino Sarubbo <ago@gentoo.org> libattica-0.4.1.ebuild:
   Add qt-test as a DEPEND, thanks to Vladimir V. Kamarzin, wrt to bug #432264
diff --git a/dev-libs/libattica/files/libattica-0.4.1-automagic.patch b/dev-libs/libattica/files/libattica-0.4.1-automagic.patch
new file mode 100644
index 000000000000..3c1ea1d55917
--- /dev/null
+++ b/dev-libs/libattica/files/libattica-0.4.1-automagic.patch
@@ -0,0 +1,36 @@
+From 1d930b3b6b7c9b4d8ba94f5f390519161ad623c5 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 4 Oct 2012 22:51:24 +1000
+Subject: [PATCH] Make the dependency check for QtTest conditional - it is
+ only required to build tests.
+
+REVIEW: 106706
+---
+ lib/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 49a74ef..a8114d9 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -12,7 +12,6 @@ set(QT_MIN_VERSION "4.7.0")
+ find_package(Qt5Transitional REQUIRED
+     Core
+     Network
+-    Test
+ )
+ 
+ # TODO: Remove me once fixed in ECM module
+@@ -189,6 +188,9 @@ endif(NOT WIN32)
+ 
+ # Add the optional subdirectory with unit tests
+ if (ATTICA_ENABLE_TESTS)
++    find_package(Qt5Transitional REQUIRED
++        Test
++    )
+     add_subdirectory(tests)
+ endif (ATTICA_ENABLE_TESTS)
+ 
+-- 
+1.7.12
+
diff --git a/dev-libs/libattica/libattica-0.4.1.ebuild b/dev-libs/libattica/libattica-0.4.1.ebuild
index 16ea55b47285..c824e220878c 100644
--- a/dev-libs/libattica/libattica-0.4.1.ebuild
+++ b/dev-libs/libattica/libattica-0.4.1.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/libattica/libattica-0.4.1.ebuild,v 1.2 2012/08/22 13:40:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libattica/libattica-0.4.1.ebuild,v 1.3 2012/10/04 13:05:41 kensington Exp $
 
 EAPI=4
 
@@ -16,12 +16,23 @@ SRC_URI="mirror://kde/stable/${MY_PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="debug"
+IUSE="debug test"
 
 RDEPEND="x11-libs/qt-core:4"
 DEPEND="${RDEPEND}
-	x11-libs/qt-test:4"
+	test? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-test:4
+	)"
 
 DOCS=(AUTHORS ChangeLog README)
+PATCHES=( "${FILESDIR}/${P}-automagic.patch" )
 
 S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use test ATTICA_ENABLE_TESTS)
+	)
+	cmake-utils_src_configure
+}