From f97fc044ddc92040b39fae7da9bc4d246c110781 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Mon, 20 Jan 2014 10:37:11 +0000 Subject: Requires libattica built against Qt4. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!) --- media-sound/tomahawk/ChangeLog | 8 ++++++-- media-sound/tomahawk/tomahawk-0.6.1.ebuild | 6 +++--- media-sound/tomahawk/tomahawk-0.7.0.ebuild | 6 +++--- media-sound/tomahawk/tomahawk-9999.ebuild | 7 ++++--- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog index 6b7842def307..ee8a2106cb65 100644 --- a/media-sound/tomahawk/ChangeLog +++ b/media-sound/tomahawk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/tomahawk -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.34 2013/10/23 19:20:02 johu Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.35 2014/01/20 10:37:11 kensington Exp $ + + 20 Jan 2014; Michael Palimaka tomahawk-0.6.1.ebuild, + tomahawk-0.7.0.ebuild, tomahawk-9999.ebuild: + Requires libattica built against Qt4. 23 Oct 2013; Johannes Huber tomahawk-9999.ebuild: Remove qt5 use dep on dev-libs/qtkeychain by Sput on irc. diff --git a/media-sound/tomahawk/tomahawk-0.6.1.ebuild b/media-sound/tomahawk/tomahawk-0.6.1.ebuild index b10fb34406ec..253252622d28 100644 --- a/media-sound/tomahawk/tomahawk-0.6.1.ebuild +++ b/media-sound/tomahawk/tomahawk-0.6.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.6.1.ebuild,v 1.5 2013/07/23 14:07:55 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.6.1.ebuild,v 1.6 2014/01/20 10:37:11 kensington Exp $ EAPI=5 @@ -30,7 +30,7 @@ DEPEND=" app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 - >=dev-libs/libattica-0.4.0 + >=dev-libs/libattica-0.4.0[qt4] dev-libs/qjson dev-libs/quazip >=dev-qt/qtcore-${QT_MINIMAL}:4 diff --git a/media-sound/tomahawk/tomahawk-0.7.0.ebuild b/media-sound/tomahawk/tomahawk-0.7.0.ebuild index d847b09cc603..384c87af5556 100644 --- a/media-sound/tomahawk/tomahawk-0.7.0.ebuild +++ b/media-sound/tomahawk/tomahawk-0.7.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.7.0.ebuild,v 1.4 2013/07/23 14:07:55 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.7.0.ebuild,v 1.5 2014/01/20 10:37:11 kensington Exp $ EAPI=5 @@ -30,7 +30,7 @@ DEPEND=" app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 - >=dev-libs/libattica-0.4.0 + >=dev-libs/libattica-0.4.0[qt4] dev-libs/qjson dev-libs/quazip >=dev-qt/qtcore-${QT_MINIMAL}:4 diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild index 592d5f913430..5a879abe3b90 100644 --- a/media-sound/tomahawk/tomahawk-9999.ebuild +++ b/media-sound/tomahawk/tomahawk-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.21 2013/10/23 19:20:02 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.22 2014/01/20 10:37:11 kensington Exp $ EAPI=5 @@ -29,7 +29,6 @@ DEPEND=" app-crypt/qca:2 >=dev-cpp/clucene-2.3.3.4 >=dev-libs/boost-1.41 - >=dev-libs/libattica-0.4.0 dev-libs/qjson dev-libs/quazip dev-libs/qtkeychain @@ -40,6 +39,7 @@ DEPEND=" x11-libs/libX11 jabber? ( >=net-libs/jreen-1.1.1 ) !qt5? ( + >=dev-libs/libattica-0.4.0[qt4] dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtdbus:4 @@ -49,6 +49,7 @@ DEPEND=" dev-qt/qtwebkit:4 ) qt5? ( + >=dev-libs/libattica-0.4.0[qt5] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtsvg:5 -- cgit v1.2.3-65-gdbad