Fix build when dev-qt/qttest is missing wrt bug #549046. Add missing dependencies. Improve python handling (it's only used at build time).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

3 files changed, 38 insertions, 24 deletions

diff --git a/dev-libs/libqzeitgeist/ChangeLog b/dev-libs/libqzeitgeist/ChangeLog
index 6e91211ba33a..1af65b7ed1d9 100644
--- a/dev-libs/libqzeitgeist/ChangeLog
+++ b/dev-libs/libqzeitgeist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libqzeitgeist
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqzeitgeist/ChangeLog,v 1.6 2015/04/08 17:51:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqzeitgeist/ChangeLog,v 1.7 2015/05/13 18:34:31 kensington Exp $
+
+  13 May 2015; Michael Palimaka <kensington@gentoo.org>
+  libqzeitgeist-0.8.0.ebuild:
+  Fix build when dev-qt/qttest is missing wrt bug #549046. Add missing
+  dependencies. Improve python handling (it's only used at build time).
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> libqzeitgeist-0.8.0.ebuild:
   Drop old Python implementations
diff --git a/dev-libs/libqzeitgeist/Manifest b/dev-libs/libqzeitgeist/Manifest
index f600cb81acc8..3717caf329c4 100644
--- a/dev-libs/libqzeitgeist/Manifest
+++ b/dev-libs/libqzeitgeist/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA256
 
 DIST libqzeitgeist-0.8.0.tar.bz2 29459 SHA256 0a8aa980d64549cce93691705807681fd7e3e079a48aee68fc4b2653f17d61ad SHA512 55e7c3a84dba8e94bb7ef7cc22a8be845e140630878f01add94ec31b0c1d13323dbdcfecddad035dffd8d9b178e0b267395ea227cea94585154d641f8d234f80 WHIRLPOOL e0b87fd54ded54759782468ba95bea5bbde3bd060592165538f221022e1cc014d669b85dd1371c599f35f997e2071af65358da02ffbd051e8fe4fe915a6f2110
-EBUILD libqzeitgeist-0.8.0.ebuild 863 SHA256 002e8c15dd8547138445e0718f6c0e9db8fae2f0570f34ef5e833affb334f81d SHA512 0fba1c1bee7712cb00eba081fe6eece99f573c2ef766cd2fe52fdb497383e34a2ca9c1aa6f36c7249b9c32a653f561f937d47b860b3a548746f56d6b50610d34 WHIRLPOOL d6d36a1549c3a2e8189981775283b943e6d945e210c2495c6ec95ae6134b2999f9e1b65d8863ac586c1b78d04fa1ba9dcf9fcb52005a6a2485a760c6d69351aa
-MISC ChangeLog 1005 SHA256 801b701cfa3663de3f26c5a9c00dc5c0797be0082a3153175123f6ed7a1160bd SHA512 47eecc3829b6d6ddfff4785ffc1d949746f674867dd99d3eb5bffbc154dd68373397fbaf558a9bf91dd723fc9ba1771876af9b14cc66ad159d209948fc8c94d6 WHIRLPOOL 86be6d7bd541e557401474fe30052682d99d277840264c975f8a2ac1b5934228c5d8a37107b7af506794ec86597412a6414f0babb4a471e48d3dea35949d728b
+EBUILD libqzeitgeist-0.8.0.ebuild 1091 SHA256 4eb26a1e19108d901e8e740759e2d3586d9fe72faf6c6c53f54003ab0eb2e03f SHA512 65dcc6443e98c05fa14d043bc58d8f411a12f5ff125f091868e1ea175fad01b7cec955b7dad024a212046ceca55138db63616eb81ccc05189aa9229186430bf3 WHIRLPOOL f3caa029a02e80b27de1fd36ddd676ed6f26467811f85c32f98e536ec5d796b15f4b46aa1629d72f7a8f47874b062e139cbcbda092756dab9f376565b529242d
+MISC ChangeLog 1239 SHA256 51aaa9430009a7001da31724f891fc8b147a31d18088ed810a63e8143e1db80f SHA512 04abcc4991ec5d491fc7f7304cc7c16dc21430eb5c53fde2800cf113a2ce281f174cb610a40b79c4729dccb0983fd64c05381108ceb93e3418a8dd37f9fda39a WHIRLPOOL 7918d3422e6904f516771b4cf1d4f24340d6f80d8ae10d0b5972ad9dbbf367bd5f805bdc87d090393eed65f88672e2ef8cc65690fb3fd3a0b46bc00fcc0eba30
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVU40rRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVU5k/RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7McUD/4m8o8x4mFWYgbZ8fW0Y3bxGfNYN70fy0CV8TdnJBUvTqBo+uyxZohTdLCM
-h/uuVBPZMkQIUQKdBnEf+LZbTMmH5LqZ+Np+kUZ0YMxGxiP/k7pWzbredw4J+8gm
-vKILbElSrrbBRH4GAPKxQr72/bIAf1uXTkXVcrJIlStlKaclh0DNMrmdtiWupV9T
-X7ZNrsYXtYuw3v6GsazyPWEkme7jLHM9NDYo7TzaAK1VJwjif18Ncxe1caHIKWPD
-qfyHMw/Ze0bqhrkC+nVGmORDzrFRjIjFGq8Buesx7A9+6VFSMqNPm9zMR6/s8gOG
-3z9fBTSVNdhr6BC1+5/RQBzJugAd2PlFwQ91lbF4SJCRam6o8n9aKkHb7oDjjEXu
-v5d9JV76SI3hFw5wTOlHT+fCQaMg1BqQTY2D/iWZOrz3qRDwnCPxBxsIMEioJ5R9
-li/dy2Mt+Y/IqSq/aeDj8izFNpi33x987csU9uiUNloMOWHVYaujH2rchnXnV4Ib
-Ljk6rimlFb5ipCDvZmMGIHBihHO3KCFyRayvzalLWoWQgjFHy0JGps99GkkboCq/
-Z14bEKcaHYp4w3RwETO/05nCeFEbfVAUY7Eo1NBR/cf1AUI4imZOUIVS9B//lLBI
-jKi/5TLI7BZxPy+0RDgqWu1RbYCgtTFN05aR2PnpGBoRGZxX2Q==
-=AXL2
+7GnEEACYbAoDnfsqYMLSUi5/Oev6JipYcBA/msXPZKhC2WBKtqYpDdVG1oy77H9B
+UHCSuFwi7S1vLOrUoFmSjjIFixqZAPhgxlXJ6UNgf3fsoUsGEcMi/qlZLwV2782z
+eui8VqZv6UkhFYImb+kl6KBh7/XXnJBWuE1azTZ46C1NRj7D9rpKuFwRkEXWa/pt
+ktRWI7d2vXB/DEpdBwV1IipVIk9dZNV+RuosJf2B7ynJrKc1EjR2aQ45EcWjxKOI
+zbVSG5s/gwxXTRpPzL+OqvsLHrW1Axr8tXJEpqmo2zue6FcBEchcCSnANALxzyUJ
+KJFhI+7PYYdxP4LkUEyF4OX1vxpbeuV030nZviUBOK8JM2o3R2k2hMSG03erawh6
+sMhjZWCPthpZV/Vd2YTi2ke8puMJYl3u++xyKwX/dbCh+0zc77iByyUId99n4x4H
+3XDcZJitm91/NLnRIyIbtKNY8fD/VV33QkXXkpa86CLcLFjI1XQ5trfZLwev+l2K
+rHtpOeL4/HSnUz/MPAVjGzbzrC9kxy022insyd+k7Fi/Qoa05g0bZeYL8x25y/a+
+IbDNTauC1V8Aqu+/oSvj6nSUoK6WIre/HcXl99Y2KLsQSyUK6vjS070MkLSscMTc
+SPtrGGlKxoHNzFTNJBeAuAqr9Tk1HrJDPgcWm5id67qcjcf2/Q==
+=XnPS
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild b/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
index 9a9033604195..cca3cd6bf7d3 100644
--- a/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
+++ b/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild,v 1.6 2015/04/08 17:51:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild,v 1.7 2015/05/13 18:34:31 kensington Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 KDE_REQUIRED="never"
-inherit python-single-r1 kde4-base
+inherit python-any-r1 kde4-base
 
 DESCRIPTION="Qt interface to the Zeitgeist event tracking system"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/libqzeitgeist"
@@ -21,19 +21,28 @@ LICENSE="GPL-2"
 SLOT="4"
 IUSE="debug"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 RDEPEND="
-	${PYTHON_DEPS}
 	dev-libs/libzeitgeist
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
 	dev-qt/qtdeclarative:4
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
+	$(python_gen_any_dep 'gnome-extra/zeitgeist[${PYTHON_USEDEP}]')
 	gnome-extra/zeitgeist
 "
 
+python_check_deps() {
+	has_version "gnome-extra/zeitgeist[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 	kde4-base_pkg_setup
 }
+
+src_prepare() {
+	sed -e "/^find_package(Qt4/s/QtTest//" -i CMakeLists.txt || die
+
+	kde4-base_src_prepare
+}