From 19f29a1f551d3b90d7f94978c6f885599cb34074 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Thu, 29 Jan 2015 01:35:36 +0000 Subject: Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug #537994. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) --- net-irc/quassel/ChangeLog | 10 ++++++++-- net-irc/quassel/quassel-0.10.0-r1.ebuild | 8 ++++---- net-irc/quassel/quassel-0.10.1.ebuild | 8 ++++---- net-irc/quassel/quassel-0.11.0.ebuild | 8 ++++---- net-irc/quassel/quassel-0.9.2.ebuild | 8 ++++---- net-irc/quassel/quassel-0.9.3.ebuild | 8 ++++---- net-irc/quassel/quassel-9999.ebuild | 8 ++++---- 7 files changed, 32 insertions(+), 26 deletions(-) (limited to 'net-irc') diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog index bb8ba27751ca..436a210eda84 100644 --- a/net-irc/quassel/ChangeLog +++ b/net-irc/quassel/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-irc/quassel -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.184 2014/12/31 13:40:29 kensington Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.185 2015/01/29 01:35:36 johu Exp $ + + 29 Jan 2015; Johannes Huber quassel-0.10.0-r1.ebuild, + quassel-0.10.1.ebuild, quassel-0.11.0.ebuild, quassel-0.9.2.ebuild, + quassel-0.9.3.ebuild, quassel-9999.ebuild: + Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1, bug + #537994. 31 Dec 2014; Michael Palimaka quassel-0.10.0-r1.ebuild, quassel-0.10.1.ebuild, quassel-0.9.2.ebuild, diff --git a/net-irc/quassel/quassel-0.10.0-r1.ebuild b/net-irc/quassel/quassel-0.10.0-r1.ebuild index f583773ae8e2..6b2d45f9d4f6 100644 --- a/net-irc/quassel/quassel-0.10.0-r1.ebuild +++ b/net-irc/quassel/quassel-0.10.0-r1.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/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 1.5 2014/12/31 13:40:29 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.0-r1.ebuild,v 1.6 2015/01/29 01:35:36 johu Exp $ EAPI=5 @@ -21,8 +21,8 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo SERVER_RDEPEND=" dev-qt/qtscript:4 crypt? ( - app-crypt/qca:2 - app-crypt/qca-ossl + app-crypt/qca:2[qt4(+)] + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) diff --git a/net-irc/quassel/quassel-0.10.1.ebuild b/net-irc/quassel/quassel-0.10.1.ebuild index 08831968afa2..59d7daf8fd9b 100644 --- a/net-irc/quassel/quassel-0.10.1.ebuild +++ b/net-irc/quassel/quassel-0.10.1.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/net-irc/quassel/quassel-0.10.1.ebuild,v 1.2 2014/12/31 13:40:29 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.10.1.ebuild,v 1.3 2015/01/29 01:35:36 johu Exp $ EAPI=5 @@ -21,8 +21,8 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo SERVER_RDEPEND=" dev-qt/qtscript:4 crypt? ( - app-crypt/qca:2 - app-crypt/qca-ossl + app-crypt/qca:2[qt4(+)] + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( dev-qt/qtsql:4[postgres] ) diff --git a/net-irc/quassel/quassel-0.11.0.ebuild b/net-irc/quassel/quassel-0.11.0.ebuild index 7c65f44a601a..1343ad137b4e 100644 --- a/net-irc/quassel/quassel-0.11.0.ebuild +++ b/net-irc/quassel/quassel-0.11.0.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/net-irc/quassel/quassel-0.11.0.ebuild,v 1.4 2014/12/31 12:42:10 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.11.0.ebuild,v 1.5 2015/01/29 01:35:36 johu Exp $ EAPI=5 @@ -27,8 +27,8 @@ SERVER_RDEPEND=" !qt5? ( dev-qt/qtscript:4 crypt? ( - app-crypt/qca:2 - app-crypt/qca-ossl + app-crypt/qca:2[qt4(+)] + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) postgres? ( dev-qt/qtsql:4[postgres] ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) diff --git a/net-irc/quassel/quassel-0.9.2.ebuild b/net-irc/quassel/quassel-0.9.2.ebuild index 54a4c6279a52..618c52562755 100644 --- a/net-irc/quassel/quassel-0.9.2.ebuild +++ b/net-irc/quassel/quassel-0.9.2.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/net-irc/quassel/quassel-0.9.2.ebuild,v 1.9 2014/12/31 13:40:29 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.2.ebuild,v 1.10 2015/01/29 01:35:36 johu Exp $ EAPI=4 @@ -25,8 +25,8 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo SERVER_RDEPEND=" >=dev-qt/qtscript-${QT_MINIMAL}:4 crypt? ( - app-crypt/qca:2 - app-crypt/qca-ossl + app-crypt/qca:2[qt4(+)] + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) !postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] ) diff --git a/net-irc/quassel/quassel-0.9.3.ebuild b/net-irc/quassel/quassel-0.9.3.ebuild index 58d99de3243d..3adbb2c5a9a5 100644 --- a/net-irc/quassel/quassel-0.9.3.ebuild +++ b/net-irc/quassel/quassel-0.9.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/net-irc/quassel/quassel-0.9.3.ebuild,v 1.6 2014/12/31 13:40:29 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.9.3.ebuild,v 1.7 2015/01/29 01:35:36 johu Exp $ EAPI=5 @@ -25,8 +25,8 @@ IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslo SERVER_RDEPEND=" >=dev-qt/qtscript-${QT_MINIMAL}:4 crypt? ( - app-crypt/qca:2 - app-crypt/qca-ossl + app-crypt/qca:2[qt4(+)] + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) !postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) postgres? ( >=dev-qt/qtsql-${QT_MINIMAL}:4[postgres] ) diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild index e76a0a5dbf5e..12e1866f0505 100644 --- a/net-irc/quassel/quassel-9999.ebuild +++ b/net-irc/quassel/quassel-9999.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/net-irc/quassel/quassel-9999.ebuild,v 1.75 2014/12/31 12:42:10 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.76 2015/01/29 01:35:36 johu Exp $ EAPI=5 @@ -27,8 +27,8 @@ SERVER_RDEPEND=" !qt5? ( dev-qt/qtscript:4 crypt? ( - app-crypt/qca:2 - app-crypt/qca-ossl + app-crypt/qca:2[qt4(+)] + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) postgres? ( dev-qt/qtsql:4[postgres] ) !postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) -- cgit v1.2.3-65-gdbad