diff options
| author |   Johannes Huber <johu@gentoo.org> | 2015-01-28 23:45:22 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-01-28 23:45:22 +0000 |
| commit | 636dac4ddbdd7b9ec6ed4ae8b17083f37590688b (patch) | |
| tree | f98b4b866cb082e445331e96f72af13f55459fa6 /kde-base | |
| parent | Adjust use dependencies to handle >=app-crypt/qca-2.1. (diff) | |
| download | gentoo-2-636dac4ddbdd7b9ec6ed4ae8b17083f37590688b.tar.gz gentoo-2-636dac4ddbdd7b9ec6ed4ae8b17083f37590688b.tar.bz2 gentoo-2-636dac4ddbdd7b9ec6ed4ae8b17083f37590688b.zip | |
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)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kopete/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/kopete/kopete-4.12.5.ebuild | 10 | ||||
| -rw-r--r-- | kde-base/kopete/kopete-4.14.3.ebuild | 10 |
3 files changed, 16 insertions, 12 deletions
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index 5227ece90b51..6761b295aecb 100644 --- a/kde-base/kopete/ChangeLog +++ b/kde-base/kopete/ChangeLog @@ -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 <johu@gentoo.org> 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 <mrueg@gentoo.org> -kopete-4.14.2.ebuild: Remove KDE SC 4.14.2 diff --git a/kde-base/kopete/kopete-4.12.5.ebuild b/kde-base/kopete/kopete-4.12.5.ebuild index cf15be234943..d1c05667f074 100644 --- a/kde-base/kopete/kopete-4.12.5.ebuild +++ b/kde-base/kopete/kopete-4.12.5.ebuild @@ -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 @@ COMMONDEPEND=" >=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 @@ COMMONDEPEND=" dev-libs/libxslt ) xmpp? ( - app-crypt/qca:2 + app-crypt/qca:2[qt4(+)] net-dns/libidn ) yahoo? ( media-libs/jasper ) @@ -101,7 +101,7 @@ RDEPEND="${COMMONDEPEND} 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 )" diff --git a/kde-base/kopete/kopete-4.14.3.ebuild b/kde-base/kopete/kopete-4.14.3.ebuild index c1db5cc60261..8f474bc8c749 100644 --- a/kde-base/kopete/kopete-4.14.3.ebuild +++ b/kde-base/kopete/kopete-4.14.3.ebuild @@ -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 @@ COMMONDEPEND=" >=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 @@ COMMONDEPEND=" dev-libs/libxslt ) xmpp? ( - app-crypt/qca:2 + app-crypt/qca:2[qt4(+)] net-dns/libidn ) yahoo? ( media-libs/jasper ) @@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND} 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 )" |