net-im/gajim: Version BUmp

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

4 files changed, 19 insertions, 16 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index 646176eff096..f4bdab76c468 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.158 2012/10/28 16:19:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.159 2012/11/05 07:48:35 jlec Exp $
+
+*gajim-0.15.2 (05 Nov 2012)
+
+  05 Nov 2012; Justin Lecher <jlec@gentoo.org> -gajim-0.15-r2.ebuild,
+  +gajim-0.15.2.ebuild, metadata.xml:
+  Version BUmp
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> gajim-0.15.1.ebuild:
   ia64/sparc stable wrt #427544
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 7cdb18708b4f..ee0fa5cd6fe8 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -9,15 +9,15 @@ AUX gajim-0.15-SA48695-2.patch 4581 SHA256 76ea7870b1939282b18198927bfac5b299736
 AUX gajim-0.15-SA48695.patch 862 SHA256 9d6c0bef13e7161465e6fda2ad7031c383011e66e24b7322ce19df387d79db6d SHA512 40a5c9c572c755050993191266287e11bbfa9ea2731c975d088c85c069391e79a6a982c13eb0c007ece036d216dc5a42d72b4ed128d95192864313a444ccb050 WHIRLPOOL 41d369123b06f6afc77ab70e8fd152b98e0202111bf1dc889b573783398f467ab40cd8c6cd47b18944b7258116270341ec051d367fda4803f589e71e7dce8c9e
 AUX gajim-0.15-plugin.patch 383 SHA256 6003e53ca42b3efda9f132fd9253e5577f128ae596ce458ac7c2ce5a29c1759d SHA512 a8bf05e69547cb62db119e1faeaff6a4cfc27a44e4b925921cb43f22b4970d19c08c97d00d5166d4d439dcf706e972f617d20ff58f040cfe28dc5cf6389e408f WHIRLPOOL 6a16b97758015c7e51f43df45614ccbae3d682f5c75270118ea06b780a9f10a2184650265ae1aa3e663dc06d7ed803f263b8054433a8b64552c3b71f8be938c7
 DIST gajim-0.15.1.tar.bz2 4473442 SHA256 530e2fd6b2fb14b0582c8333cd59c751940037fd4c28c59ae643a4ddf0c31f92 SHA512 c929c4c115a189f0d3a302aa999e836d6f1d38e38ca9825fcc5eb8208c3880f39d4822512eedaf04b225c234c2f93b1b5328abb2c75ad9a08f05943420f153f2 WHIRLPOOL 72df6396ec007cfca17a99a4e313ca467dc8d7c640d2febfac1520d6b5ac78a1ff2e2ab582908cf8abf0c21931b75ad935cc0b8f98ab44dc98ca3df9be5ee60b
-DIST gajim-0.15.tar.bz2 4332305 SHA256 1a999aa4ca64a8d048babfc6aa590171191966c342fa7091fc9035b9fc6de8d8 SHA512 0b25f769ea3136aa0a1da06544f3b56d423f80ba42eeacbc39f1a9d70bd1babc911f4266839fd21a9f46534583e5187a8c4333f33edff7580aa5acb43ef9ab8f WHIRLPOOL 9071f3951235110d4efd3e48e6dc7c2585bb7b60fb3f9bd1e70d1a4a0ae24500ca604309a056fa4335918db429315e260f005b79d02b6f04133a86f54aaa1087
-EBUILD gajim-0.15-r2.ebuild 2261 SHA256 984b83f8def93b436a7958dd6906199bc2ac774f737530a2f61678d459595c66 SHA512 c73a870af5bdd3d95033ea83cf2bf8775f085c42a4c4182869a193de073f1f7648e4208bd2e86607781169e99b5112c9a0873af2d1b14e3c32350547ea5a0f34 WHIRLPOOL dd94ffdaa5b674e7c136eb98822117e1c1b126b9b52581959bd9ec0f612761da14a2d4f0f162ec7685d77c1d7d4aa2f33df879ff1fea8fd367689248808f9ac1
+DIST gajim-0.15.2.tar.bz2 4473077 SHA256 7e71ee82e44303992792644803c749cb89ecad7ec7547db4f9841fcbeec49940 SHA512 ea1e64de54bd15a5af40e3fdfcc46808467555e671a8a86708f22400f7a329290d9d921d9e3ae56e7f47b90842c49b4f8d432d0df4fed7471d457ed2092f552a WHIRLPOOL 0faec1b189d48d83beed5aaf89a1a9d6351e30fda5b86abc8c57ffaf6c867d1a6531318c30c66a0b280899cef584068c7a684286d0be78c118fa528f54f6afbf
 EBUILD gajim-0.15.1.ebuild 2205 SHA256 5e458d91fed68def8cc083063d00cce9f9d8b68f08f54b3718daf3b13fb25434 SHA512 55037a1b775cfeb58d4a15559fca2f3da379f28f7519b6bad33b1d30d365bf159035b3a5f3cea24fe32db04b478bd7686d774e155430d28fb1d1f13b342074b4 WHIRLPOOL cef0851ff04edf360ce16ac6496bfbf7773e803e4ea874b0ac3ac215b1e90e05c4559809211ce04093c24905f668d73be32ef4dd3f7619d54ee5b6c66e88c938
-MISC ChangeLog 22801 SHA256 be1cc500450012b0926d3ce6c14c25aa7ba93b854d8e29a09068c4b0f91d50f2 SHA512 a59ed49d4bab45523dc36b544e77d5bf60ab40f2a90f620523aee9088dfa192b4d7d8fb67e6230dd2353504028dae23e10b18c115b1d66387a73e6147821c1e4 WHIRLPOOL 0e70da9f7763fbb13ea9311922bed8c272d30c7107368b3cd8861722fffd6510545c20e755b435c3a02be97e43124334c7ad128f2895cdbc2f5092279aabdef7
-MISC metadata.xml 573 SHA256 cdbbf751d0c4736aceae69a53fddb805be8f9daa2fb5ef1929be06814d79de69 SHA512 53aef0c0f9192f8e8c9de7d74dd258a5581e0b28c8f1d36d307a6744a033bf2729c03617adc5104a5bae07751741b7b45f78dbbf113ae7a30a9b051a553d099b WHIRLPOOL 283639a61db3efa74534dede54d7fe831cc23e2c302cb720811e19a220edd49bcb6f02dbbd2d0a607a440d80e1734e3e7b5518734b43bddfffa5627074fe8abe
+EBUILD gajim-0.15.2.ebuild 2209 SHA256 6ca2fb5243e2480fec6a03f8d0e284e035796eda7ab05caa802a2acd7cbd09b4 SHA512 6bd2dbbfa7a7b4bb14cf42c84daf85b59acfb2c83bd379a5da8b41f7c24663f8aeae7552d21386d84aa725c5df2b005f68505cdb4828a14b6501c219a1018460 WHIRLPOOL f68697a200897861c74875dff77afa8645cfc88fc057730a663dda1a46a1d60696f76f7c0e6542da7a6578b85f2d0016d1c4860ac42efa7870b0ae0ee70da656
+MISC ChangeLog 22951 SHA256 0c080f0781ac174f41e9f94e115c58ff37287a8b15308e0c6016310760c1395b SHA512 6dd56d0799e9dfdbd970640e18f33045ced7a791f26a9ae48f812ca698e6513f96bd2f46e2816020bd2253a2aaf8e82dbcfd12525de4c5e3e8edf2f03f4ee934 WHIRLPOOL 5b39817ff36942be5aa3ee0f9139aac1a7864d21d0d254b58f20a5f409e13d108bacba676ed13a74742a431272e12d6c34ce291f932a7892a6d15e05d7113eaa
+MISC metadata.xml 489 SHA256 d3641da629913c0bd2c28d510499c1a62e2534b316f0affe46d74c02b3ab29a8 SHA512 731ac2dca03a08365bb683b593d3d9882c003c71a6a030cc84a16f56d23dc05efff83cc8cad791a81d74ac4fa840087f864e604625b90806449c6704b2ac1089 WHIRLPOOL 412a6b8f320caaf6e206bec2c42d0fab25272ed3123cf548d6ceccc2992b9b5657adeaafa060202e8839a4be03a0c1caa70578faf86615a47b9a48f116358a41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNWwYACgkQuQc30/atMkASrACeM7zNmr42IlXMTXwNBfdIUwdb
-0jIAn0aJvypHuMtzPugV1luc6zTlPrVK
-=HRbN
+iEYEAREIAAYFAlCXb08ACgkQgAnW8HDreRa67gCfWbJbYp0oBghlKv/MwsoeDzjN
+7jwAoIm1Ml13Z311ggm8IwrW24llkcla
+=7+bN
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/gajim-0.15-r2.ebuild b/net-im/gajim/gajim-0.15.2.ebuild
index 9a2c7bd8bd2d..82711331f350 100644
--- a/net-im/gajim/gajim-0.15-r2.ebuild
+++ b/net-im/gajim/gajim-0.15.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15-r2.ebuild,v 1.6 2012/09/29 18:46:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.15.2.ebuild,v 1.1 2012/11/05 07:48:35 jlec Exp $
 
 EAPI=4
 
@@ -15,8 +15,8 @@ SRC_URI="http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gmail gnome kde idle jingle libnotify networkmanager nls spell srv X xhtml"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv X xhtml"
 
 REQUIRED_USE="
 	libnotify? ( dbus )
@@ -42,14 +42,13 @@ RDEPEND="${COMMON_DEPEND}
 		libnotify? ( dev-python/notify-python )
 		avahi? ( net-dns/avahi[dbus,gtk,python] )
 		)
-	gmail? ( net-dns/bind-tools )
 	gnome? (
 		dev-python/libgnome-python
 		dev-python/gnome-keyring-python
 		dev-python/egg-python
 		)
 	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farsight2[python] )
+	jingle? ( net-libs/farstream[python] )
 	kde? ( kde-base/kwallet )
 	networkmanager? (
 			dev-python/dbus-python
@@ -69,9 +68,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	echo "src/command_system/mapping.py" >> po/POTFILES.in
 	epatch \
-		"${FILESDIR}"/${P}-plugin.patch \
-		"${FILESDIR}"/${P}-SA48695-2.patch \
 		"${FILESDIR}"/0.14-python-version.patch \
 		"${FILESDIR}"/0.14.1-testing.patch
 	echo '#!/bin/sh' > config/py-compile
diff --git a/net-im/gajim/metadata.xml b/net-im/gajim/metadata.xml
index b7146ef735e6..42b3e87f5dd3 100644
--- a/net-im/gajim/metadata.xml
+++ b/net-im/gajim/metadata.xml
@@ -9,7 +9,6 @@
     A fully featured and easy to use GTK+ Jabber client written in PyGTK.
   </longdescription>
 	<use>
-		<flag name="gmail">Depend on net-dns/bind-tools to get gmail chats working</flag>
 		<flag name="idle">Enable idle module</flag>
 		<flag name="srv">SRV capabilities</flag>
 		<flag name="xhtml">Enable XHTML support</flag>