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-irc/konversation: konversation-1.5.1.ebuild ChangeLog
Date: Thu, 29 Jan 2015 01:20:55
Message-Id: 20150129012050.8C9A910856@oystercatcher.gentoo.org
1 johu 15/01/29 01:20:50
2
3 Modified: konversation-1.5.1.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.4 net-irc/konversation/konversation-1.5.1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild?r1=1.3&r2=1.4
15
16 Index: konversation-1.5.1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- konversation-1.5.1.ebuild 13 Nov 2014 10:03:24 -0000 1.3
23 +++ konversation-1.5.1.ebuild 29 Jan 2015 01:20:50 -0000 1.4
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-irc/konversation/konversation-1.5.1.ebuild,v 1.3 2014/11/13 10:03:24 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild,v 1.4 2015/01/29 01:20:50 johu Exp $
30
31 EAPI=5
32
33 @@ -22,10 +22,10 @@
34 DEPEND="
35 $(add_kdebase_dep kdepimlibs)
36 media-libs/phonon[qt4]
37 - crypt? ( app-crypt/qca:2 )
38 + crypt? ( app-crypt/qca:2[qt4(+)] )
39 "
40 RDEPEND="${DEPEND}
41 - crypt? ( app-crypt/qca-ossl:2 )
42 + crypt? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
43 "
44
45 src_configure() {
46
47
48
49 1.121 net-irc/konversation/ChangeLog
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/ChangeLog?rev=1.121&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/ChangeLog?rev=1.121&content-type=text/plain
53 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/ChangeLog?r1=1.120&r2=1.121
54
55 Index: ChangeLog
56 ===================================================================
57 RCS file: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v
58 retrieving revision 1.120
59 retrieving revision 1.121
60 diff -u -r1.120 -r1.121
61 --- ChangeLog 13 Nov 2014 10:05:22 -0000 1.120
62 +++ ChangeLog 29 Jan 2015 01:20:50 -0000 1.121
63 @@ -1,6 +1,9 @@
64 # ChangeLog for net-irc/konversation
65 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
66 -# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.120 2014/11/13 10:05:22 kensington Exp $
67 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
68 +# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.121 2015/01/29 01:20:50 johu Exp $
69 +
70 + 29 Jan 2015; Johannes Huber <johu@g.o> konversation-1.5.1.ebuild:
71 + Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
72
73 13 Nov 2014; Michael Palimaka <kensington@g.o>
74 -konversation-1.5.ebuild: