update icon cache and fix deps wrt #508148

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 56 insertions, 20 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 126b8f6a70be..0ded394e49cb 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.237 2013/09/10 07:14:19 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.238 2014/07/04 20:10:36 hasufell Exp $
+
+  04 Jul 2014; Julian Ospald <hasufell@gentoo.org> psi-0.15.ebuild,
+  psi-9999.ebuild:
+  update icon cache and fix deps wrt #508148
 
   10 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> psi-0.14-r4.ebuild,
   psi-0.15.ebuild, psi-9999.ebuild, metadata.xml:
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index a9e6aacde132..6ea2e364123b 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -24,18 +24,26 @@ DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa
 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 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
+EBUILD psi-0.15.ebuild 3026 SHA256 812e88a1da8ec7e7ebdf1b2e9ab71d26f341d48d2a0a3503d71bbd0649be470c SHA512 1d74cfa7c724006a6d2934692219a249a9251c4ee7e3ca853757a16038880d03b787d87f4f7e8a6e137098b5e206a244936ce214befd3488571fd083cbdab458 WHIRLPOOL b51798c7c2fa03a02e23a06d55aadd5ec9f1842a40a593df5997eeaed20bbdc9048f63174ccc77e59260e5ff2fd89cf00728e0fa8b30243a6e468023a69adff0
+EBUILD psi-9999.ebuild 5832 SHA256 e7d679b12deae082f4dc0fcfb2cfb259f37a7b52c3970d35f6c18ecaa7986b1d SHA512 cf59b1150e40eb7d29c7913b111fa33274ceebe64deff087fc12b70bbb70186686e8a3a7f009e19ec9408d04f7f48aa5809b62452a36defa6c6e27ec5b76d41b WHIRLPOOL 7dc48b97dc96c671783eafa98495db7db57307f474ec76facb60ec33c4bc82e96157553601abacae9347f63c5da84a5c084d60456244d5eae9039bbf23808c58
+MISC ChangeLog 35124 SHA256 c04861e0a85522f5ce205bcdf1048d3573415ffc82ff27b8056ee82284325eca SHA512 38acc0f503a5c7c3f151102673a6a06d127b5eb250791e8d12d1a226fa54ba0b82ebfbc93faf7140e6098919c6e129240eb0b964957d41a6c9f8ce29574bb8fd WHIRLPOOL 9ce23da975590719e8d8e8b9038b8f44dca346224aaa7fc679a5c0e9c59f613b872b63aba8f69d07fa938a9328a15e1bde0228292be8b8830a5bd976ae132cda
 MISC metadata.xml 1012 SHA256 4fa097914fca02a97f51a7cbe42533d2ef26b74e844826bb674be8bdc4634b62 SHA512 6db07cb78a6efdead59b6de56bb8557c2bd3793dcad652ecaa92f51bc3e13af17b4665a4b6b66b5264b2d47354863d85bd317d0b84ac0f7a3fec21ad0997b68f WHIRLPOOL 32c281f7954ef840e32f7acc035d822e297af7e6997a82b296cfc2e91bcf46fdab10b33577f1eee2a1cc65f9fa45980632132167ec16b4a922e73ca3adc00cf9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSLsZ7AAoJECo/aRed9267VoUH/jafN/ze1c/qGw8myEJdHuXh
-G5UJwNmFo/MnYalrLrfbxZtYIfMs811+0KeLwDwuNYC1VCimF96hXWQRug5T+qC9
-4LK3eDqXtWZnTPWvnT7ILwecbU6Q/NJdoe97X6OayvGtf8sS25erzHRhPk+Vi4e5
-puSjn5QpLLt3AF/IL1KdBhfNAKzSsfITUvZmVmhMvwRVvO4rIbPM+ZS8hdSia1/W
-9BZ2seNCJhnUl3XGrw9Li3pOwIOL5SJnkE5kbtj3dNmZFMd9hvSYJUGSELXRQO5O
-IgqumnFXudWS+ZKLrIcFkZjzXTcOgIwPpP6PeZSFz5r5r1Kzvid5PSUcPiOQ+uU=
-=+y90
+iQJ8BAEBCABmBQJTtwpAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgPX0P/0SAN6Ps2sgIcee796G0xXfq
+TD0KXtjO0RUOu9J7sqhDQOt+KxKOvpSKqEZzauEBTsLr1P5Lrcu4fv6YjmunnBIL
+YzsPSSNJ7I4n0QliVP9hIROvh6k8WSIezGtqE2TIVV++LD044+23PG3X6kr96ivr
+KIHFvRauYRu3+ZgQJd3H3ZMC2V5sQsg3O8OEciQUL4EQySJIY/AbXD17wG3rKxOO
+fPp+xretwUgu2pjd0S4AGfo2WGHA2EW2E6eihVg0Dcu8m+VVnZMP9XYJXVg9T1Lq
+0Vpi4LN+5OghEHtJBMJtBGqL1hp7JRx9Z0a1BrqGGMnauOKaoYQjQe2rSwJ8YOwB
+YxWoxWOOpJpkxN6PCTvSKERaGVnEfZ5I9zqDywPZVaK5/85M3yw/JCCg24xvhZNx
+tQ+sK+dvav723lPK75i2XC4EJjqmLXUuYtzidv5POA1ApZ1vtoPgKU+zYxgpRyLw
+wxPBWzvFYNXxBXfnGLXlJGC+x2r0pb1VUmp+RDYbnMjk/U22ExnwZuW7kVJYMsum
+/W1EjIxWwWhVWO0SKqFXnjsfV0q17GL3CFDF6fkdOOGX8UHLinCA5TnAHVJssb3f
+MrUKkfHYsAw5lbzAmmRiX+1UIP2vSiFEQoDa1Db5x6agpWoDi0wTbw6A5l+3QdE1
+qLgslkH4HVebfSaeZq0+
+=YYth
 -----END PGP SIGNATURE-----
diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild
index 25ddfb4d5ab8..d15d21b99b51 100644
--- a/net-im/psi/psi-0.15.ebuild
+++ b/net-im/psi/psi-0.15.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.3 2013/09/10 07:14:19 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.15.ebuild,v 1.4 2014/07/04 20:10:36 hasufell Exp $
 
 EAPI=5
 
 PLOCALES="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW"
-inherit eutils l10n multilib qt4-r2 readme.gentoo
+inherit eutils l10n multilib gnome2-utils qt4-r2 readme.gentoo
 
 DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
 HOMEPAGE="http://psi-im.org/"
@@ -26,6 +26,7 @@ RDEPEND="app-arch/unzip
 	>=dev-qt/qtgui-4.7:4[qt3support]
 	>=dev-qt/qt3support-4.7:4
 	>=app-crypt/qca-2.0.2:2
+	x11-libs/libX11
 	dbus? ( >=dev-qt/qtdbus-4.7:4 )
 	spell? ( >=app-text/enchant-1.3.0 )
 	xscreensaver? ( x11-libs/libXScrnSaver )
@@ -108,3 +109,16 @@ src_install() {
 	insinto /usr/share/${PN}
 	l10n_for_each_locale_do install_locale
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index cb9327585083..2b48f8b46538 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.20 2013/09/10 07:14:19 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.21 2014/07/04 20:10:36 hasufell Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ LANGS_REPO_URI="git://github.com/psi-plus/psi-plus-l10n.git"
 PSI_PLUS_URI="git://github.com/psi-plus/main.git"
 PSI_PLUS_RESOURCES_URI="git://github.com/psi-plus/resources.git"
 
-inherit eutils qt4-r2 multilib git-2 subversion
+inherit eutils gnome2-utils qt4-r2 multilib git-2 subversion
 
 DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
 HOMEPAGE="http://psi-im.org/"
@@ -33,6 +33,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-qt/qtgui-4.7:4
 	>=app-crypt/qca-2.0.2:2
+	x11-libs/libX11
 	dbus? ( >=dev-qt/qtdbus-4.7:4 )
 	whiteboarding? ( dev-qt/qtsvg:4 )
 	spell? (
@@ -200,5 +201,14 @@ src_install() {
 }
 
 pkg_preinst() {
-	true # suppress subversion warnings
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }