johu 15/01/29 01:08:31
Modified: psi-9999.ebuild psi-0.15.ebuild psi-0.14-r4.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.22 net-im/psi/psi-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.22&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.22&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?r1=1.21&r2=1.22
Index: psi-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- psi-9999.ebuild 4 Jul 2014 20:10:36 -0000 1.21
+++ psi-9999.ebuild 29 Jan 2015 01:08:31 -0000 1.22
@@ -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 @@
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 @@
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"
1.5 net-im/psi/psi-0.15.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?r1=1.4&r2=1.5
Index: psi-0.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- psi-0.15.ebuild 4 Jul 2014 20:10:36 -0000 1.4
+++ psi-0.15.ebuild 29 Jan 2015 01:08:31 -0000 1.5
@@ -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 @@
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 @@
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
1.17 net-im/psi/psi-0.14-r4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?rev=1.17&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?rev=1.17&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?r1=1.16&r2=1.17
Index: psi-0.14-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- psi-0.14-r4.ebuild 5 Aug 2014 18:34:19 -0000 1.16
+++ psi-0.14-r4.ebuild 29 Jan 2015 01:08:31 -0000 1.17
@@ -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 @@
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 @@
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}
1.240 net-im/psi/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.240&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.240&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?r1=1.239&r2=1.240
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- ChangeLog 5 Aug 2014 18:34:19 -0000 1.239
+++ ChangeLog 29 Jan 2015 01:08:31 -0000 1.240
@@ -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 <j...@gentoo.org> 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 <mr...@gentoo.org> psi-0.14-r4.ebuild,
psi-0.15.ebuild, psi-9999.ebuild:
