[gentoo-commits] proj/kde:master commit in: dev-libs/libqzeitgeist/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     4526f0e1085241a556faf0a78175d8336e8b5211
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 18:35:12 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 13 18:35:12 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4526f0e1

[dev-libs/libqzeitgeist] 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

 dev-libs/libqzeitgeist/libqzeitgeist-9999.ebuild | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/dev-libs/libqzeitgeist/libqzeitgeist-9999.ebuild b/dev-libs/libqzeitgeist/libqzeitgeist-9999.ebuild
index 3bf25c8..5389a8c 100644
--- a/dev-libs/libqzeitgeist/libqzeitgeist-9999.ebuild
+++ b/dev-libs/libqzeitgeist/libqzeitgeist-9999.ebuild
@@ -6,7 +6,7 @@ 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
+}