Version bump. Fix empathy shutdown with newer glib.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

4 files changed, 140 insertions, 118 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 16a0f997f06c..ae8eed8dfb84 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.95 2011/11/06 13:00:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.96 2011/11/13 19:29:25 eva Exp $
+
+*empathy-3.2.1.2 (13 Nov 2011)
+
+  13 Nov 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -empathy-2.34.0-r1.ebuild, +empathy-3.2.1.2.ebuild:
+  Version bump. Fix empathy shutdown with newer glib.
 
   06 Nov 2011; Brent Baude <ranger@gentoo.org> empathy-2.34.0-r2.ebuild:
   Marking empathy-2.34.0-r2 ppc for bug 388051
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 8e1162c14373..62759475aa16 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX empathy-2.32.2-libnotify-0.7.patch 1644 RMD160 87941e9933ec4fb83f45a0e052af77273a6aa250 SHA1 8696716fd49d0a0bce7eeb7044db66b7591e0d82 SHA256 8f7280c95fb67a2f91dc38984523f8ae4be95643e7404ea672d88d6541987ca8
 AUX empathy-2.34.0-CVE-2011-3635.patch 2451 RMD160 74947ef5803899f2882fd80186329673303c84d2 SHA1 36b1e435df44238ad8ec457148198c6f33e402c8 SHA256 7b82ba0d9e002ba78975caff45ec08eb7b176feb513ba72c0c312f0a2a8ccd54
 AUX empathy-2.34.0-auth-dialog-crash-fix.patch 976 RMD160 97ea8bb28e5673baaca8d437158202d9b40019d1 SHA1 ab18d8759a46da7e34b0f2261c7c3b802688663a SHA256 cad7bc8885b94cfe777223bd167006f5fd5e57dcff87ba861260d08e961c22f3
@@ -5,9 +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.1.tar.xz 3195440 RMD160 20af11b464744e9fc16d10f38fb2a4aa6639ddd6 SHA1 2d6cc3a8864ea7a276c36e493700fb68a73d0d43 SHA256 2b4ce3184fcd8c2260654f925e4055a7e02513c5eefa4745bcdf82c9039b7681
+DIST empathy-3.2.1.2.tar.xz 3183768 RMD160 f3f5b7cfb852a1f82d6a6e3b2a62aba95ac1042f SHA1 6bf4e0d0c3fcfb8c62269ad324b21c6a15f2dab1 SHA256 44e149ecadce6269a6d31d93bbd7d4a4bda8d092d4e95de9d5ca09cf067d8ab7
 EBUILD empathy-2.32.2.ebuild 3129 RMD160 432ea4a9ea354ff8c031a6e91b77f460f853f568 SHA1 02c8374d7368e1485f992df349441b316b12fcc9 SHA256 8c784893206ce642837dec44e29cfbbaa7ca6a57b55a65d847d02b5883fdbdad
-EBUILD empathy-2.34.0-r1.ebuild 3133 RMD160 bf5ee1044300b8bf62b7923e4b9a22dc6fa64d5f SHA1 1a16c403650342e09ad97581c44d6c9ee55955ab SHA256 99278f352cc03328909b0463719117d3d0979e111827c1266f5ca1d4527f55d7
 EBUILD empathy-2.34.0-r2.ebuild 3299 RMD160 4baa0beae829db55bf9b18e12ce6c6aa5fec8cda SHA1 64e8ff392fafb4e287637b18b568e201095ce80e SHA256 8d0ee3102ca8bd0f3f5abd80165aafe260a112bbc916841756e4e3e6bd805ad4
 EBUILD empathy-3.2.1.1.ebuild 3350 RMD160 8cc1a951d6e7c9317e1542c4121e7235f1a93e11 SHA1 93e07e9a0571574193f99961f3787b366ba99bc0 SHA256 f0dc9ef2ce1e6284d7775a0525f7bc6933a1442f86988aab77bae06534d6e6c4
-MISC ChangeLog 16692 RMD160 d60a10c2792fc1bb866915d768c6c675cb94448b SHA1 ace7911e8017e7f2cee4c7f17cb1c929d21fa774 SHA256 46a23b664bdb8e6c8e847323a5dd8842932e08f48f7ffd301381d0be20053f58
+EBUILD empathy-3.2.1.2.ebuild 3344 RMD160 03d54547c3c5f3f62a09ca40ae77629b1c13076e SHA1 c59855522c172f334677debd0bff74c69c3a11c7 SHA256 6bd5b15151ff7449592761bea3a0340cc762587ed917876dc6ec9a438d84e197
+MISC ChangeLog 16884 RMD160 805d59284823f6550c99567252c85418e3e13673 SHA1 9570d16471f0071044e5474d729a0710c0a4079b SHA256 0e331207f512366d8010d9d8eb90c0765c250f301df6a13e051a20c72fe06326
 MISC metadata.xml 1425 RMD160 38d0a65bd440db5fe8deb90bd79f079b12a5502d SHA1 d1743cb72216d94a45eae200cd40d310a121cb5b SHA256 0a68cd5576cafddcf96b2046679bcd0511adc7f3205fefb8f8cc1cb4de87d7c0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk7AGpsACgkQ1fmVwcYIWAb9xQCeN1M/5c9s/BhkRqo7QGu/9Y0v
+CUIAnjk5rjDIP3Pc6Mk/lX5j3t6JFPx1
+=sS1c
+-----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.34.0-r1.ebuild b/net-im/empathy/empathy-2.34.0-r1.ebuild
deleted file mode 100644
index 54468c0fb9e1..000000000000
--- a/net-im/empathy/empathy-2.34.0-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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-2.34.0-r1.ebuild,v 1.4 2011/08/06 11:35:50 zmedico Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="2:2.4"
-
-inherit eutils gnome2 multilib python
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="eds map nautilus networkmanager spell test webkit"
-
-# FIXME: libnotify & libcanberra hard deps
-# gst-plugins-bad is required for the valve plugin. This should move to good
-# eventually at which point the dep can be dropped
-RDEPEND=">=dev-libs/glib-2.27.2:2
-	>=x11-libs/gtk+-2.22:2
-	>=dev-libs/dbus-glib-0.51
-	>=net-libs/telepathy-glib-0.14.1
-	>=media-libs/libcanberra-0.4[gtk]
-	>=x11-libs/libnotify-0.7
-	>=gnome-base/gnome-keyring-2.26
-	>=net-libs/gnutls-2.8.5
-	>=dev-libs/folks-0.4
-
-	>=dev-libs/libunique-1.1.6:1
-	net-libs/farsight2
-	>=media-libs/gstreamer-0.10.32:0.10
-	>=media-libs/gst-plugins-base-0.10.32:0.10
-	media-libs/gst-plugins-bad
-	media-plugins/gst-plugins-gconf
-	>=net-libs/telepathy-farsight-0.0.14
-	dev-libs/libxml2
-	x11-libs/libX11
-	net-voip/telepathy-connection-managers
-	>=net-im/telepathy-logger-0.2.0
-
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	map? (
-		>=media-libs/libchamplain-0.7.1:0.8[gtk]
-		>=media-libs/clutter-gtk-0.10:0.10 )
-	nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	spell? (
-		>=app-text/enchant-1.2
-		>=app-text/iso-codes-0.35 )
-	webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.16
-	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"
-
-	# call support needs unreleased telepathy-farstream
-	G2CONF="${G2CONF}
-		--enable-silent-rules
-		--disable-coding-style-checks
-		--disable-schemas-compile
-		--disable-static
-		--disable-call
-		--disable-location
-		--disable-control-center-embedding
-		--disable-Werror
-		$(use_enable debug)
-		$(use_with eds)
-		$(use_enable map)
-		$(use_enable nautilus nautilus-sendto)
-		$(use_with networkmanager connectivity nm)
-		$(use_enable spell)
-		$(use_enable webkit)"
-
-	# Build time python tools needs python2
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-auth-dialog-crash-fix.patch
-	gnome2_src_prepare
-	python_convert_shebangs -r 2 .
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed."
-}
-
-src_install() {
-	gnome2_src_install
-	# nautilus-sendto plugin doesn't need this
-	find "${ED}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-voip/telepathy-connection-managers"
-	elog "to install them."
-}
diff --git a/net-im/empathy/empathy-3.2.1.2.ebuild b/net-im/empathy/empathy-3.2.1.2.ebuild
new file mode 100644
index 000000000000..83dc657f96aa
--- /dev/null
+++ b/net-im/empathy/empathy-3.2.1.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.1.2.ebuild,v 1.1 2011/11/13 19:29:25 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-voip/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-voip/telepathy-connection-managers"
+	elog "to install them."
+}