Add proper dependency on dev-qt/qtdbus, wrt bug #484182. Thanks to Nikoli for discovering this issue. Fix maintainer's email address

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

5 files changed, 16 insertions, 8 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 165b409231d7..126b8f6a70be 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.236 2013/08/04 17:32:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.237 2013/09/10 07:14:19 pinkbyte Exp $
+
+  10 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> psi-0.14-r4.ebuild,
+  psi-0.15.ebuild, psi-9999.ebuild, metadata.xml:
+  Add proper dependency on dev-qt/qtdbus, wrt bug #484182. Thanks to Nikoli for
+  discovering this issue. Fix maintainer's email address
 
   04 Aug 2013; Julian Ospald <hasufell@gentoo.org> psi-9999.ebuild:
   fix live ebuild wrt #418361
diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index 3209143a5665..4c567f244b8b 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -4,7 +4,7 @@
 <herd>net-im</herd>
 <herd>proxy-maintainers</herd>
 <maintainer>
-  <email>nikoli@lavabit.com</email>
+  <email>nikoli@gmx.us</email>
   <name>Nikoli</name>
 </maintainer>
 <longdescription>Psi is a very good jabber client that uses QT</longdescription>
diff --git a/net-im/psi/psi-0.14-r4.ebuild b/net-im/psi/psi-0.14-r4.ebuild
index c58acefdb932..0622cdd3029d 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-2013 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.14 2013/07/10 04:56:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.14-r4.ebuild,v 1.15 2013/09/10 07:14:19 pinkbyte Exp $
 
 EAPI=4
 
@@ -30,9 +30,10 @@ for LNG in ${LANGS}; do
 	#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,dbus(+)?]
+RDEPEND=">=dev-qt/qtgui-4.4:4[qt3support]
 	>=dev-qt/qt3support-4.4:4
 	>=app-crypt/qca-2.0.2:2
+	dbus? ( >=dev-qt/qtdbus-4.4:4 )
 	spell? ( >=app-text/enchant-1.3.0 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 	extras? ( webkit? ( dev-qt/qtwebkit:4 ) )
diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 4f343adb5388..25ddfb4d5ab8 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.2 2013/07/10 04:56:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.3 2013/09/10 07:14:19 pinkbyte Exp $
 
 EAPI=5
 
@@ -23,9 +23,10 @@ IUSE="crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding"
 RESTRICT="test"
 
 RDEPEND="app-arch/unzip
-	>=dev-qt/qtgui-4.7:4[qt3support,dbus(+)?]
+	>=dev-qt/qtgui-4.7:4[qt3support]
 	>=dev-qt/qt3support-4.7:4
 	>=app-crypt/qca-2.0.2:2
+	dbus? ( >=dev-qt/qtdbus-4.7:4 )
 	spell? ( >=app-text/enchant-1.3.0 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
 	whiteboarding? ( dev-qt/qtsvg:4 )
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 044a472dccc6..cb9327585083 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.19 2013/08/04 17:32:29 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.20 2013/09/10 07:14:19 pinkbyte Exp $
 
 EAPI="4"
 
@@ -31,8 +31,9 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-qt/qtgui-4.4:4[dbus(+)?]
+	>=dev-qt/qtgui-4.7:4
 	>=app-crypt/qca-2.0.2:2
+	dbus? ( >=dev-qt/qtdbus-4.7:4 )
 	whiteboarding? ( dev-qt/qtsvg:4 )
 	spell? (
 		enchant? ( >=app-text/enchant-1.3.0 )