summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-02-22 18:41:23 +0000
committerMichał Górny <mgorny@gentoo.org>2015-02-22 18:41:23 +0000
commitd3c7e9661a3041fcc300db221b30937591db3f71 (patch)
tree82758e287f11312a60d21a883fbbd69999dde14c /net-im/dianara
parentAdd missing dependencies for USE=doc, bug 540966. (diff)
downloadgentoo-2-d3c7e9661a3041fcc300db221b30937591db3f71.tar.gz
gentoo-2-d3c7e9661a3041fcc300db221b30937591db3f71.tar.bz2
gentoo-2-d3c7e9661a3041fcc300db221b30937591db3f71.zip
Update dependency on QCA plugins to use USE flags on app-crypt/qca:2 unconditionally, to provide a single sane path for dependency resolution. Bug #541066.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'net-im/dianara')
-rw-r--r--net-im/dianara/ChangeLog7
-rw-r--r--net-im/dianara/dianara-1.2.4.ebuild4
2 files changed, 8 insertions, 3 deletions
diff --git a/net-im/dianara/ChangeLog b/net-im/dianara/ChangeLog
index 209823b35632..863124f1e8c9 100644
--- a/net-im/dianara/ChangeLog
+++ b/net-im/dianara/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-im/dianara
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/ChangeLog,v 1.19 2015/01/29 00:38:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/ChangeLog,v 1.20 2015/02/22 18:41:23 mgorny Exp $
+
+ 22 Feb 2015; Michał Górny <mgorny@gentoo.org> dianara-1.2.4.ebuild:
+ Update dependency on QCA plugins to use USE flags on app-crypt/qca:2
+ unconditionally, to provide a single sane path for dependency resolution. Bug
+ #541066.
29 Jan 2015; Johannes Huber <johu@gentoo.org> -dianara-1.2.1.ebuild,
dianara-1.2.4.ebuild:
diff --git a/net-im/dianara/dianara-1.2.4.ebuild b/net-im/dianara/dianara-1.2.4.ebuild
index f1ca72085d76..7ebfde0707cc 100644
--- a/net-im/dianara/dianara-1.2.4.ebuild
+++ b/net-im/dianara/dianara-1.2.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/dianara-1.2.4.ebuild,v 1.4 2015/01/29 00:38:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/dianara/dianara-1.2.4.ebuild,v 1.5 2015/02/22 18:41:23 mgorny Exp $
EAPI=5
@@ -25,7 +25,7 @@ DEPEND="
dev-qt/qtgui:4
sys-apps/file"
RDEPEND="${DEPEND}
- || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+ app-crypt/qca:2[openssl]
"
S=${WORKDIR}/${MY_P}