From 80be1627a4ed5310fa350b0353d9b25b29de72e1 Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Thu, 29 Jan 2015 01:08:31 +0000 Subject: 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) --- net-im/psi/ChangeLog | 8 ++++++-- net-im/psi/psi-0.14-r4.ebuild | 12 ++++++------ net-im/psi/psi-0.15.ebuild | 12 ++++++------ net-im/psi/psi-9999.ebuild | 12 ++++++------ 4 files changed, 24 insertions(+), 20 deletions(-) (limited to 'net-im') diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog index 91b0e6cb7b64..b1ccdedbe8ad 100644 --- a/net-im/psi/ChangeLog +++ b/net-im/psi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/psi -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.239 2014/08/05 18:34:19 mrueg Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.240 2015/01/29 01:08:31 johu Exp $ + + 29 Jan 2015; Johannes Huber psi-0.14-r4.ebuild, + psi-0.15.ebuild, psi-9999.ebuild: + Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. 05 Aug 2014; Manuel Rüger psi-0.14-r4.ebuild, psi-0.15.ebuild, psi-9999.ebuild: diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild index 07f2b0a367d1..42cde2588bfe 100644 --- a/net-im/psi/psi-0.14-r4.ebuild +++ b/net-im/psi/psi-0.14-r4.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-im/psi/psi-0.14-r4.ebuild,v 1.16 2014/08/05 18:34:19 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.17 2015/01/29 01:08:31 johu Exp $ EAPI=4 @@ -32,7 +32,7 @@ done RDEPEND=">=dev-qt/qtgui-4.4:4[qt3support] >=dev-qt/qt3support-4.4:4 - >=app-crypt/qca-2.0.2:2 + >=app-crypt/qca-2.0.2:2[qt4(+)] dbus? ( >=dev-qt/qtdbus-4.4:4 ) spell? ( >=app-text/enchant-1.3.0 ) xscreensaver? ( x11-libs/libXScrnSaver ) @@ -44,10 +44,10 @@ DEPEND="${RDEPEND} sys-devel/qconf doc? ( app-doc/doxygen )" -PDEPEND="crypt? ( app-crypt/qca-gnupg:2 ) +PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) jingle? ( net-im/psimedia - app-crypt/qca-ossl:2 ) - ssl? ( app-crypt/qca-ossl:2 )" + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )" S=${WORKDIR}/${MY_P} diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild index d15d21b99b51..4c184b6db199 100644 --- a/net-im/psi/psi-0.15.ebuild +++ b/net-im/psi/psi-0.15.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-im/psi/psi-0.15.ebuild,v 1.4 2014/07/04 20:10:36 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.5 2015/01/29 01:08:31 johu Exp $ EAPI=5 @@ -25,7 +25,7 @@ RESTRICT="test" RDEPEND="app-arch/unzip >=dev-qt/qtgui-4.7:4[qt3support] >=dev-qt/qt3support-4.7:4 - >=app-crypt/qca-2.0.2:2 + >=app-crypt/qca-2.0.2:2[qt4(+)] x11-libs/libX11 dbus? ( >=dev-qt/qtdbus-4.7:4 ) spell? ( >=app-text/enchant-1.3.0 ) @@ -37,10 +37,10 @@ DEPEND="${RDEPEND} sys-devel/qconf doc? ( app-doc/doxygen )" -PDEPEND="crypt? ( app-crypt/qca-gnupg:2 ) +PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) jingle? ( net-im/psimedia - app-crypt/qca-ossl:2 ) - ssl? ( app-crypt/qca-ossl:2 )" + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) + ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )" DOC_CONTENTS='Psi+ support(USE="extras") was removed from ebuild since 0.15' FORCE_PRINT_ELOG=1 diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild index 2b48f8b46538..1db012c8c4d2 100644 --- a/net-im/psi/psi-9999.ebuild +++ b/net-im/psi/psi-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-im/psi/psi-9999.ebuild,v 1.21 2014/07/04 20:10:36 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.22 2015/01/29 01:08:31 johu Exp $ EAPI="4" @@ -32,7 +32,7 @@ REQUIRED_USE=" RDEPEND=" >=dev-qt/qtgui-4.7:4 - >=app-crypt/qca-2.0.2:2 + >=app-crypt/qca-2.0.2:2[qt4(+)] x11-libs/libX11 dbus? ( >=dev-qt/qtdbus-4.7:4 ) whiteboarding? ( dev-qt/qtsvg:4 ) @@ -54,12 +54,12 @@ DEPEND="${RDEPEND} virtual/pkgconfig " PDEPEND=" - crypt? ( app-crypt/qca-gnupg:2 ) + crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) jingle? ( net-im/psimedia - app-crypt/qca-ossl:2 + || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) - ssl? ( app-crypt/qca-ossl:2 ) + ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) " RESTRICT="test" -- cgit v1.2.3-65-gdbad