johu        15/01/28 23:45:22

  Modified:             kopete-4.12.5.ebuild kopete-4.14.3.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.6                  kde-base/kopete/kopete-4.12.5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild?r1=1.5&r2=1.6

Index: kopete-4.12.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kopete-4.12.5.ebuild        8 May 2014 07:32:50 -0000       1.5
+++ kopete-4.12.5.ebuild        28 Jan 2015 23:45:22 -0000      1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild,v 1.5 
2014/05/08 07:32:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.12.5.ebuild,v 1.6 
2015/01/28 23:45:22 johu Exp $
 
 EAPI=5
 
@@ -71,7 +71,7 @@
        >=dev-qt/qtgui-4.4.0:4[mng]
        !aqua? ( x11-libs/libXScrnSaver )
        gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-       groupwise? ( app-crypt/qca:2 )
+       groupwise? ( app-crypt/qca:2[qt4(+)] )
        jingle? (
                >=media-libs/mediastreamer-2.3.0
                media-libs/speex
@@ -87,7 +87,7 @@
                dev-libs/libxslt
        )
        xmpp? (
-               app-crypt/qca:2
+               app-crypt/qca:2[qt4(+)]
                net-dns/libidn
        )
        yahoo? ( media-libs/jasper )
@@ -101,7 +101,7 @@
                virtual/latex-base
        )
        sms? ( app-mobilephone/smssend )
-       ssl? ( app-crypt/qca-ossl )
+       ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
        winpopup? ( net-fs/samba )
 "
 #      telepathy? ( net-libs/decibel )"



1.3                  kde-base/kopete/kopete-4.14.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild?r1=1.2&r2=1.3

Index: kopete-4.14.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kopete-4.14.3.ebuild        11 Dec 2014 13:05:46 -0000      1.2
+++ kopete-4.14.3.ebuild        28 Jan 2015 23:45:22 -0000      1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.2 
2014/12/11 13:05:46 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.14.3.ebuild,v 1.3 
2015/01/28 23:45:22 johu Exp $
 
 EAPI=5
 
@@ -71,7 +71,7 @@
        >=dev-qt/qtgui-4.4.0:4[mng]
        !aqua? ( x11-libs/libXScrnSaver )
        gadu? ( >=net-libs/libgadu-1.8.0[threads] )
-       groupwise? ( app-crypt/qca:2 )
+       groupwise? ( app-crypt/qca:2[qt4(+)] )
        jingle? (
                >=media-libs/mediastreamer-2.3.0
                media-libs/speex
@@ -86,7 +86,7 @@
                dev-libs/libxslt
        )
        xmpp? (
-               app-crypt/qca:2
+               app-crypt/qca:2[qt4(+)]
                net-dns/libidn
        )
        yahoo? ( media-libs/jasper )
@@ -100,7 +100,7 @@
                virtual/latex-base
        )
        sms? ( app-mobilephone/smssend )
-       ssl? ( app-crypt/qca-ossl:2 )
+       ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
        winpopup? ( net-fs/samba )
 "
 #      telepathy? ( net-libs/decibel )"



1.450                kde-base/kopete/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/ChangeLog?rev=1.450&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/ChangeLog?rev=1.450&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/ChangeLog?r1=1.449&r2=1.450

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -r1.449 -r1.450
--- ChangeLog   11 Dec 2014 15:45:05 -0000      1.449
+++ ChangeLog   28 Jan 2015 23:45:22 -0000      1.450
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.449 
2014/12/11 15:45:05 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.450 
2015/01/28 23:45:22 johu Exp $
+
+  28 Jan 2015; Johannes Huber <[email protected]> kopete-4.12.5.ebuild,
+  kopete-4.14.3.ebuild:
+  Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
 
   11 Dec 2014; Manuel RĂ¼ger <[email protected]> -kopete-4.14.2.ebuild:
   Remove KDE SC 4.14.2




Reply via email to