mgorny 15/02/22 18:41:23 Modified: qutim-0.3.2.ebuild qutim-0.3.1-r1.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.7 net-im/qutim/qutim-0.3.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild?r1=1.6&r2=1.7 Index: qutim-0.3.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qutim-0.3.2.ebuild 29 Jan 2015 01:18:10 -0000 1.6 +++ qutim-0.3.2.ebuild 22 Feb 2015 18:41:22 -0000 1.7 @@ -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/qutim/qutim-0.3.2.ebuild,v 1.6 2015/01/29 01:18:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v 1.7 2015/02/22 18:41:22 mgorny Exp $ EAPI=5 @@ -88,8 +88,8 @@ kde? ( dev-util/automoc ) " RDEPEND="${CDEPEND} - jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) - oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + jabber? ( app-crypt/qca:2[gpg] ) + oscar? ( app-crypt/qca:2[openssl] ) || ( kde-apps/oxygen-icons kde-base/oxygen-icons ) " 1.4 net-im/qutim/qutim-0.3.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild?r1=1.3&r2=1.4 Index: qutim-0.3.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qutim-0.3.1-r1.ebuild 29 Jan 2015 01:18:10 -0000 1.3 +++ qutim-0.3.1-r1.ebuild 22 Feb 2015 18:41:22 -0000 1.4 @@ -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/qutim/qutim-0.3.1-r1.ebuild,v 1.3 2015/01/29 01:18:10 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild,v 1.4 2015/02/22 18:41:22 mgorny Exp $ EAPI=5 @@ -70,8 +70,8 @@ kde? ( dev-util/automoc ) " RDEPEND="${CDEPEND} - jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) - oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + jabber? ( app-crypt/qca:2[gpg] ) + oscar? ( app-crypt/qca:2[openssl] ) " DOCS=( AUTHORS ChangeLog ) 1.37 net-im/qutim/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/ChangeLog?rev=1.37&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/ChangeLog?rev=1.37&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/ChangeLog?r1=1.36&r2=1.37 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- ChangeLog 29 Jan 2015 01:18:11 -0000 1.36 +++ ChangeLog 22 Feb 2015 18:41:22 -0000 1.37 @@ -1,6 +1,12 @@ # ChangeLog for net-im/qutim # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.36 2015/01/29 01:18:11 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.37 2015/02/22 18:41:22 mgorny Exp $ + + 22 Feb 2015; Michał Górny <[email protected]> qutim-0.3.1-r1.ebuild, + qutim-0.3.2.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]> qutim-0.3.1-r1.ebuild, qutim-0.3.2.ebuild:
