johu 15/01/29 00:27:02
Modified: tomahawk-0.8.2.ebuild tomahawk-9999.ebuild
ChangeLog
Log:
Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
F3CFD2BD)
Revision Changes Path
1.2 media-sound/tomahawk/tomahawk-0.8.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild?r1=1.1&r2=1.2
Index: tomahawk-0.8.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomahawk-0.8.2.ebuild 16 Jan 2015 23:34:20 -0000 1.1
+++ tomahawk-0.8.2.ebuild 29 Jan 2015 00:27:02 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.1
2015/01/16 23:34:20 johu Exp $
+# $Header:
/var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.2
2015/01/29 00:27:02 johu Exp $
EAPI=5
@@ -30,7 +30,6 @@
# - deps with missing qt4/qt5 use flags
# - does not build with in-tree only deps
DEPEND="
- app-crypt/qca:2
dev-cpp/lucene++
dev-cpp/sparsehash
dev-libs/boost
@@ -43,6 +42,7 @@
hatchet? ( dev-cpp/websocketpp )
jabber? ( net-libs/jreen )
!qt5? (
+ app-crypt/qca:2[qt4(+)]
>=dev-libs/libattica-0.4.0
dev-libs/qjson
dev-libs/qtkeychain[qt4]
@@ -57,6 +57,7 @@
telepathy? ( net-libs/telepathy-qt[qt4] )
)
qt5? (
+ app-crypt/qca:2[qt5(+)]
dev-libs/qtkeychain[qt5]
dev-qt/designer:5
dev-qt/qtcore:5
@@ -69,7 +70,7 @@
)
"
RDEPEND="${DEPEND}
- app-crypt/qca-ossl
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
"
DOCS=( AUTHORS ChangeLog README.md )
1.29 media-sound/tomahawk/tomahawk-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild?rev=1.29&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild?rev=1.29&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild?r1=1.28&r2=1.29
Index: tomahawk-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tomahawk-9999.ebuild 16 Jan 2015 23:34:20 -0000 1.28
+++ tomahawk-9999.ebuild 29 Jan 2015 00:27:02 -0000 1.29
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.28 2015/01/16 23:34:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v
1.29 2015/01/29 00:27:02 johu Exp $
EAPI=5
@@ -30,7 +30,6 @@
# - deps with missing qt4/qt5 use flags
# - does not build with in-tree only deps
DEPEND="
- app-crypt/qca:2
dev-cpp/lucene++
dev-cpp/sparsehash
dev-libs/boost
@@ -43,6 +42,7 @@
hatchet? ( dev-cpp/websocketpp )
jabber? ( net-libs/jreen )
!qt5? (
+ app-crypt/qca:2[qt4]
>=dev-libs/libattica-0.4.0
dev-libs/qjson
dev-libs/qtkeychain[qt4]
@@ -57,6 +57,7 @@
telepathy? ( net-libs/telepathy-qt[qt4] )
)
qt5? (
+ app-crypt/qca:2[qt5]
dev-libs/qtkeychain[qt5]
dev-qt/designer:5
dev-qt/qtcore:5
@@ -69,7 +70,7 @@
)
"
RDEPEND="${DEPEND}
- app-crypt/qca-ossl
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
"
DOCS=( AUTHORS ChangeLog README.md )
1.43 media-sound/tomahawk/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/ChangeLog?rev=1.43&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/ChangeLog?rev=1.43&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/ChangeLog?r1=1.42&r2=1.43
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog 16 Jan 2015 23:34:20 -0000 1.42
+++ ChangeLog 29 Jan 2015 00:27:02 -0000 1.43
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/tomahawk
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.42
2015/01/16 23:34:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.43
2015/01/29 00:27:02 johu Exp $
+
+ 29 Jan 2015; Johannes Huber <[email protected]> tomahawk-0.8.2.ebuild,
+ tomahawk-9999.ebuild:
+ Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
*tomahawk-0.8.2 (16 Jan 2015)
