mgorny 15/02/22 18:41:23
Modified: psi-9999.ebuild psi-0.15.ebuild psi-0.14-r4.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.23 net-im/psi/psi-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.23&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.23&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?r1=1.22&r2=1.23
Index: psi-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- psi-9999.ebuild 29 Jan 2015 01:08:31 -0000 1.22
+++ psi-9999.ebuild 22 Feb 2015 18:41:23 -0000 1.23
@@ -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/psi/psi-9999.ebuild,v 1.22
2015/01/29 01:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.23
2015/02/22 18:41:23 mgorny Exp $
EAPI="4"
@@ -54,12 +54,12 @@
virtual/pkgconfig
"
PDEPEND="
- crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+ crypt? ( app-crypt/qca:2[gpg] )
jingle? (
net-im/psimedia
- || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] )
+ app-crypt/qca:2[openssl]
)
- ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
+ ssl? ( app-crypt/qca:2[openssl] )
"
RESTRICT="test"
1.6 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.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?r1=1.5&r2=1.6
Index: psi-0.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- psi-0.15.ebuild 29 Jan 2015 01:08:31 -0000 1.5
+++ psi-0.15.ebuild 22 Feb 2015 18:41:23 -0000 1.6
@@ -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/psi/psi-0.15.ebuild,v 1.5 2015/01/29
01:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.6 2015/02/22
18:41:23 mgorny Exp $
EAPI=5
@@ -37,10 +37,10 @@
sys-devel/qconf
doc? ( app-doc/doxygen )"
-PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
jingle? ( net-im/psimedia
- || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
- ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )"
+ app-crypt/qca:2[openssl] )
+ ssl? ( app-crypt/qca:2[openssl] )"
DOC_CONTENTS='Psi+ support(USE="extras") was removed from ebuild since 0.15'
FORCE_PRINT_ELOG=1
1.18 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.18&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?rev=1.18&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?r1=1.17&r2=1.18
Index: psi-0.14-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- psi-0.14-r4.ebuild 29 Jan 2015 01:08:31 -0000 1.17
+++ psi-0.14-r4.ebuild 22 Feb 2015 18:41:23 -0000 1.18
@@ -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/psi/psi-0.14-r4.ebuild,v 1.17
2015/01/29 01:08:31 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.18
2015/02/22 18:41:23 mgorny Exp $
EAPI=4
@@ -44,10 +44,10 @@
sys-devel/qconf
doc? ( app-doc/doxygen )"
-PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) )
+PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
jingle? ( net-im/psimedia
- || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )
- ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )"
+ app-crypt/qca:2[openssl] )
+ ssl? ( app-crypt/qca:2[openssl] )"
S=${WORKDIR}/${MY_P}
1.241 net-im/psi/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.241&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.241&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?r1=1.240&r2=1.241
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- ChangeLog 29 Jan 2015 01:08:31 -0000 1.240
+++ ChangeLog 22 Feb 2015 18:41:23 -0000 1.241
@@ -1,6 +1,12 @@
# ChangeLog for net-im/psi
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.241 2015/02/22
18:41:23 mgorny Exp $
+
+ 22 Feb 2015; Michał Górny <[email protected]> psi-0.14-r4.ebuild,
+ psi-0.15.ebuild, psi-9999.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]> psi-0.14-r4.ebuild,
psi-0.15.ebuild, psi-9999.ebuild:
