Fix optional building of tests, wrt bug #416845 by Franz Fellner <alpine.art.de@googlemail.com>.

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

4 files changed, 36 insertions, 8 deletions

diff --git a/dev-libs/libdbusmenu-qt/ChangeLog b/dev-libs/libdbusmenu-qt/ChangeLog
index 63ae7b830449..0a51e7e3415f 100644
--- a/dev-libs/libdbusmenu-qt/ChangeLog
+++ b/dev-libs/libdbusmenu-qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libdbusmenu-qt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.26 2012/05/18 20:16:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/ChangeLog,v 1.27 2012/05/22 16:36:38 kensington Exp $
+
+  22 May 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/libdbusmenu-qt-0.9.2-optionaltests.patch, libdbusmenu-qt-0.9.2.ebuild:
+  Fix optional building of tests, wrt bug #416845 by Franz Fellner
+  <alpine.art.de@googlemail.com>.
 
   18 May 2012; <creffett@gentoo.org> libdbusmenu-qt-0.9.2.ebuild:
   Fix live repository, upstream moved from git to bzr
diff --git a/dev-libs/libdbusmenu-qt/Manifest b/dev-libs/libdbusmenu-qt/Manifest
index e5865cc2a839..77e945c6a167 100644
--- a/dev-libs/libdbusmenu-qt/Manifest
+++ b/dev-libs/libdbusmenu-qt/Manifest
@@ -1,16 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libdbusmenu-qt-0.9.2-optionaltests.patch 307 RMD160 481401b4e876a03300ed4451614f74e97d1c79da SHA1 4d6f67a227c2f385d97d3c1a79cc0386b8e3ad85 SHA256 54ab953b82ca7d42900d6141b1f276c34b58f332c339962545eddf025327ee4c
 DIST libdbusmenu-qt-0.8.2.tar.xz 35916 RMD160 0837e9ca01aca628c92c55eca21cca07aa170701 SHA1 12acb11e1f62888edc95e1c42cf60759f29bf1d6 SHA256 8dae417a768cd9de1f7b36b617d11757f27b93a71ad833045141ada84514b9f1
 DIST libdbusmenu-qt-0.9.2.tar.xz 242888 RMD160 7d44994da1a48b6d6267c6483b983f18560289d7 SHA1 5afe9937bee6a745ef4dfd7afa8c37336bed628a SHA256 ecd1108f637c4c58946aff2aba70010f8060bd87c1acc85a917c2b3f43cf406d
 EBUILD libdbusmenu-qt-0.8.2.ebuild 1532 RMD160 2fb9f37bd56819acf80557c4a0bfa8ed2e0d94de SHA1 82a9336db6a4028c6257b1bfe27ba0bd91a29284 SHA256 d20e02aa4b770ec357e5872a2479ee5bc5b4d9d75bdd44014f1037541c57a033
-EBUILD libdbusmenu-qt-0.9.2.ebuild 1505 RMD160 bca76fccf5c0efd189ba23561f479713014c6d17 SHA1 942f4bb553d1fbdb4a4248b949ead67141b50e34 SHA256 1bccd889faf2d75170466841f212f0d12e14869b992a7788cc3202b7930c0f31
-MISC ChangeLog 4255 RMD160 d514357c506e478ec6bee16880c34461a40a168d SHA1 10185c1fd73cb19412da03e7cd2c0305a8376868 SHA256 5b00ba4df5c10ec8e7aa1a2e8f87d6292f230548cdcc060d13785b3b98302f83
+EBUILD libdbusmenu-qt-0.9.2.ebuild 1560 RMD160 a065a64ec413525ecc484368e7343d1c1ef8bf7b SHA1 3060bbff37b39c9a31303ac24b256ebb8b956479 SHA256 5cfc9c279cc83771ec21fb899568bad5883dc19e92b35e904298b56f202eec16
+MISC ChangeLog 4495 RMD160 34c8fd1d3e931adc65e4504c153d8275fdd7b859 SHA1 2abaeadd8e2c37bc3c0f713efe341dca1f2869ac SHA256 6bd72441d75e3d7a38a0f0c88097e7f4ef7dd1cbbd1653754afed8c5b86275f7
 MISC metadata.xml 255 RMD160 642c3b5f3c72bd1860e036ddbe4b4d1a1552973e SHA1 39ce9722013044164a781d0b1ca3f4d530baba71 SHA256 dc41bad6a32aa70aaf9724aa119a3bfbe4b0c81e29add0cd88c3f71223344984
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+2ryoACgkQ23laikJhg1R5HQCgmf64KKo247lNDx6k549s4cyd
-jZQAn27DQppfRT3ZihwWTM1Mr/AHyD18
-=SuAr
+iQEcBAEBAgAGBQJPu8CIAAoJEMbwO6tnXQ0sVREH/0IBFnGkiBm5hMQYHi8LNuHu
+q0RagWeGocZfvW2lOmjQ7BBzyDcDhU0CN2IbdFDud+7haJ+/em42caTb8w2Qdj0d
+YZ9W7McIYjtja8Hk6NMSscTcUPi5Vuf0jZ4cGjrNu+8tEt+e9pb1s93JFM4zp5aG
++0CYJwO07Y4UabKkXFLkDT2kIAu4sOxvZgtAzS0uCA9mosE3SPRfG1A5xSzEHI73
+jeQqROdt0iN23qxqbAGUMHwQIWsNa0G7tiEJkrOD+4QMwfUA1sJEtEZgMzZFXeyZ
+m7xATtoQKqvMFNxAMGn1Q05GaIAARNrJkHa7PaUc3hffT2MDWE/39021pMPIr7w=
+=J3zq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch
new file mode 100644
index 000000000000..35df4632eae5
--- /dev/null
+++ b/dev-libs/libdbusmenu-qt/files/libdbusmenu-qt-0.9.2-optionaltests.patch
@@ -0,0 +1,17 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -59,8 +59,13 @@
+     DESTINATION lib${LIB_SUFFIX}/pkgconfig
+     )
+ 
++
++option(BUILD_TESTS "Build tests" ON)
++
+ add_subdirectory(src)
+-add_subdirectory(tests)
++if(BUILD_TESTS)
++    add_subdirectory(tests)
++endif(BUILD_TESTS)
+ add_subdirectory(tools)
+ 
+ if(WITH_DOC)
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild
index cf521c3c350e..604345918b0c 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.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/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild,v 1.2 2012/05/18 20:16:57 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.2.ebuild,v 1.3 2012/05/22 16:36:38 kensington Exp $
 
 EAPI=4
 
@@ -38,7 +38,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
-DOCS=(NEWS README)
+DOCS=( NEWS README )
+PATCHES=( "${FILESDIR}/${P}-optionaltests.patch" )
 
 # tests fail due to missing conection to dbus
 RESTRICT="test"