| 1 |
johu 15/01/29 01:08:31 |
| 2 |
|
| 3 |
Modified: psi-9999.ebuild psi-0.15.ebuild psi-0.14-r4.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. |
| 7 |
|
| 8 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.22 net-im/psi/psi-9999.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.22&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.22&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?r1=1.21&r2=1.22 |
| 16 |
|
| 17 |
Index: psi-9999.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v |
| 20 |
retrieving revision 1.21 |
| 21 |
retrieving revision 1.22 |
| 22 |
diff -u -r1.21 -r1.22 |
| 23 |
--- psi-9999.ebuild 4 Jul 2014 20:10:36 -0000 1.21 |
| 24 |
+++ psi-9999.ebuild 29 Jan 2015 01:08:31 -0000 1.22 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
-# Copyright 1999-2014 Gentoo Foundation |
| 27 |
+# Copyright 1999-2015 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.21 2014/07/04 20:10:36 hasufell Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.22 2015/01/29 01:08:31 johu Exp $ |
| 31 |
|
| 32 |
EAPI="4" |
| 33 |
|
| 34 |
@@ -32,7 +32,7 @@ |
| 35 |
|
| 36 |
RDEPEND=" |
| 37 |
>=dev-qt/qtgui-4.7:4 |
| 38 |
- >=app-crypt/qca-2.0.2:2 |
| 39 |
+ >=app-crypt/qca-2.0.2:2[qt4(+)] |
| 40 |
x11-libs/libX11 |
| 41 |
dbus? ( >=dev-qt/qtdbus-4.7:4 ) |
| 42 |
whiteboarding? ( dev-qt/qtsvg:4 ) |
| 43 |
@@ -54,12 +54,12 @@ |
| 44 |
virtual/pkgconfig |
| 45 |
" |
| 46 |
PDEPEND=" |
| 47 |
- crypt? ( app-crypt/qca-gnupg:2 ) |
| 48 |
+ crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) |
| 49 |
jingle? ( |
| 50 |
net-im/psimedia |
| 51 |
- app-crypt/qca-ossl:2 |
| 52 |
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) |
| 53 |
) |
| 54 |
- ssl? ( app-crypt/qca-ossl:2 ) |
| 55 |
+ ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) |
| 56 |
" |
| 57 |
RESTRICT="test" |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
1.5 net-im/psi/psi-0.15.ebuild |
| 63 |
|
| 64 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?rev=1.5&view=markup |
| 65 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?rev=1.5&content-type=text/plain |
| 66 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?r1=1.4&r2=1.5 |
| 67 |
|
| 68 |
Index: psi-0.15.ebuild |
| 69 |
=================================================================== |
| 70 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v |
| 71 |
retrieving revision 1.4 |
| 72 |
retrieving revision 1.5 |
| 73 |
diff -u -r1.4 -r1.5 |
| 74 |
--- psi-0.15.ebuild 4 Jul 2014 20:10:36 -0000 1.4 |
| 75 |
+++ psi-0.15.ebuild 29 Jan 2015 01:08:31 -0000 1.5 |
| 76 |
@@ -1,6 +1,6 @@ |
| 77 |
-# Copyright 1999-2014 Gentoo Foundation |
| 78 |
+# Copyright 1999-2015 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.4 2014/07/04 20:10:36 hasufell Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.5 2015/01/29 01:08:31 johu Exp $ |
| 82 |
|
| 83 |
EAPI=5 |
| 84 |
|
| 85 |
@@ -25,7 +25,7 @@ |
| 86 |
RDEPEND="app-arch/unzip |
| 87 |
>=dev-qt/qtgui-4.7:4[qt3support] |
| 88 |
>=dev-qt/qt3support-4.7:4 |
| 89 |
- >=app-crypt/qca-2.0.2:2 |
| 90 |
+ >=app-crypt/qca-2.0.2:2[qt4(+)] |
| 91 |
x11-libs/libX11 |
| 92 |
dbus? ( >=dev-qt/qtdbus-4.7:4 ) |
| 93 |
spell? ( >=app-text/enchant-1.3.0 ) |
| 94 |
@@ -37,10 +37,10 @@ |
| 95 |
sys-devel/qconf |
| 96 |
doc? ( app-doc/doxygen )" |
| 97 |
|
| 98 |
-PDEPEND="crypt? ( app-crypt/qca-gnupg:2 ) |
| 99 |
+PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) |
| 100 |
jingle? ( net-im/psimedia |
| 101 |
- app-crypt/qca-ossl:2 ) |
| 102 |
- ssl? ( app-crypt/qca-ossl:2 )" |
| 103 |
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) |
| 104 |
+ ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )" |
| 105 |
|
| 106 |
DOC_CONTENTS='Psi+ support(USE="extras") was removed from ebuild since 0.15' |
| 107 |
FORCE_PRINT_ELOG=1 |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
1.17 net-im/psi/psi-0.14-r4.ebuild |
| 112 |
|
| 113 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?rev=1.17&view=markup |
| 114 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?rev=1.17&content-type=text/plain |
| 115 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?r1=1.16&r2=1.17 |
| 116 |
|
| 117 |
Index: psi-0.14-r4.ebuild |
| 118 |
=================================================================== |
| 119 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v |
| 120 |
retrieving revision 1.16 |
| 121 |
retrieving revision 1.17 |
| 122 |
diff -u -r1.16 -r1.17 |
| 123 |
--- psi-0.14-r4.ebuild 5 Aug 2014 18:34:19 -0000 1.16 |
| 124 |
+++ psi-0.14-r4.ebuild 29 Jan 2015 01:08:31 -0000 1.17 |
| 125 |
@@ -1,6 +1,6 @@ |
| 126 |
-# Copyright 1999-2014 Gentoo Foundation |
| 127 |
+# Copyright 1999-2015 Gentoo Foundation |
| 128 |
# Distributed under the terms of the GNU General Public License v2 |
| 129 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.16 2014/08/05 18:34:19 mrueg Exp $ |
| 130 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.17 2015/01/29 01:08:31 johu Exp $ |
| 131 |
|
| 132 |
EAPI=4 |
| 133 |
|
| 134 |
@@ -32,7 +32,7 @@ |
| 135 |
|
| 136 |
RDEPEND=">=dev-qt/qtgui-4.4:4[qt3support] |
| 137 |
>=dev-qt/qt3support-4.4:4 |
| 138 |
- >=app-crypt/qca-2.0.2:2 |
| 139 |
+ >=app-crypt/qca-2.0.2:2[qt4(+)] |
| 140 |
dbus? ( >=dev-qt/qtdbus-4.4:4 ) |
| 141 |
spell? ( >=app-text/enchant-1.3.0 ) |
| 142 |
xscreensaver? ( x11-libs/libXScrnSaver ) |
| 143 |
@@ -44,10 +44,10 @@ |
| 144 |
sys-devel/qconf |
| 145 |
doc? ( app-doc/doxygen )" |
| 146 |
|
| 147 |
-PDEPEND="crypt? ( app-crypt/qca-gnupg:2 ) |
| 148 |
+PDEPEND="crypt? ( || ( app-crypt/qca-gnupg:2 app-crypt/qca:2[gpg] ) ) |
| 149 |
jingle? ( net-im/psimedia |
| 150 |
- app-crypt/qca-ossl:2 ) |
| 151 |
- ssl? ( app-crypt/qca-ossl:2 )" |
| 152 |
+ || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) ) |
| 153 |
+ ssl? ( || ( app-crypt/qca-ossl:2 app-crypt/qca:2[openssl] ) )" |
| 154 |
|
| 155 |
S=${WORKDIR}/${MY_P} |
| 156 |
|
| 157 |
|
| 158 |
|
| 159 |
|
| 160 |
1.240 net-im/psi/ChangeLog |
| 161 |
|
| 162 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.240&view=markup |
| 163 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.240&content-type=text/plain |
| 164 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?r1=1.239&r2=1.240 |
| 165 |
|
| 166 |
Index: ChangeLog |
| 167 |
=================================================================== |
| 168 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v |
| 169 |
retrieving revision 1.239 |
| 170 |
retrieving revision 1.240 |
| 171 |
diff -u -r1.239 -r1.240 |
| 172 |
--- ChangeLog 5 Aug 2014 18:34:19 -0000 1.239 |
| 173 |
+++ ChangeLog 29 Jan 2015 01:08:31 -0000 1.240 |
| 174 |
@@ -1,6 +1,10 @@ |
| 175 |
# ChangeLog for net-im/psi |
| 176 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 177 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.239 2014/08/05 18:34:19 mrueg Exp $ |
| 178 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 179 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.240 2015/01/29 01:08:31 johu Exp $ |
| 180 |
+ |
| 181 |
+ 29 Jan 2015; Johannes Huber <johu@g.o> psi-0.14-r4.ebuild, |
| 182 |
+ psi-0.15.ebuild, psi-9999.ebuild: |
| 183 |
+ Adjust dependencies to handle merged plugins in >=app-crypt/qca-2.1. |
| 184 |
|
| 185 |
05 Aug 2014; Manuel Rüger <mrueg@g.o> psi-0.14-r4.ebuild, |
| 186 |
psi-0.15.ebuild, psi-9999.ebuild: |
Archives