johu 15/01/29 01:18:11 Modified: qutim-0.3.1-r1.ebuild qutim-0.3.2.ebuild ChangeLog Log: Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Revision Changes Path 1.3 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.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.1-r1.ebuild?r1=1.2&r2=1.3 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qutim-0.3.1-r1.ebuild 31 Dec 2014 13:35:53 -0000 1.2 +++ qutim-0.3.1-r1.ebuild 29 Jan 2015 01:18:10 -0000 1.3 @@ -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/qutim/qutim-0.3.1-r1.ebuild,v 1.2 2014/12/31 13:35:53 kensington Exp $ +# $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 $ EAPI=5 @@ -33,19 +33,19 @@ aspell? ( app-text/aspell ) awn? ( >=dev-qt/qtdbus-${QT_PV} ) ayatana? ( >=dev-libs/libindicate-qt-0.2.2 ) - crypt? ( app-crypt/qca:2 ) + crypt? ( app-crypt/qca:2[qt4(+)] ) dbus? ( >=dev-qt/qtdbus-${QT_PV} ) debug? ( >=dev-qt/qtdeclarative-${QT_PV} ) histman? ( >=dev-qt/qtsql-${QT_PV} ) hunspell? ( app-text/hunspell ) jabber? ( - app-crypt/qca:2 + app-crypt/qca:2[qt4(+)] >=net-libs/jreen-1.1.0 ) kde? ( kde-base/kdelibs:4 ) kinetic? ( >=dev-qt/qtdeclarative-${QT_PV} ) multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) - oscar? ( app-crypt/qca:2 ) + oscar? ( app-crypt/qca:2[qt4(+)] ) otr? ( >=net-libs/libotr-3.2.0 <net-libs/libotr-4.0.0 @@ -70,8 +70,8 @@ kde? ( dev-util/automoc ) " RDEPEND="${CDEPEND} - jabber? ( app-crypt/qca-gnupg:2 ) - oscar? ( app-crypt/qca-ossl:2 ) + jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) + oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) " DOCS=( AUTHORS ChangeLog ) 1.6 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.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild?r1=1.5&r2=1.6 Index: qutim-0.3.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qutim-0.3.2.ebuild 31 Dec 2014 13:35:53 -0000 1.5 +++ qutim-0.3.2.ebuild 29 Jan 2015 01:18:10 -0000 1.6 @@ -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/qutim/qutim-0.3.2.ebuild,v 1.5 2014/12/31 13:35:53 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.3.2.ebuild,v 1.6 2015/01/29 01:18:10 johu Exp $ EAPI=5 @@ -42,19 +42,19 @@ telepathy? ( >=net-libs/telepathy-qt-0.3 ) jabber? ( - app-crypt/qca:2 + app-crypt/qca:2[qt4(+)] >=net-libs/jreen-1.2.0 ) jingle? ( dev-qt/qt-mobility[multimedia] ) - oscar? ( app-crypt/qca:2 ) + oscar? ( app-crypt/qca:2[qt4(+)] ) purple? ( net-im/pidgin ) vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} ) aspell? ( app-text/aspell ) awn? ( >=dev-qt/qtdbus-${QT_PV} ) - crypt? ( app-crypt/qca:2 ) + crypt? ( app-crypt/qca:2[qt4(+)] ) dbus? ( >=dev-qt/qtdbus-${QT_PV} ) - espionage? ( app-crypt/qca:2 ) + espionage? ( app-crypt/qca:2[qt4(+)] ) histman? ( >=dev-qt/qtsql-${QT_PV} ) ayatana? ( >=dev-libs/libindicate-qt-0.2.2 ) hunspell? ( app-text/hunspell ) @@ -88,8 +88,8 @@ kde? ( dev-util/automoc ) " RDEPEND="${CDEPEND} - jabber? ( app-crypt/qca-gnupg:2 ) - oscar? ( app-crypt/qca-ossl:2 ) + jabber? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) + oscar? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) || ( kde-apps/oxygen-icons kde-base/oxygen-icons ) " 1.36 net-im/qutim/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/ChangeLog?rev=1.36&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/ChangeLog?rev=1.36&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/qutim/ChangeLog?r1=1.35&r2=1.36 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ChangeLog 31 Dec 2014 13:35:53 -0000 1.35 +++ ChangeLog 29 Jan 2015 01:18:11 -0000 1.36 @@ -1,6 +1,10 @@ # ChangeLog for net-im/qutim -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.35 2014/12/31 13:35:53 kensington Exp $ +# 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 $ + + 29 Jan 2015; Johannes Huber <[email protected]> qutim-0.3.1-r1.ebuild, + qutim-0.3.2.ebuild: + Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. 31 Dec 2014; Michael Palimaka <[email protected]> qutim-0.3.1-r1.ebuild, qutim-0.3.2.ebuild:
