Add patch by György Balló <ballogyor@gmail.com> to make building of tests optional. Fixes bug #431588.

(Portage version: 2.1.11.10/cvs/Linux x86_64)

3 files changed, 48 insertions, 8 deletions

diff --git a/dev-libs/libindicate-qt/ChangeLog b/dev-libs/libindicate-qt/ChangeLog
index 425dc2161b96..6a9bcf65bfea 100644
--- a/dev-libs/libindicate-qt/ChangeLog
+++ b/dev-libs/libindicate-qt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libindicate-qt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate-qt/ChangeLog,v 1.11 2012/07/27 16:19:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate-qt/ChangeLog,v 1.12 2012/08/16 14:55:32 kensington Exp $
+
+  16 Aug 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/libindicate-qt-0.2.5.91-optionaltests.patch,
+  libindicate-qt-0.2.5.91.ebuild:
+  Add patch by György Balló <ballogyor@gmail.com> to make building of tests
+  optional. Fixes bug #431588.
 
   27 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
   libindicate-qt-0.2.5.91.ebuild:
@@ -51,4 +57,3 @@
   30 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   +libindicate-qt-0.2.2.ebuild, +metadata.xml:
   Initial commit. Add Qt bindings for libindicate.
-
diff --git a/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch b/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch
new file mode 100644
index 000000000000..70a54fdbe6f8
--- /dev/null
+++ b/dev-libs/libindicate-qt/files/libindicate-qt-0.2.5.91-optionaltests.patch
@@ -0,0 +1,24 @@
+https://code.launchpad.net/~ballogy/libindicate-qt/make-examples-and-tests-optional/+merge/82829
+=== modified file 'CMakeLists.txt'
+--- CMakeLists.txt	2010-03-08 09:02:19 +0000
++++ CMakeLists.txt	2011-11-20 20:28:23 +0000
+@@ -36,8 +36,16 @@
+     DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ 
+ add_subdirectory(src)
+-add_subdirectory(examples)
+-add_subdirectory(tests)
++
++option( BUILD_EXAMPLES "build examples" ON )
++if (BUILD_EXAMPLES)
++    add_subdirectory(examples)
++endif (BUILD_EXAMPLES)
++
++option( BUILD_TESTS "build tests" ON )
++if (BUILD_TESTS)
++    add_subdirectory(tests)
++endif (BUILD_TESTS)
+ 
+ # Packaging
+ set(ARCHIVE_NAME libindicate-qt-${indicate_qt_VERSION})
+
diff --git a/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild b/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
index 0847e6e725ec..49e7fe00820c 100644
--- a/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild
+++ b/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.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/libindicate-qt/libindicate-qt-0.2.5.91.ebuild,v 1.3 2012/07/27 16:19:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate-qt/libindicate-qt-0.2.5.91.ebuild,v 1.4 2012/08/16 14:55:32 kensington Exp $
 
 EAPI=4
 inherit eutils virtualx cmake-utils
@@ -15,13 +15,28 @@ SRC_URI="mirror://ubuntu/pool/main/libi/${PN}/${PN}_${PV}.orig.tar.bz2
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
 RDEPEND=">=dev-libs/libindicate-12.10.0
 	x11-libs/qt-gui:4"
 DEPEND="${RDEPEND}
+	test? ( x11-libs/qt-test:4 )
 	virtual/pkgconfig"
 
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
+	epatch "${FILESDIR}"/${P}-optionaltests.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+		$(cmake-utils_use_build test TESTS)
+	)
+
+	cmake-utils_src_configure
+}
+
 src_test() {
 	local ctestargs
 	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
@@ -30,7 +45,3 @@ src_test() {
 
 	VIRTUALX_COMMAND="ctest ${ctestargs}" virtualmake || die
 }
-
-src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
-}