net-im/gajim: Fix .desktop file, #516846; fix dependency on dev-python/python-nbxmpp, #524646

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 43 insertions, 19 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 15a8903df0c2..3f3d2f4996fb 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.212 2014/10/06 07:12:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.213 2014/10/07 08:16:14 jlec Exp $
+
+  07 Oct 2014; Justin Lecher <jlec@gentoo.org> gajim-0.16.ebuild,
+  +files/gajim-0.16-desktop.patch:
+  Fix .desktop file, #516846; fix dependency on dev-python/python-nbxmpp,
+  #524646
 
 *gajim-0.16 (06 Oct 2014)
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index df4d6cc6b012..e740ddc35991 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -11,30 +11,31 @@ AUX gajim-0.15-plugin.patch 383 SHA256 6003e53ca42b3efda9f132fd9253e5577f128ae59
 AUX gajim-0.15.2-CVE-2012-5524.patch 2607 SHA256 9641f4497008fc965522d9114712fe4be5d7cbaec289c74dc038d93a5ee7ce92 SHA512 7751060ecc45b54a2ba00c9fd7e26e36324a6f5095be791ed222a4b75b130eb76fe15448fe98184599e26f23f3bd1e84c93154c3c042ea03606db736e5bbd6d1 WHIRLPOOL 2bb832e01e2963d0941ba3bc4531cc25ea11b9a757950d565dc3c810f271a2f8112a91cb543b90891dc8ae9c3e94543652f3f065e004216870f3a2a1a5b6f758
 AUX gajim-0.15.3-roster.patch 1450 SHA256 ffbbbfbc6198fff03a566d69f2e6872898dd87df6598dea380e1642e34aba768 SHA512 4b229b8ee655856b24205cd2a23f86ff32212d869abef07abf6b410f30ad11fc84f9d6d4222cde6c58e761cc11f1cbf2787f088198e8310683334543723d944a WHIRLPOOL a00d5abf54a86543c2e2af35d441dc3aa0c38e0e569677128cd20da1f778aa445f487668d2f9bdfe0f558190cf27786bbc7fa2c807b10273c38975ebd6e8a293
 AUX gajim-0.15.3-starttls.patch 502 SHA256 24a7d4c15be003daa8a10f26730eec27ce75c0e8d0d727c5f5d8c1b7f7305be6 SHA512 5ac3b926d971eb37898a241af7e2b77189ed7874a144d3bb9955ed09f7c1e6f5373e04f94dbaac337903622ebc5825428018e3c2843cafd3e8ba9e50c0bba0f5 WHIRLPOOL 3e84c618d56e19750062e752f67ada26c260b51cc4f2bb749ec5516b5e53be18b1d4627c174ad35ac084f19bc1bad6b2d4bbec6124b40d4fc24d87398770fd7d
+AUX gajim-0.16-desktop.patch 522 SHA256 5bffb1182a6d80a7b0b360492364361f6613a11bc50039dcd12527b2d9f0cb2b SHA512 38a1d39931f31fe38aa4c981e5fb7cbec031c595303a29995b29c912edf263447ee653092702bc407482d667eaea9ac9e0181a2de262fd1530d223a6ec610fa2 WHIRLPOOL 1617889fbf54fc397bd1152ec3b0bfcdc30d459490ca70f23f0cc6cc5ca10d9a7d9df17fc57c5737f052097e87c57b5ea672b71a689d0e78a829fd4621d3bc71
 AUX gajim-0.16_beta2-pyopenssl-backport-1.patch 1623 SHA256 47991437de8e6f105533360a6bba8c1f35b5175e811941ff83b956e5c8970eae SHA512 771087b9eb695d07d89d5f9f6a80fa576ffbbacdd11d5b480c77e6f4a619c1e59d32ef5f5b99c69bdc45b748689d2ad0b73b21675df4b0728f60fabda5cbcb8f WHIRLPOOL 6285da2a8cdc7dc38e902fc3bf4445ab5cfc68afdc2e8a51ea2be9771ad24763f9a31a1a6212dcd3faf1b690c644829c0801526509e05b9a88920ee07efdf7e3
 AUX gajim-0.16_beta2-pyopenssl-backport-2.patch 1758 SHA256 f0cf25a15a908e28eacbd569a5198d2994d20bc5642bc519c17dc04efc8158fb SHA512 29980e307b969e717bfdc2b1263fec6c4a56fef947bc70a36ebdf21e229d7ae85a043f1499fcdcde7bff1050cc33938613b1a4fa4c694605c651413ffa3cffcf WHIRLPOOL 03e5359ca4f47c09f89c07eb6d7b5ad0b7af4651391a217c5220bb8b0de12eed27042c20ffb713c8c7e2b59a155d2a1de3676c60e3360aaaed9e589fc01cb05c
 DIST gajim-0.15.4.tar.bz2 4473874 SHA256 27acfecf40e2da55e8f7ec5d653acaf0914376f2d42766af27963c008bee4dc0 SHA512 f1f316aa11531dc37f97b2d06fd3e3e4a4d9187de0e0b3fa468283e88e16ee6372d6c49c57dd7bd8b51809e7d3130aee88a178bb64bf29349b27450224c0840e WHIRLPOOL a12c467f7a62f097c2ec64c31f8d336f5d7c7851d36716dffcb1998d1895de385a6b567931abe94eef2e53418122e3a482e3200650893cc1cbd4b0f1fc9db238
 DIST gajim-0.16.tar.bz2 4575445 SHA256 7abd8dfb22522d3a2f0345da2a86b99fb9917bfd97310124df8601fab82ca193 SHA512 af2fd6b750e3ffa5770913a93ac5e61e6dab5688a28a26484ba4a097d73cc38b820797b1fedc60a67bf94e9a641cc80264210d0c4cf997047068c6dcb056ca75 WHIRLPOOL 6d5374bcc574bf851f6dde184f52ef8ca517869b96a85a9598b4c37953c2bc7849ccfdb106d975da80a394555f7ed7486cf356dad06dc11f545d375745e983be
 EBUILD gajim-0.15.4.ebuild 2936 SHA256 42cfdeaa208ca64967215b81b887b5db2acd78e3c496d919eed053c9c88e9d28 SHA512 3a43bef12fd74c43490f696ed24160977a8554a82efd43b5a52ea766a087533255df1dbb8816bc6e6a807d78d4732fb673597327c717c2c897e120b07586b777 WHIRLPOOL 02e606d46dd84c4caf70dc3d68426b1996d25bde4104d8e76fd76f5dd4d96154e4aab96dba94cc14590428f76b52e15f417874389465f55de86955ed0522a355
-EBUILD gajim-0.16.ebuild 2897 SHA256 1031e0940d9a0689aa3be4467f16d9c029f0f8c84edc13e9cea38c0a0b5e590c SHA512 4bcf63112ab73f16706d587feeeac30ecd18b218149081ec105b75ea9815f85bc4c392085802995c991a2d2dbacf7a2dcca59b9e509ed3e196e72249fd34b7ad WHIRLPOOL b2b9aa32065bfe2ec978294fdd1a1e4cc4fa0123b4c0eb1dd1033cf453164e279386a7dda891d7a06db4a65570b30c00a63af5da61f1ed88489c59c33ff8528e
-MISC ChangeLog 30531 SHA256 dfda2122602fa596b7e3828896842dd3bf23069028e6b6719c315d14e8f4a6e9 SHA512 c14ee21be58136bd3805d0d95f06c77dc5f4f90ec29bbe8184bebdf848b6e0d288063a6423bbcb13e7db855270bfa0ca8194b3ef4594805481e2e98ba7c8a5d1 WHIRLPOOL 9937cb8a5a5dd5368376528dfdca44f810b89497e8e525ca7f6de605143fccbf6857bc6ca4248c54e56ede5e4a57db8aeb95f0483e21b42b8526353ebcb14aed
+EBUILD gajim-0.16.ebuild 2945 SHA256 358709bd49aa56048757b77df7aa6722d100fee8d0ed27ba03a5479b4dea8eab SHA512 f9d732c41e9e5bed9b64f821978fcfceaafda9e43924c6a8f96cac38bd424518c66f7b031c86ec8c4d5273603361af4d13a6911ed6de8b6a05256187d5f3bb15 WHIRLPOOL f6fa29440b3642a6f22a14ae6e4e9c37750b150153c4e90fb49e11cf66f3e5a296537fb428c808597556191f637e74679758d4ee718c476ca3c14f9a34b6049f
+MISC ChangeLog 30717 SHA256 d7a8c93daa023c9e76518e12ddf78215d194831fdb424fbfdf91876b076ac088 SHA512 9ebff59d08afebeec6585c8c16267cc131e637dd033d09bdc9e2e8966a68b251afd1e5835a9e8e272cf9aca094360a86285704597a286de7c0856d5cbd89313d WHIRLPOOL e834e8f97a42b7af9d07905d0784c908208bb28419c1a2b0cc9dcedc11951587b9ad66f692264ef8fa5c40f7b53c5f7543425484a80d8b4c24cfd66345ade8b6
 MISC metadata.xml 503 SHA256 781012e83e7e3d1480ed6413a58f8a294e3a1b4c4968b1217c9bf7b41cca3ae5 SHA512 cfc7f159daf5007962ea035289002df56575042d567aa36c495b95dcf7ca7bb931be622599537e9ea67c25b7cb75014acf38a13bda349218af7a5eb576ebb0a4 WHIRLPOOL 3ff97b378ffe5c79d63ba206dec6c346480c42aa4988bed662066efbf5599e0986c83cd1ade54bded8bb2e2ad0ab6ad6f18c791b59f11215c2a52c4503721cbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUMkDdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUM6FPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirvJAP/09Aj6JIO885FL/iBm/pwOug
-HkL37Lle1Umbh8ZLHLU2Bsac63eCbSU7M2+QvBpMHmH4/pdAqLUL7b24iJ0xTAVs
-MPYEsaBUp/wWRppUqSgnNidI1+qz+kowC16/N4JENrkdcTa6PvEMxn4jJFIBOKTL
-0g5Ci4VI00tNBepfuZyeHD5Z4hnKNRk0mElC6wndnVw13gbcts+uJJmJe5zQvi1S
-2WhYsNlpqLUqLX5rdwWazBNdS6LNVnP1OEb2jmKoutB2GuAe8ERCOonZp71LqBM/
-LhLq9VOUm7HtvU+mV69ufl+GLq3v8zSVpubdYngqA+AlrkusG+F5UaSJhEPP2ylL
-v6iaIAf66MovO33cpVqheh1st/6LtVV1gbdJCErscs7DPEwnQcNqgrd1CgG0acfH
-ZU3NERDKORmYoE28GNXBLOnNhLnE3OHsPbyaVKPFxHbhC33oIpP5vY81T2gfeqQL
-onpHFpXlLI+APZp6jQeNtV/v402HKSwm5wtyhjSwLlJvRcWs19+xcU+9y9xsL7ui
-Ye3omS6NEAB+AkNqbd/rGEcj02zRgyb9PfAKpoVTCmB1sU4jrJ7V7PtA62g8n+eq
-EgHpxVcKxG55XgpLDFkGYpyyDosPKIBhI9iZ3RA7hZTBDaHWiGPwhtxTuefKOnsp
-QsyheKKdqBbXEJqs0620
-=ULEc
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirXlcQAJLpzY+yXARLOM91wlIrEM6s
+NjR19aQg+eSRiNyAlOKLYlhgHJEUqds5WSOgpEsT6KZ481hIMbX/ajgkCzQ3mrOh
+RdEsO6MaNm5NZW3zDab8hO7ISZdGg8MlVaH7JOoN7Y9H00tYzscFKWI3Cd7ODUcw
+7ugjjiJ1x4gfCSPmTg4D/lZTSlj1JEAwcWEt0PmfojbR43V/BThwjzEP6BMHOFVz
+WwH/p3StFZBSM1b61/posKOR+a7wXVQw8Rhy2JQkUS6RybeYIGQ6M0HwLCD7D8HX
+DoUtP5JUaoVgPAyDKFeIO6zkBDX/+Z2dEFYFcN3+vsbswbeDz4P74SHBwY4gsW5B
+NdfTbdGcwokhZ7Armtr/5nIW40apyg84l+HhWE6LA9JGhQ6r3QvR+gIjz9J+2FJc
+PkBbspELJGFAkDPReDYAD8J6FHE+8Wjj5ba7ihFbPSZZt/eaJmpTbLtVe1KYHlUn
+igXrQ59msu0WlaJlGulVLIN//igK2qHcaTBaNqXB7yppT9ffbPZjvgfbwesAHd/q
+T1vpZ8jtKzUSUstw4cvwxvXUshPGzietcZ7B8zbIa4kANsbvhAjUXSPOLXl/Su4N
+gQd0VZVRkG+u2YQ/4eVdOAQ14/do2OW+8oRHFN3MJrDUXb6I57H3yfzEoLEuqk1b
+4JcIzczBq7LkbjW8fQUS
+=PeKX
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/files/gajim-0.16-desktop.patch b/net-im/gajim/files/gajim-0.16-desktop.patch
new file mode 100644
index 000000000000..142c98972808
--- /dev/null
+++ b/net-im/gajim/files/gajim-0.16-desktop.patch
@@ -0,0 +1,16 @@
+ data/gajim.desktop.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gajim.desktop.in.in b/data/gajim.desktop.in.in
+index 8a93ee8..ea0b1da 100644
+--- a/data/gajim.desktop.in.in
++++ b/data/gajim.desktop.in.in
+@@ -3,7 +3,7 @@ Categories=Network;InstantMessaging;GTK;GNOME;
+ _Name=Gajim
+ _GenericName=Jabber IM Client
+ _Comment=A GTK+ Jabber client
+-_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip
++_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
+ Version=1.0
+ Exec=gajim
+ Icon=gajim
diff --git a/net-im/gajim/gajim-0.16.ebuild b/net-im/gajim/gajim-0.16.ebuild
index 807f3125dcb2..52e48554286a 100644
--- a/net-im/gajim/gajim-0.16.ebuild
+++ b/net-im/gajim/gajim-0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.ebuild,v 1.1 2014/10/06 07:12:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.ebuild,v 1.2 2014/10/07 08:16:14 jlec Exp $
 
 EAPI=5
 
@@ -42,7 +42,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.5[${PYTHON_USEDEP}]
+	>=dev-python/python-nbxmpp-0.5.1[${PYTHON_USEDEP}]
 	crypt? (
 		app-crypt/gnupg
 		dev-python/pycrypto[${PYTHON_USEDEP}]
@@ -77,6 +77,8 @@ RESTRICT="test"
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${P}-desktop.patch )
+
 src_prepare() {
 	autotools-utils_src_prepare
 	python_copy_sources