summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2015-01-29 00:45:46 +0000
committerJohannes Huber <johu@gentoo.org>2015-01-29 00:45:46 +0000
commitc835ff816edec9a7f8157b0cddab4b206a1236a1 (patch)
treee1a02ed9850614e9fa1dd1da6fef436db583757f /net-im/ktp-auth-handler
parentAdjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. (diff)
downloadgentoo-2-c835ff816edec9a7f8157b0cddab4b206a1236a1.tar.gz
gentoo-2-c835ff816edec9a7f8157b0cddab4b206a1236a1.tar.bz2
gentoo-2-c835ff816edec9a7f8157b0cddab4b206a1236a1.zip
Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug #537642.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'net-im/ktp-auth-handler')
-rw-r--r--net-im/ktp-auth-handler/ChangeLog8
-rw-r--r--net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild8
2 files changed, 10 insertions, 6 deletions
diff --git a/net-im/ktp-auth-handler/ChangeLog b/net-im/ktp-auth-handler/ChangeLog
index 8d859f80ed23..ef67c9db547e 100644
--- a/net-im/ktp-auth-handler/ChangeLog
+++ b/net-im/ktp-auth-handler/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/ktp-auth-handler
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.32 2014/12/02 13:08:18 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ChangeLog,v 1.33 2015/01/29 00:45:46 johu Exp $
+
+ 29 Jan 2015; Johannes Huber <johu@gentoo.org> ktp-auth-handler-0.9.0.ebuild:
+ Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug
+ #537642.
02 Dec 2014; Michael Palimaka <kensington@gentoo.org>
-ktp-auth-handler-0.8.1.ebuild:
diff --git a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
index e9b169173b0a..8612ee28878e 100644
--- a/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild
+++ b/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.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/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.1 2014/10/26 16:37:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ktp-auth-handler/ktp-auth-handler-0.9.0.ebuild,v 1.2 2015/01/29 00:45:46 johu Exp $
EAPI=5
@@ -23,11 +23,11 @@ SLOT="4"
IUSE="debug"
DEPEND="
- app-crypt/qca:2
+ app-crypt/qca:2[qt4(+)]
>=dev-libs/qjson-0.8
>=net-im/ktp-common-internals-${PV}
>=net-libs/telepathy-qt-0.9.5[qt4]
"
RDEPEND="${DEPEND}
- app-crypt/qca-ossl:2
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
"