pesa 15/07/22 01:55:42
Modified: psi-0.15.ebuild psi-9999.ebuild psi-0.14-r4.ebuild
ChangeLog
Log:
Sort and cleanup deps. Pin qca dep to =2.0* wrt bug 555526.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
0xDADED6B2671CB57D!)
Revision Changes Path
1.7 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.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.15.ebuild?r1=1.6&r2=1.7
Index: psi-0.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- psi-0.15.ebuild 22 Feb 2015 18:41:23 -0000 1.6
+++ psi-0.15.ebuild 22 Jul 2015 01:55:42 -0000 1.7
@@ -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.6 2015/02/22
18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.7 2015/07/22
01:55:42 pesa Exp $
EAPI=5
@@ -22,25 +22,31 @@
IUSE="crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding"
RESTRICT="test"
-RDEPEND="app-arch/unzip
- >=dev-qt/qtgui-4.7:4[qt3support]
- >=dev-qt/qt3support-4.7:4
+RDEPEND="
+ app-arch/unzip
>=app-crypt/qca-2.0.2:2[qt4(+)]
+ dev-qt/qt3support:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4[qt3support]
+ >=sys-libs/zlib-1.2.5.1-r2[minizip]
x11-libs/libX11
- dbus? ( >=dev-qt/qtdbus-4.7:4 )
+ dbus? ( dev-qt/qtdbus:4 )
spell? ( >=app-text/enchant-1.3.0 )
- xscreensaver? ( x11-libs/libXScrnSaver )
whiteboarding? ( dev-qt/qtsvg:4 )
- || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )"
-
+ xscreensaver? ( x11-libs/libXScrnSaver )
+"
DEPEND="${RDEPEND}
sys-devel/qconf
- doc? ( app-doc/doxygen )"
-
-PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
- jingle? ( net-im/psimedia
- app-crypt/qca:2[openssl] )
- ssl? ( app-crypt/qca:2[openssl] )"
+ doc? ( app-doc/doxygen )
+"
+PDEPEND="
+ crypt? ( app-crypt/qca:2[gpg] )
+ jingle? (
+ net-im/psimedia
+ 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.24 net-im/psi/psi-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.24&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?rev=1.24&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-9999.ebuild?r1=1.23&r2=1.24
Index: psi-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- psi-9999.ebuild 22 Feb 2015 18:41:23 -0000 1.23
+++ psi-9999.ebuild 22 Jul 2015 01:55:42 -0000 1.24
@@ -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.23
2015/02/22 18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.24
2015/07/22 01:55:42 pesa Exp $
EAPI="4"
@@ -31,19 +31,20 @@
"
RDEPEND="
- >=dev-qt/qtgui-4.7:4
+ app-arch/unzip
>=app-crypt/qca-2.0.2:2[qt4(+)]
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ >=sys-libs/zlib-1.2.5.1-r2[minizip]
x11-libs/libX11
- dbus? ( >=dev-qt/qtdbus-4.7:4 )
- whiteboarding? ( dev-qt/qtsvg:4 )
+ dbus? ( dev-qt/qtdbus:4 )
+ extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
spell? (
enchant? ( >=app-text/enchant-1.3.0 )
!enchant? ( app-text/aspell )
)
+ whiteboarding? ( dev-qt/qtsvg:4 )
xscreensaver? ( x11-libs/libXScrnSaver )
- extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
- app-arch/unzip
- || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )
"
DEPEND="${RDEPEND}
extras? (
1.19 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.19&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?rev=1.19&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild?r1=1.18&r2=1.19
Index: psi-0.14-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- psi-0.14-r4.ebuild 22 Feb 2015 18:41:23 -0000 1.18
+++ psi-0.14-r4.ebuild 22 Jul 2015 01:55:42 -0000 1.19
@@ -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.18
2015/02/22 18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.19
2015/07/22 01:55:42 pesa Exp $
EAPI=4
@@ -30,24 +30,30 @@
#SRC_URI="${SRC_URI}
http://psi-im.org/download/lang/psi_${LNG/ur_PK/ur_pk}.qm";
done
-RDEPEND=">=dev-qt/qtgui-4.4:4[qt3support]
- >=dev-qt/qt3support-4.4:4
- >=app-crypt/qca-2.0.2:2[qt4(+)]
- dbus? ( >=dev-qt/qtdbus-4.4:4 )
+RDEPEND="
+ app-arch/unzip
+ =app-crypt/qca-2.0*[qt4(+)]
+ dev-qt/qt3support:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4[qt3support]
+ >=sys-libs/zlib-1.2.5.1-r2[minizip]
+ dbus? ( dev-qt/qtdbus:4 )
+ extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
spell? ( >=app-text/enchant-1.3.0 )
xscreensaver? ( x11-libs/libXScrnSaver )
- extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
- app-arch/unzip
- || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )"
-
+"
DEPEND="${RDEPEND}
sys-devel/qconf
- doc? ( app-doc/doxygen )"
-
-PDEPEND="crypt? ( app-crypt/qca:2[gpg] )
- jingle? ( net-im/psimedia
- app-crypt/qca:2[openssl] )
- ssl? ( app-crypt/qca:2[openssl] )"
+ doc? ( app-doc/doxygen )
+"
+PDEPEND="
+ crypt? ( app-crypt/qca:2[gpg] )
+ jingle? (
+ net-im/psimedia
+ app-crypt/qca:2[openssl]
+ )
+ ssl? ( app-crypt/qca:2[openssl] )
+"
S=${WORKDIR}/${MY_P}
1.242 net-im/psi/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.242&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?rev=1.242&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psi/ChangeLog?r1=1.241&r2=1.242
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- ChangeLog 22 Feb 2015 18:41:23 -0000 1.241
+++ ChangeLog 22 Jul 2015 01:55:42 -0000 1.242
@@ -1,6 +1,10 @@
# 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.241 2015/02/22
18:41:23 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.242 2015/07/22
01:55:42 pesa Exp $
+
+ 22 Jul 2015; Davide Pesavento <[email protected]> psi-0.14-r4.ebuild,
+ psi-0.15.ebuild, psi-9999.ebuild:
+ Sort and cleanup deps. Pin qca dep to =2.0* wrt bug 555526.
22 Feb 2015; Michał Górny <[email protected]> psi-0.14-r4.ebuild,
psi-0.15.ebuild, psi-9999.ebuild:
