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

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

6 files changed, 28 insertions, 20 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/Manifest b/net-im/psi/Manifest
index aafbaed8b1ee..a9e6aacde132 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -23,19 +23,19 @@ DIST psi-0.15_ur_PK.qm 244903 SHA256 0101370007c9ce735c50dd9bf6dfd8680c5cd562a32
 DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871 WHIRLPOOL 2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344
 DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8eadd4d1359561f40169f10f1051a2c63c3bfbe1c SHA512 b6a74fc9b043800040c519504b14bcb5f44864b9115ea167b235a791bafc17c96986ffaf5b6f9ebe4dd3b467b8e472e7c9bf253893e59581a29ad2342b122bfc WHIRLPOOL a030ca57a5f11f46d17a19d8b2f109d043e6b4eed20fbdf406dd71b647a8bb923ecf24f1ed3f2197cdcaf9637b67fd39d52fd7ef6a174a4fc352cc5008da5759
 DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78 WHIRLPOOL 9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40
-EBUILD psi-0.14-r4.ebuild 4952 SHA256 0e460fe971c045ad71dec456738aaa574c12b721681b5c416f3240b55f57e0b6 SHA512 c7ca4ae3d6614de6c33322fd35ef134b614b90fd4bd0ecdec472b9f0497f469579e84f2762063f4395f2a7ba45ce57a7b61d78757f0dd0bc38d8d0f71d43454a WHIRLPOOL af74a90d3b8b49f9747f5e7ee5aefd04c4f05c83897d65463dc02717d259ae71f6dcb02e744ca47317b91710c1e21ff38e0d1d070eaeaefa3067b6aa1becaa83
-EBUILD psi-0.15.ebuild 2812 SHA256 4ad3bda723f66bc17a01c36219751de843a9f78347ecaa46e7c11b6cc00bb055 SHA512 d9309c6203f842c9bae1fad8748abb971eb045a833d8b744b24e28018a33db14049d1123f6a99e9cd0adfe20f7f103122a7f7ed024926d754c3ce8d12ec07fd8 WHIRLPOOL e89953459ed16bd9f51e262fd29c091f9c0e05317cc29faf09d9d91de6f024888368da8fe76cc356335355f431e6c9f252ed9c5c4af2d6c88846b7c2601194ac
-EBUILD psi-9999.ebuild 5676 SHA256 192aee54b59ad4e988a953b658c7c980770b1a2578cdf9979fb38d57c5e7276f SHA512 2c36d91e55a4ab11ceb9d84665023993c0d31a1b55294c58ae03a6f06740928a5208e2058f06ac176dcc73e5b60c0443e9fd98919463282d591f3098c7f87bd7 WHIRLPOOL 6b8123f4f66626094d5dd6d8f393b0d29d059e4be8c9d13d1514b71f3c8432c17aa6f0f05987100420c9a3e8bbadbc2634359a2014958a5b851bf6180574d28a
-MISC ChangeLog 34733 SHA256 72aeb08666f8200e8f2a6076868960544bd7426fb51bfd581e1b2f4a3e873946 SHA512 b4c2c6371029959e8c69395a2fc48ac8a9270ff27bcab415e01fd5a3cce9226248614d82316f034a93534ba6b0f456369c86b1faa281559a0e5c7fba2f2078e0 WHIRLPOOL 07722534de1a48ba5049239c1f922ee62223c9d8b5b75a41a08c0f389de522331799d34c33a13bf1a6e902f46815337cce7f9f39213e12ebe29159b1e151197f
-MISC metadata.xml 1017 SHA256 18b09c4d915f3d518fb00c206b5d20c71a7d2b2b06c65a295d7e6bc3daeefb4c SHA512 49733b53be8e83345c641dba566a748d05618f18c32f4937eb51c020c15e1f37daafdd3d02660cf227d7ef4a7bb010cb4dbecc736e4331fdac11543d5805ed2d WHIRLPOOL df151f571bcc97cbd0dc37a5ff188754fa808aa7d62c0b4a69a9f906d4c6a1762d0dee4fca9533cee8925af4186bb7cd3caf3d8a137df3638094b416535b3590
+EBUILD psi-0.14-r4.ebuild 4977 SHA256 849562d75c357770d17e7b7416905ad5c88334b5e31327e61d02aff6bff7f38b SHA512 23714b921746579e031bf59d78fe26c896f2d5889093914cd71d7749ac96de47ed7c48a8c5841a0ac2aa4f142392bea92db4cc7e04910b462cea031dc73c9809 WHIRLPOOL 1bfe975f73902924d565621c34e794dba051b5cca41f081e6914f72c62e2592138ec2a46f8ae4ac319ee481b70de6e592746223b206e1e0360bff1ac58c8c3e3
+EBUILD psi-0.15.ebuild 2837 SHA256 41a7e6694d5b2b04a68626e6c6711d777b090330f209213e3c12688e96bed4ce SHA512 f5dd6f65135ef34b717e3ba56e98b441f7811e7a1567732673c766c3a51d6a9e69ea2662185e49a168ed01ae70438aada2fea1da552dabb759e973ea935f56a7 WHIRLPOOL da20e8030dbbe4742f7b4b164a5aa588d1016504198f1a0b7bad2b99dc2947df2739313e9aaf1aae7c35453c610647b72e4afac48749a907ebc08ca3759b880e
+EBUILD psi-9999.ebuild 5699 SHA256 ec034ccda1fff365cc17c0686506459753c16edbccbf3ef179792ec0fcd05106 SHA512 8cc2429f62bad031ed1d37b42a86e96daa399cbc2cf474feece3299d2039928c0041c57b35469475704e44ee6a8a322f21c106c09ccf2616bb0820ec10413939 WHIRLPOOL 694fbb5fbfabaeb16fbdb97610f96f9dea0e3acd5ca994d86344747aab48f93495332caee8b1585e4c179e85d4e906dd386c1e2b0da903a28de5c87a3cd4a0be
+MISC ChangeLog 34991 SHA256 bd4b5cf982557851050f1ded430d49439cbfdd2beb01d411d89326df1dd503f7 SHA512 da9089046b5007b12fa5e7ef9ed8b7d17a0bc25bc7699b60535de2c4cdcf1284fb74ad951890aabddf3ae8f842e9a9c496f4cd12037bc1fa4c396b24b40e7782 WHIRLPOOL 0591063a5188f63aababce57ea27d7bc293273ced1f2ed5daedcbf0c017f3cdf22acfa5633e6687292bbf8977a0ad6fa59c95d16ec53c65c6df1ae2d0278f283
+MISC metadata.xml 1012 SHA256 4fa097914fca02a97f51a7cbe42533d2ef26b74e844826bb674be8bdc4634b62 SHA512 6db07cb78a6efdead59b6de56bb8557c2bd3793dcad652ecaa92f51bc3e13af17b4665a4b6b66b5264b2d47354863d85bd317d0b84ac0f7a3fec21ad0997b68f WHIRLPOOL 32c281f7954ef840e32f7acc035d822e297af7e6997a82b296cfc2e91bcf46fdab10b33577f1eee2a1cc65f9fa45980632132167ec16b4a922e73ca3adc00cf9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR/pAyAAoJEFpvPKfnPDWzHtIH/0UK2HZGp5f/AAhjomwDABzi
-YIaN4pQmy7X/WOl2b2X9tFApKxC7DJt0Dd7Irg8koiAT+lNRllZeJ+aBQy6LkwGj
-y5d8XCnbodFFF0HYvROa/0JHm18PTzIMLf+x+jYTSVzkAR1Mmj7urBvbkAgD63xX
-kUXCoZUE5MUphrDyufbisBAQcBXj9zXhMTLF6NPpXFwV7ZUVV36cmZ6z7Ez71BQf
-ipbkrQDgabDw0DU5eQq9Mwi9XejsEOXZy6CLyMewfacGjRROsE/cjC9ctpoO/wfl
-9Uu/d9gg8ty6wpIbjSyUH/1KqEiRisGW6eayB5OeRCaxvZOsKwMiJ9mEPe5NPME=
-=ESPc
+iQEcBAEBCAAGBQJSLsZ7AAoJECo/aRed9267VoUH/jafN/ze1c/qGw8myEJdHuXh
+G5UJwNmFo/MnYalrLrfbxZtYIfMs811+0KeLwDwuNYC1VCimF96hXWQRug5T+qC9
+4LK3eDqXtWZnTPWvnT7ILwecbU6Q/NJdoe97X6OayvGtf8sS25erzHRhPk+Vi4e5
+puSjn5QpLLt3AF/IL1KdBhfNAKzSsfITUvZmVmhMvwRVvO4rIbPM+ZS8hdSia1/W
+9BZ2seNCJhnUl3XGrw9Li3pOwIOL5SJnkE5kbtj3dNmZFMd9hvSYJUGSELXRQO5O
+IgqumnFXudWS+ZKLrIcFkZjzXTcOgIwPpP6PeZSFz5r5r1Kzvid5PSUcPiOQ+uU=
+=+y90
 -----END PGP SIGNATURE-----
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 )