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 net-im/qutim: qutim-0.3.1-r1.ebuild qutim-0.3.2.ebuild ChangeLog
Date: Thu, 29 Jan 2015 01:18:15
Message-Id: 20150129011811.0CD2310853@oystercatcher.gentoo.org
1 johu 15/01/29 01:18:11
2
3 Modified: qutim-0.3.1-r1.ebuild qutim-0.3.2.ebuild ChangeLog
4 Log:
5 Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
8
9 Revision Changes Path
10 1.3 net-im/qutim/qutim-0.3.1-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild?r1=1.2&r2=1.3
15
16 Index: qutim-0.3.1-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- qutim-0.3.1-r1.ebuild 31 Dec 2014 13:35:53 -0000 1.2
23 +++ qutim-0.3.1-r1.ebuild 29 Jan 2015 01:18:10 -0000 1.3
24 @@ -1,6 +1,6 @@
25 -# Copyright 1999-2014 Gentoo Foundation
26 +# Copyright 1999-2015 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v 1.2 2014/12/31 13:35:53 kensington Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v 1.3 2015/01/29 01:18:10 johu Exp $
30
31 EAPI=5
32
33 @@ -33,19 +33,19 @@
34 aspell? ( app-text/aspell )
35 awn? ( >=dev-qt/qtdbus-${QT_PV} )
36 ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
37 - crypt? ( app-crypt/qca:2 )
38 + crypt? ( app-crypt/qca:2[qt4(+)] )
39 dbus? ( >=dev-qt/qtdbus-${QT_PV} )
40 debug? ( >=dev-qt/qtdeclarative-${QT_PV} )
41 histman? ( >=dev-qt/qtsql-${QT_PV} )
42 hunspell? ( app-text/hunspell )
43 jabber? (
44 - app-crypt/qca:2
45 + app-crypt/qca:2[qt4(+)]
46 >=net-libs/jreen-1.1.0
47 )
48 kde? ( kde-base/kdelibs:4 )
49 kinetic? ( >=dev-qt/qtdeclarative-${QT_PV} )
50 multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
51 - oscar? ( app-crypt/qca:2 )
52 + oscar? ( app-crypt/qca:2[qt4(+)] )
53 otr? (
54 >=net-libs/libotr-3.2.0
55 <net-libs/libotr-4.0.0
56 @@ -70,8 +70,8 @@
57 kde? ( dev-util/automoc )
58 "
59 RDEPEND="${CDEPEND}
60 - jabber? ( app-crypt/qca-gnupg:2 )
61 - oscar? ( app-crypt/qca-ossl:2 )
62 + jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
63 + oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
64 "
65
66 DOCS=( AUTHORS ChangeLog )
67
68
69
70 1.6 net-im/qutim/qutim-0.3.2.ebuild
71
72 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild?rev=1.6&view=markup
73 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild?rev=1.6&content-type=text/plain
74 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild?r1=1.5&r2=1.6
75
76 Index: qutim-0.3.2.ebuild
77 ===================================================================
78 RCS file: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v
79 retrieving revision 1.5
80 retrieving revision 1.6
81 diff -u -r1.5 -r1.6
82 --- qutim-0.3.2.ebuild 31 Dec 2014 13:35:53 -0000 1.5
83 +++ qutim-0.3.2.ebuild 29 Jan 2015 01:18:10 -0000 1.6
84 @@ -1,6 +1,6 @@
85 -# Copyright 1999-2014 Gentoo Foundation
86 +# Copyright 1999-2015 Gentoo Foundation
87 # Distributed under the terms of the GNU General Public License v2
88 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v 1.5 2014/12/31 13:35:53 kensington Exp $
89 +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v 1.6 2015/01/29 01:18:10 johu Exp $
90
91 EAPI=5
92
93 @@ -42,19 +42,19 @@
94
95 telepathy? ( >=net-libs/telepathy-qt-0.3 )
96 jabber? (
97 - app-crypt/qca:2
98 + app-crypt/qca:2[qt4(+)]
99 >=net-libs/jreen-1.2.0
100 )
101 jingle? ( dev-qt/qt-mobility[multimedia] )
102 - oscar? ( app-crypt/qca:2 )
103 + oscar? ( app-crypt/qca:2[qt4(+)] )
104 purple? ( net-im/pidgin )
105 vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} )
106
107 aspell? ( app-text/aspell )
108 awn? ( >=dev-qt/qtdbus-${QT_PV} )
109 - crypt? ( app-crypt/qca:2 )
110 + crypt? ( app-crypt/qca:2[qt4(+)] )
111 dbus? ( >=dev-qt/qtdbus-${QT_PV} )
112 - espionage? ( app-crypt/qca:2 )
113 + espionage? ( app-crypt/qca:2[qt4(+)] )
114 histman? ( >=dev-qt/qtsql-${QT_PV} )
115 ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
116 hunspell? ( app-text/hunspell )
117 @@ -88,8 +88,8 @@
118 kde? ( dev-util/automoc )
119 "
120 RDEPEND="${CDEPEND}
121 - jabber? ( app-crypt/qca-gnupg:2 )
122 - oscar? ( app-crypt/qca-ossl:2 )
123 + jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
124 + oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
125 || ( kde-apps/oxygen-icons kde-base/oxygen-icons )
126 "
127
128
129
130
131 1.36 net-im/qutim/ChangeLog
132
133 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/ChangeLog?rev=1.36&view=markup
134 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/ChangeLog?rev=1.36&content-type=text/plain
135 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/ChangeLog?r1=1.35&r2=1.36
136
137 Index: ChangeLog
138 ===================================================================
139 RCS file: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v
140 retrieving revision 1.35
141 retrieving revision 1.36
142 diff -u -r1.35 -r1.36
143 --- ChangeLog 31 Dec 2014 13:35:53 -0000 1.35
144 +++ ChangeLog 29 Jan 2015 01:18:11 -0000 1.36
145 @@ -1,6 +1,10 @@
146 # ChangeLog for net-im/qutim
147 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
148 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.35 2014/12/31 13:35:53 kensington Exp $
149 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
150 +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.36 2015/01/29 01:18:11 johu Exp $
151 +
152 + 29 Jan 2015; Johannes Huber <johu@g.o> qutim-0.3.1-r1.ebuild,
153 + qutim-0.3.2.ebuild:
154 + Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
155
156 31 Dec 2014; Michael Palimaka <kensington@g.o> qutim-0.3.1-r1.ebuild,
157 qutim-0.3.2.ebuild:
Report Message
Find on MARC Find on Google Groups