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 kde-base/kopete: kopete-4.12.5.ebuild kopete-4.14.3.ebuild ChangeLog
Date: Wed, 28 Jan 2015 23:45:29
Message-Id: 20150128234522.1281110837@oystercatcher.gentoo.org
1 johu 15/01/28 23:45:22
2
3 Modified: kopete-4.12.5.ebuild kopete-4.14.3.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.6 kde-base/kopete/kopete-4.12.5.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild?r1=1.5&r2=1.6
15
16 Index: kopete-4.12.5.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- kopete-4.12.5.ebuild 8 May 2014 07:32:50 -0000 1.5
23 +++ kopete-4.12.5.ebuild 28 Jan 2015 23:45:22 -0000 1.6
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/kde-base/kopete/kopete-4.12.5.ebuild,v 1.5 2014/05/08 07:32:50 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild,v 1.6 2015/01/28 23:45:22 johu Exp $
30
31 EAPI=5
32
33 @@ -71,7 +71,7 @@
34 >=dev-qt/qtgui-4.4.0:4[mng]
35 !aqua? ( x11-libs/libXScrnSaver )
36 gadu? ( >=net-libs/libgadu-1.8.0[threads] )
37 - groupwise? ( app-crypt/qca:2 )
38 + groupwise? ( app-crypt/qca:2[qt4(+)] )
39 jingle? (
40 >=media-libs/mediastreamer-2.3.0
41 media-libs/speex
42 @@ -87,7 +87,7 @@
43 dev-libs/libxslt
44 )
45 xmpp? (
46 - app-crypt/qca:2
47 + app-crypt/qca:2[qt4(+)]
48 net-dns/libidn
49 )
50 yahoo? ( media-libs/jasper )
51 @@ -101,7 +101,7 @@
52 virtual/latex-base
53 )
54 sms? ( app-mobilephone/smssend )
55 - ssl? ( app-crypt/qca-ossl )
56 + ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
57 winpopup? ( net-fs/samba )
58 "
59 # telepathy? ( net-libs/decibel )"
60
61
62
63 1.3 kde-base/kopete/kopete-4.14.3.ebuild
64
65 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild?rev=1.3&view=markup
66 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild?rev=1.3&content-type=text/plain
67 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild?r1=1.2&r2=1.3
68
69 Index: kopete-4.14.3.ebuild
70 ===================================================================
71 RCS file: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v
72 retrieving revision 1.2
73 retrieving revision 1.3
74 diff -u -r1.2 -r1.3
75 --- kopete-4.14.3.ebuild 11 Dec 2014 13:05:46 -0000 1.2
76 +++ kopete-4.14.3.ebuild 28 Jan 2015 23:45:22 -0000 1.3
77 @@ -1,6 +1,6 @@
78 -# Copyright 1999-2014 Gentoo Foundation
79 +# Copyright 1999-2015 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.2 2014/12/11 13:05:46 zlogene Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.3 2015/01/28 23:45:22 johu Exp $
83
84 EAPI=5
85
86 @@ -71,7 +71,7 @@
87 >=dev-qt/qtgui-4.4.0:4[mng]
88 !aqua? ( x11-libs/libXScrnSaver )
89 gadu? ( >=net-libs/libgadu-1.8.0[threads] )
90 - groupwise? ( app-crypt/qca:2 )
91 + groupwise? ( app-crypt/qca:2[qt4(+)] )
92 jingle? (
93 >=media-libs/mediastreamer-2.3.0
94 media-libs/speex
95 @@ -86,7 +86,7 @@
96 dev-libs/libxslt
97 )
98 xmpp? (
99 - app-crypt/qca:2
100 + app-crypt/qca:2[qt4(+)]
101 net-dns/libidn
102 )
103 yahoo? ( media-libs/jasper )
104 @@ -100,7 +100,7 @@
105 virtual/latex-base
106 )
107 sms? ( app-mobilephone/smssend )
108 - ssl? ( app-crypt/qca-ossl:2 )
109 + ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
110 winpopup? ( net-fs/samba )
111 "
112 # telepathy? ( net-libs/decibel )"
113
114
115
116 1.450 kde-base/kopete/ChangeLog
117
118 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/ChangeLog?rev=1.450&view=markup
119 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/ChangeLog?rev=1.450&content-type=text/plain
120 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/ChangeLog?r1=1.449&r2=1.450
121
122 Index: ChangeLog
123 ===================================================================
124 RCS file: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v
125 retrieving revision 1.449
126 retrieving revision 1.450
127 diff -u -r1.449 -r1.450
128 --- ChangeLog 11 Dec 2014 15:45:05 -0000 1.449
129 +++ ChangeLog 28 Jan 2015 23:45:22 -0000 1.450
130 @@ -1,6 +1,10 @@
131 # ChangeLog for kde-base/kopete
132 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
133 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.449 2014/12/11 15:45:05 mrueg Exp $
134 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
135 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.450 2015/01/28 23:45:22 johu Exp $
136 +
137 + 28 Jan 2015; Johannes Huber <johu@g.o> kopete-4.12.5.ebuild,
138 + kopete-4.14.3.ebuild:
139 + Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
140
141 11 Dec 2014; Manuel Rüger <mrueg@g.o> -kopete-4.14.2.ebuild:
142 Remove KDE SC 4.14.2
Report Message
Find on MARC Find on Google Groups