Version bump. Fix memory leaks in log viewer.

Package-Manager: portage-2.2.0_alpha78/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 133 insertions, 6 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index b9a545d64ff8..057847f21c6b 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.97 2011/11/22 01:01:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.98 2011/11/27 19:06:08 eva Exp $
+
+*empathy-3.2.2 (27 Nov 2011)
+
+  27 Nov 2011; Gilles Dartiguelongue <eva@gentoo.org> +empathy-3.2.2.ebuild:
+  Version bump. Fix memory leaks in log viewer.
 
   22 Nov 2011; Pacho Ramos <pacho@gentoo.org> -empathy-3.2.1.1.ebuild,
   empathy-2.32.2.ebuild, empathy-2.34.0-r2.ebuild, empathy-3.2.1.2.ebuild:
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 43c4c42a604f..6adbd4a3e244 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -8,15 +8,17 @@ AUX empathy-2.34.0-missing-include.patch 379 RMD160 c0284cfd166c731b8214f849c050
 DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
 DIST empathy-2.34.0.tar.bz2 3361496 RMD160 a76e9633d88dbd48c5d494d3393566a88a5b35c4 SHA1 cc82c871fb1d3dbc428b851c59ad44184f064d10 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1
 DIST empathy-3.2.1.2.tar.xz 3183768 RMD160 f3f5b7cfb852a1f82d6a6e3b2a62aba95ac1042f SHA1 6bf4e0d0c3fcfb8c62269ad324b21c6a15f2dab1 SHA256 44e149ecadce6269a6d31d93bbd7d4a4bda8d092d4e95de9d5ca09cf067d8ab7
+DIST empathy-3.2.2.tar.xz 3184408 RMD160 f323ef6c46f074c32947e64bad3d9c94194f3aa3 SHA1 fbf0e43c75c49caca4e4a25d1790afcbae7942f2 SHA256 d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1
 EBUILD empathy-2.32.2.ebuild 3097 RMD160 d585f770a9e6affcf0cdaf13180a61512621af16 SHA1 8796b3b5196a1a1c6ffbad5fa274170e5b4c8629 SHA256 0a1cfdec0922f176ae8ff77fcf1c8cc3c42539bf126c1ca166329532e35bc99c
 EBUILD empathy-2.34.0-r2.ebuild 3294 RMD160 9981434c5eead60d6db1db357cc2ad0594abbe46 SHA1 bb7a7dd49df2aa1aca9e2ed10e0cb434d5183dbf SHA256 00abf95107eeffbb1c2c05a078a2387df9373085329d35b3af9f32c61ca30b3f
 EBUILD empathy-3.2.1.2.ebuild 3342 RMD160 1c6ff87f9abf99b99e14323a730f552c5331f70e SHA1 8b9e627edb75b0707df932d764e52d352fc86854 SHA256 b94e7a65b249b6aa2b680966d340f6ea6d9d6b35e4680bfc8fb797bccd510689
-MISC ChangeLog 17135 RMD160 fb701f76cca005c13b718ebfb97ec32e3b68d235 SHA1 441af1ba494f98b5b51df98a65bedac88ef636f4 SHA256 e37200c2bb77090ed6e7e414b7b032f56f8bbd5c6be457309773602677df3c16
+EBUILD empathy-3.2.2.ebuild 3338 RMD160 b17a92d278c7d2adf56af45e7c788d35a3ad5535 SHA1 7973692feaf391449a75d2db41b63ac07fcb5111 SHA256 c3f52a582fd1a863941eaf2dd13fda9c03c362b2f87ce5fd377d257311d32094
+MISC ChangeLog 17289 RMD160 7099ad272ad0881c1532daa3fe069cef9ccee5e6 SHA1 9a071eb17b92134f0f80b8e589d581300a106749 SHA256 ea35d69619f50499af21912bd25bba6b1edfd17bae4215e6744d5e27774245d1
 MISC metadata.xml 1425 RMD160 38d0a65bd440db5fe8deb90bd79f079b12a5502d SHA1 d1743cb72216d94a45eae200cd40d310a121cb5b SHA256 0a68cd5576cafddcf96b2046679bcd0511adc7f3205fefb8f8cc1cb4de87d7c0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7K9H0ACgkQCaWpQKGI+9R/sACdGI32j6SRKg2NxlQUKYh9AYSK
-xTEAoIhdojt5i2hmlpYQfkU8D1JE7/vu
-=09Kc
+iEYEARECAAYFAk7SijoACgkQ1fmVwcYIWAYgeQCfYyyv0B3kOyNZDTP9dliGXiEb
+7PQAnA2MmDm74u2KUSpg3VnIPPSRQzQQ
+=u6qn
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-3.2.2.ebuild b/net-im/empathy/empathy-3.2.2.ebuild
new file mode 100644
index 000000000000..3076c479f5d6
--- /dev/null
+++ b/net-im/empathy/empathy-3.2.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.2.2.ebuild,v 1.1 2011/11/27 19:06:08 eva Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.4"
+
+inherit gnome2 python
+
+DESCRIPTION="Telepathy client and library using GTK+"
+HOMEPAGE="http://live.gnome.org/Empathy"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="call debug eds +map +geoloc gnome-online-accounts +networkmanager sendto spell test +v4l"
+
+# FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
+# eventually at which point the dep can be dropped
+# libgee extensively used in libempathy
+# gdk-pixbuf and pango extensively used in libempathy-gtk
+RDEPEND=">=dev-libs/glib-2.28:2
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.0.2:3
+	x11-libs/pango
+	>=dev-libs/dbus-glib-0.51
+	>=dev-libs/folks-0.6.2
+	dev-libs/libgee:0
+	>=gnome-base/gnome-keyring-2.91.4-r300
+	>=media-libs/libcanberra-0.25[gtk3]
+	media-sound/pulseaudio[glib]
+	>=net-libs/gnutls-2.8.5
+	>=net-libs/telepathy-glib-0.16.0
+	>=net-libs/webkit-gtk-1.3.13:3
+	>=x11-libs/libnotify-0.7
+
+	dev-libs/libxml2:2
+	gnome-base/gsettings-desktop-schemas
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	media-libs/gst-plugins-bad
+	>=net-im/telepathy-logger-0.2.8
+	net-libs/farsight2
+	>=net-libs/telepathy-farsight-0.0.14
+	net-im/telepathy-connection-managers
+	x11-libs/libX11
+
+	call? (
+		>=media-libs/clutter-1.7.14:1.0
+		>=media-libs/clutter-gtk-0.90.3:1.0
+		media-libs/clutter-gst:1.0
+		net-libs/telepathy-farstream )
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	geoloc? ( >=app-misc/geoclue-0.11 )
+	gnome-online-accounts? ( net-libs/gnome-online-accounts )
+	map? (
+		>=media-libs/clutter-1.7.14:1.0
+		>=media-libs/clutter-gtk-0.90.3:1.0
+		media-libs/libchamplain:0.12[gtk] )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
+	spell? (
+		>=app-text/enchant-1.2
+		>=app-text/iso-codes-0.35 )
+	v4l? (
+		|| ( sys-fs/udev[gudev] sys-fs/udev[extras] )
+		media-plugins/gst-plugins-v4l2:0.10
+		>=media-video/cheese-2.91.91.1 )
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.17.3
+	>=dev-util/intltool-0.35.0
+	>=dev-util/pkgconfig-0.16
+	>=sys-devel/gettext-0.17
+	test? (
+		sys-apps/grep
+		>=dev-libs/check-0.9.4 )
+	dev-libs/libxslt
+"
+PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
+
+pkg_setup() {
+	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		--disable-coding-style-checks
+		--disable-schemas-compile
+		--disable-static
+		--disable-meego
+		--disable-Werror
+		$(use_enable call)
+		$(use_enable debug)
+		$(use_with eds)
+		$(use_enable geoloc location)
+		$(use_enable gnome-online-accounts goa)
+		$(use_enable map)
+		$(use_with networkmanager connectivity nm)
+		$(use_enable sendto nautilus-sendto)
+		$(use_enable spell)
+		$(use_with v4l cheese)
+		$(use_enable v4l gudev)"
+
+	# Build time python tools need python2
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	elog "Empathy needs telepathy's connection managers to use any IM protocol."
+	elog "See the USE flags on net-im/telepathy-connection-managers"
+	elog "to install them."
+}