diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-01-28 13:46:33 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-01-28 13:46:33 +0000 |
| commit | 72487883ad760a25a6c4a7f7b8ee4168734404b1 (patch) | |
| tree | 026eea0c65bde22a3a76f70b716f832cba0ad0cd /kde-misc/kdeconnect | |
| parent | Stable on alpha, bug 537936 (diff) | |
| download | gentoo-2-72487883ad760a25a6c4a7f7b8ee4168734404b1.tar.gz gentoo-2-72487883ad760a25a6c4a7f7b8ee4168734404b1.tar.bz2 gentoo-2-72487883ad760a25a6c4a7f7b8ee4168734404b1.zip | |
Adjust app-crypt/qca dependencies to handle merged plugins wrt bug #537640.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'kde-misc/kdeconnect')
| -rw-r--r-- | kde-misc/kdeconnect/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/kde-misc/kdeconnect/ChangeLog b/kde-misc/kdeconnect/ChangeLog index 31cff32d8136..7464c7e0db98 100644 --- a/kde-misc/kdeconnect/ChangeLog +++ b/kde-misc/kdeconnect/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-misc/kdeconnect -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/ChangeLog,v 1.11 2014/11/22 15:54:50 mrueg Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/ChangeLog,v 1.12 2015/01/28 13:46:33 kensington Exp $ + + 28 Jan 2015; Michael Palimaka <kensington@gentoo.org> kdeconnect-0.7.3.ebuild: + Adjust app-crypt/qca dependencies to handle merged plugins wrt bug #537640. 22 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -kdeconnect-0.7.2.ebuild: Cleanup old. diff --git a/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild b/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild index 447682dec874..f71ed0586eb0 100644 --- a/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild +++ b/kde-misc/kdeconnect/kdeconnect-0.7.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-misc/kdeconnect/kdeconnect-0.7.3.ebuild,v 1.2 2014/10/15 19:37:50 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.7.3.ebuild,v 1.3 2015/01/28 13:46:33 kensington Exp $ EAPI=5 @@ -27,13 +27,13 @@ SLOT="4" IUSE="debug" DEPEND=" - app-crypt/qca:2 + app-crypt/qca:2[qt4(+)] dev-libs/qjson x11-libs/libfakekey " RDEPEND="${DEPEND} $(add_kdebase_dep plasma-workspace) - app-crypt/qca-ossl:2 + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) net-dns/avahi " |