kensington 15/05/13 18:34:32 Modified: libqzeitgeist-0.8.0.ebuild ChangeLog Log: Fix build when dev-qt/qttest is missing wrt bug #549046. Add missing dependencies. Improve python handling (it's only used at build time). (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Revision Changes Path 1.7 dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild?r1=1.6&r2=1.7 Index: libqzeitgeist-0.8.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libqzeitgeist/libqzeitgeist-0.8.0.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libqzeitgeist-0.8.0.ebuild 8 Apr 2015 17:51:55 -0000 1.6 +++ libqzeitgeist-0.8.0.ebuild 13 May 2015 18:34:31 -0000 1.7 @@ -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 @@ 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 +} 1.7 dev-libs/libqzeitgeist/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libqzeitgeist/ChangeLog?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libqzeitgeist/ChangeLog?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libqzeitgeist/ChangeLog?r1=1.6&r2=1.7 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libqzeitgeist/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 8 Apr 2015 17:51:55 -0000 1.6 +++ ChangeLog 13 May 2015 18:34:31 -0000 1.7 @@ -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 <[email protected]> + 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 <[email protected]> libqzeitgeist-0.8.0.ebuild: Drop old Python implementations
