mgorny 15/02/22 18:41:23 Modified: konversation-1.5.1.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.5 net-irc/konversation/konversation-1.5.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild?r1=1.4&r2=1.5 Index: konversation-1.5.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- konversation-1.5.1.ebuild 29 Jan 2015 01:20:50 -0000 1.4 +++ konversation-1.5.1.ebuild 22 Feb 2015 18:41:23 -0000 1.5 @@ -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-irc/konversation/konversation-1.5.1.ebuild,v 1.4 2015/01/29 01:20:50 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/konversation-1.5.1.ebuild,v 1.5 2015/02/22 18:41:23 mgorny Exp $ EAPI=5 @@ -25,7 +25,7 @@ crypt? ( app-crypt/qca:2[qt4(+)] ) " RDEPEND="${DEPEND} - crypt? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + crypt? ( app-crypt/qca:2[openssl] ) " src_configure() { 1.122 net-irc/konversation/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/ChangeLog?rev=1.122&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/ChangeLog?rev=1.122&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/konversation/ChangeLog?r1=1.121&r2=1.122 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- ChangeLog 29 Jan 2015 01:20:50 -0000 1.121 +++ ChangeLog 22 Feb 2015 18:41:23 -0000 1.122 @@ -1,6 +1,11 @@ # ChangeLog for net-irc/konversation # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.121 2015/01/29 01:20:50 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/konversation/ChangeLog,v 1.122 2015/02/22 18:41:23 mgorny Exp $ + + 22 Feb 2015; Michał Górny <[email protected]> konversation-1.5.1.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 <[email protected]> konversation-1.5.1.ebuild: Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1.
