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

Package-Manager: portage-2.1.11.24/cvs/Linux x86_64

4 files changed, 73 insertions, 6 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/Manifest b/dev-libs/libattica/Manifest
index effd898e031d..8386632e3dec 100644
--- a/dev-libs/libattica/Manifest
+++ b/dev-libs/libattica/Manifest
@@ -1,6 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libattica-0.4.1-automagic.patch 908 SHA256 1637cdf67f848522267bb99364481a68e9468931bca573d9685aabda33ca72a1 SHA512 1195ba947ccfba31dd2a3db432025ceeb90e65af23bbbe809e49573746b5915757a1b0c2a0139c8eecef13ba234baf3597f7c927b5cbac436a5cc20dc56ac761 WHIRLPOOL e838e7d68dff339b42138a1f23130a5fb4e2d74c34b5f6fc5b83435b0db7688d7420fb78e828b2fd71491ba80c02d2ae2592e0f258d2caa591708925a18d70ea
 DIST attica-0.4.0.tar.bz2 55598 SHA256 18fa5f99846063175f27b38e0c6b3df841a2c38843406e30d3317175d20f4d9c SHA512 6a57eefbabc583fbe88c5136bdfd2e3ba50fe02aa5e164db18cead44035625f9b60664b75b87eda022722f33455c79870856777f7820212a01143c2d447cbf91 WHIRLPOOL 884638130f510886157b55a6717715174d91e37442ceb2156910fb82ce48d5172034f341bdca77c5e3cb5d8979dc3ed9cb80edfa5e8e244efb39813e09df3ad7
 DIST attica-0.4.1.tar.bz2 58742 SHA256 36d12562c11464e3111df8a36669adcd80c5f3c89ac6b08a708a1bbf8341cde6 SHA512 76d91e66c9661fcd03f61595e9ed4db9fb6972d90e187137ec2ed31e6e329d22a2da08cb23ad10a2385d1da2e60576fd3e743b8fb32c8ab87440f82bef4f99f9 WHIRLPOOL 11f2438e12a59677fbd48eb099e45f3c446949107be98198b04bcea5e3ea2c6534da7fbb7434daceb65627d8ce12ef51413bdc6455ef873523e9bc17dc48048d
 EBUILD libattica-0.4.0.ebuild 682 SHA256 d0f43fc2dee726f2ee8e2bb58558e178bd24880bc74e0cc0709b9e37a30a5ca5 SHA512 2c69429cf777f61fc4c0d54081bf5d5f2cbd5b269c77490572a1590958a31d15c8870395bec35a06e3cc0f8340ae3c1bc2ae7cfea2b3727a1a1d8b70f730d80a WHIRLPOOL 3b3ab6f32604864b8c24b473ceb5ae00240d71dee5ee1509929b9940f0afa5c30b2d0e908058d2f532d12e79209d79d1bf99aff973b0be6a926315d04e4b3150
-EBUILD libattica-0.4.1.ebuild 702 SHA256 599a0b736180e65b0333bd14a64f7fb0f8345ac42a070152c5bead849bbb67ca SHA512 3a56690228e3d52068c26ba10cbf501b5c94ee84f282ad79b1d0e24c1ba8eb96029176c38503cdeb045afbca8f5eb144148274b435f5d826a239ee6b901c0e08 WHIRLPOOL 1d63cf5055b426d69bbda314e099fc5990c6174470e4d20d486457d120f9b8a4f767c676e2fb075e96d7bce67369d552e9ccd4e515d234ffca6c354a2e52d669
-MISC ChangeLog 4051 SHA256 4b4c41b6305b935a7deb2350e1939dac173d3ce5fd31ce870c99824dbf8ed238 SHA512 a17c1508299d3689e5bdf52c4e5cc5f0ce3720d0a29a83ce18e211ced1e86c74c0c0db9400e0c3142d17971b3ed5dd0a63d06a5a3f50bd493623cf5f89459cb5 WHIRLPOOL 7d3b887ddd3599fa7d0da270aa3edd293cf341aca8962044d08a9d842c5b2522e7c16545bd0623d09db7e008e495c166c84629d4b7cab609c00d9eff0907e0bb
+EBUILD libattica-0.4.1.ebuild 912 SHA256 5f790606c2c1b1998e96fd05ae542dd8aa339875b1264a13065e49290c107103 SHA512 3c2e8d2b1791af542b57f4b919e51c5d3543255d4f7b424de7b2abaf543d5515f8079d0adaa49a0cd3eae7e74a5c16b949290ec904a6e79fb329e4b359485911 WHIRLPOOL 9aaa3d0007794c65f1d0f95d154bcaca7111f3f2ac2b008acb991c349ee474bca456d0e1792aff6ae3a8f27d20bebc945465ca8bbd4d2ac72c9314659e39d8d1
+MISC ChangeLog 4296 SHA256 0b57e9713bfab7561e495d3472ec1ca113cf9b929fc1403fb5351b46f601d78e SHA512 cd2f68111c08310f737d6243881df8a7ec29c5e507fb2b39cdd10c900a2d01fc5175b62e7b24abe73fbcae729a458ee2d9519dedaf58ce6e4e0c9065012992e5 WHIRLPOOL 1e1b337257da65fbf6d77b28f20c5db7cc357f69886ae566bd7d280b278586a7fcc3b0f2fb5fa10a6c686f92263debabeb696980f3c343441ba0e4bc20d1651a
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQbYlpAAoJEMbwO6tnXQ0sUlYIAMWe4iF4mtYyajxQ2bDSj6Sr
+D/62sSLhaF6YxPjXinijOwfz9afDAGlpzK4wkB701Av0DR/UWAWAuwLtl7Z+IzQE
+/BK42qOpy2ZHZFpPDqN9tOBYL3J2OPARYWwF+1vNcIf/LR6lhO2mtiAoP5rBg4st
+eGHUqpUAtfSDRDggRZgbWSvHy6wiKNNyU4VeEAKQxhUVi2HOlq2dEh2DaKsd78fG
+Ucqhm0EH1x89/uK6Gl+aPgrVDBLLcHrEIUf+K9IgF6OSJp3LbAoXANn6ikRxxUcp
+ZuRAuOccdD93/QsmJ8adBqUFcdkBU46+Ge932Z+e7O5SOAMAW4e7VsPZIWG8Jd4=
+=xqlK
+-----END PGP SIGNATURE-----
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
+}