summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-01-29 00:42:13 +0000
committerJohannes Huber <johu@gentoo.org>2015-01-29 00:42:13 +0000
commit2a8d07a77a23f15881b0bd511fd2eebccd83d390 (patch)
treeb7b119986ed4ec45ef2e98fae657e3e039276474 /net-im
parentAdjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. Remove old. (diff)
downloadgentoo-2-2a8d07a77a23f15881b0bd511fd2eebccd83d390.tar.gz
gentoo-2-2a8d07a77a23f15881b0bd511fd2eebccd83d390.tar.bz2
gentoo-2-2a8d07a77a23f15881b0bd511fd2eebccd83d390.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 'net-im')
-rw-r--r--net-im/kadu/ChangeLog7
-rw-r--r--net-im/kadu/kadu-0.12.3.ebuild8
2 files changed, 9 insertions, 6 deletions
diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index f5791c2cf21b..8f7e0c94ede3 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-im/kadu
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.152 2014/12/31 13:34:24 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.153 2015/01/29 00:42:13 johu Exp $
+
+ 29 Jan 2015; Johannes Huber <johu@gentoo.org> kadu-0.12.3.ebuild:
+ Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
31 Dec 2014; Michael Palimaka <kensington@gentoo.org> kadu-0.12.3.ebuild:
Enforce USE dependency for media-libs/phonon.
diff --git a/net-im/kadu/kadu-0.12.3.ebuild b/net-im/kadu/kadu-0.12.3.ebuild
index ea490b8d4e7e..b8b0c955968e 100644
--- a/net-im/kadu/kadu-0.12.3.ebuild
+++ b/net-im/kadu/kadu-0.12.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/net-im/kadu/kadu-0.12.3.ebuild,v 1.7 2014/12/31 13:34:24 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.12.3.ebuild,v 1.8 2015/01/29 00:42:13 johu Exp $
EAPI="4"
@@ -23,7 +23,7 @@ REQUIRED_USE="
)
"
COMMON_DEPEND="
- >=app-crypt/qca-2.0.0-r2
+ app-crypt/qca:2[qt4(+)]
x11-libs/libX11
x11-libs/libXfixes
x11-libs/libXScrnSaver
@@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xproto
"
RDEPEND="${COMMON_DEPEND}
- app-crypt/qca-ossl:2
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
>=dev-qt/qtsvg-4.7.0:4
speech? ( app-accessibility/powiedz )
"