Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/tomahawk: tomahawk-0.8.2.ebuild tomahawk-9999.ebuild ChangeLog
Date: Thu, 29 Jan 2015 00:27:09
Message-Id: 20150129002702.A485E10846@oystercatcher.gentoo.org
1 johu 15/01/29 00:27:02
2
3 Modified: tomahawk-0.8.2.ebuild tomahawk-9999.ebuild
4 ChangeLog
5 Log:
6 Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
7
8 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
9
10 Revision Changes Path
11 1.2 media-sound/tomahawk/tomahawk-0.8.2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild?r1=1.1&r2=1.2
16
17 Index: tomahawk-0.8.2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- tomahawk-0.8.2.ebuild 16 Jan 2015 23:34:20 -0000 1.1
24 +++ tomahawk-0.8.2.ebuild 29 Jan 2015 00:27:02 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2015 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.1 2015/01/16 23:34:20 johu Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-0.8.2.ebuild,v 1.2 2015/01/29 00:27:02 johu Exp $
30
31 EAPI=5
32
33 @@ -30,7 +30,6 @@
34 # - deps with missing qt4/qt5 use flags
35 # - does not build with in-tree only deps
36 DEPEND="
37 - app-crypt/qca:2
38 dev-cpp/lucene++
39 dev-cpp/sparsehash
40 dev-libs/boost
41 @@ -43,6 +42,7 @@
42 hatchet? ( dev-cpp/websocketpp )
43 jabber? ( net-libs/jreen )
44 !qt5? (
45 + app-crypt/qca:2[qt4(+)]
46 >=dev-libs/libattica-0.4.0
47 dev-libs/qjson
48 dev-libs/qtkeychain[qt4]
49 @@ -57,6 +57,7 @@
50 telepathy? ( net-libs/telepathy-qt[qt4] )
51 )
52 qt5? (
53 + app-crypt/qca:2[qt5(+)]
54 dev-libs/qtkeychain[qt5]
55 dev-qt/designer:5
56 dev-qt/qtcore:5
57 @@ -69,7 +70,7 @@
58 )
59 "
60 RDEPEND="${DEPEND}
61 - app-crypt/qca-ossl
62 + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
63 "
64
65 DOCS=( AUTHORS ChangeLog README.md )
66
67
68
69 1.29 media-sound/tomahawk/tomahawk-9999.ebuild
70
71 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild?rev=1.29&view=markup
72 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild?rev=1.29&content-type=text/plain
73 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild?r1=1.28&r2=1.29
74
75 Index: tomahawk-9999.ebuild
76 ===================================================================
77 RCS file: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v
78 retrieving revision 1.28
79 retrieving revision 1.29
80 diff -u -r1.28 -r1.29
81 --- tomahawk-9999.ebuild 16 Jan 2015 23:34:20 -0000 1.28
82 +++ tomahawk-9999.ebuild 29 Jan 2015 00:27:02 -0000 1.29
83 @@ -1,6 +1,6 @@
84 # Copyright 1999-2015 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.28 2015/01/16 23:34:20 johu Exp $
87 +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.29 2015/01/29 00:27:02 johu Exp $
88
89 EAPI=5
90
91 @@ -30,7 +30,6 @@
92 # - deps with missing qt4/qt5 use flags
93 # - does not build with in-tree only deps
94 DEPEND="
95 - app-crypt/qca:2
96 dev-cpp/lucene++
97 dev-cpp/sparsehash
98 dev-libs/boost
99 @@ -43,6 +42,7 @@
100 hatchet? ( dev-cpp/websocketpp )
101 jabber? ( net-libs/jreen )
102 !qt5? (
103 + app-crypt/qca:2[qt4]
104 >=dev-libs/libattica-0.4.0
105 dev-libs/qjson
106 dev-libs/qtkeychain[qt4]
107 @@ -57,6 +57,7 @@
108 telepathy? ( net-libs/telepathy-qt[qt4] )
109 )
110 qt5? (
111 + app-crypt/qca:2[qt5]
112 dev-libs/qtkeychain[qt5]
113 dev-qt/designer:5
114 dev-qt/qtcore:5
115 @@ -69,7 +70,7 @@
116 )
117 "
118 RDEPEND="${DEPEND}
119 - app-crypt/qca-ossl
120 + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
121 "
122
123 DOCS=( AUTHORS ChangeLog README.md )
124
125
126
127 1.43 media-sound/tomahawk/ChangeLog
128
129 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/ChangeLog?rev=1.43&view=markup
130 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/ChangeLog?rev=1.43&content-type=text/plain
131 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/tomahawk/ChangeLog?r1=1.42&r2=1.43
132
133 Index: ChangeLog
134 ===================================================================
135 RCS file: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v
136 retrieving revision 1.42
137 retrieving revision 1.43
138 diff -u -r1.42 -r1.43
139 --- ChangeLog 16 Jan 2015 23:34:20 -0000 1.42
140 +++ ChangeLog 29 Jan 2015 00:27:02 -0000 1.43
141 @@ -1,6 +1,10 @@
142 # ChangeLog for media-sound/tomahawk
143 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
144 -# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.42 2015/01/16 23:34:20 johu Exp $
145 +# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.43 2015/01/29 00:27:02 johu Exp $
146 +
147 + 29 Jan 2015; Johannes Huber <johu@g.o> tomahawk-0.8.2.ebuild,
148 + tomahawk-9999.ebuild:
149 + Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
150
151 *tomahawk-0.8.2 (16 Jan 2015)
Report Message
Find on MARC Find on Google Groups