Version bump for Gnome 2.32, remove old.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

6 files changed, 127 insertions, 149 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 08b23b211072..80778af8fae6 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.66 2010/10/27 16:40:03 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.67 2010/12/04 19:16:37 pacho Exp $
+
+*empathy-2.32.2 (04 Dec 2010)
+
+  04 Dec 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/empathy-2.28-networkmanager-0.8.patch, -empathy-2.28.2-r1.ebuild,
+  +empathy-2.32.2.ebuild:
+  Version bump for Gnome 2.32, remove old.
 
   27 Oct 2010; Arun Raghavan <ford_prefect@gentoo.org>
   empathy-2.30.3.ebuild:
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 8d63e0108a38..e9e3d152d393 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,9 +1,18 @@
-AUX empathy-2.28-networkmanager-0.8.patch 674 RMD160 a507683f229700db3bbc82f4d75d76404655bf28 SHA1 2a4676d8e629297df7d756e8fadc4a443d86d0c5 SHA256 f5d15db62b88e8df457885f2d6d65c482c7537d605c404828f05640964433432
-DIST empathy-2.28.2.tar.bz2 2432940 RMD160 a306be47d681c5192eb30db91792ac823ef27528 SHA1 712752a7675429215dc92e3f35106b91baa9772b SHA256 8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST empathy-2.30.2.tar.bz2 2644286 RMD160 891f1b60b0b5087ef3e6f106676af1728aa4be18 SHA1 de8776cdbceb3895392dee467437e76f893c9194 SHA256 e96846bafcedf39f9869d656031ba1c02c3568038e968db308ff07552e5024d7
 DIST empathy-2.30.3.tar.bz2 2655910 RMD160 57d558c81b166b8e008ee236a258d592b3ac50a3 SHA1 1a438198469f623e7051a521ef2590f0da518075 SHA256 5965434fcc05f7ec3cd32d9128b03ac20e96624b0035d329abf72decd70c5def
-EBUILD empathy-2.28.2-r1.ebuild 3082 RMD160 a0e7d0c8b372de8af58bb18012b31a6abc4f3956 SHA1 eec7628d6c7a84770bd0ef159eeaab973c911a90 SHA256 052a59e324fd6464786640c79ac232ef5af2ba0f7c5175c89f3150c09d17f2cc
+DIST empathy-2.32.2.tar.bz2 2936340 RMD160 36d42e08343e49c1963405caeb35e76400bab209 SHA1 b956af129aaecc54491c7bc01892bb29c33c1d32 SHA256 f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861
 EBUILD empathy-2.30.2.ebuild 2653 RMD160 8a0466ef274a1c10130b57e6a3afde155aaddfae SHA1 6428de59fa8210f2aaae8a7681ebd35fbae2ff8a SHA256 492f89f71b7a9f0f999cfc4e281dbb37f179af3fa145aea21bf2a7af03870eaf
 EBUILD empathy-2.30.3.ebuild 2851 RMD160 d3460f7876cf2fafc6d011e2c45b713a6f603976 SHA1 ee35562782c113ad598a6cf019189eb69b3ab74c SHA256 ccaf81b57d43124723ab2410461a96022075132901398e94bfde0531bd1516a4
-MISC ChangeLog 12083 RMD160 6fe76cb2e2714775dd3a8465ccc80ba0a29d9c26 SHA1 0e23d36791e928a20de57a375686dba2714a036b SHA256 5289d506ab9b0d868499cd2c1b88ea2a70fd7b91f67b4a8ec7cf2e3f72fe50b1
-MISC metadata.xml 937 RMD160 69906d677ab5c5d05d39a04caef2b617a25889c7 SHA1 1d6d3d10666fff0e5e937f1626a5f9ef0660cf54 SHA256 ac3b78a9174587a123a573709a0ea9e66e7ca9f7f0f05aa4ff1bf0f262b3f912
+EBUILD empathy-2.32.2.ebuild 2898 RMD160 8aa0a04c4970c785f0ef3953bb6e4b1da1f3f799 SHA1 2598943c3bbcc7fb468c77610be4e7d1ce90ae95 SHA256 2518d93ce17891fa2f67a5b7558a32fd1a9a00173f81bfbc0db95a9d73ecc5e1
+MISC ChangeLog 12298 RMD160 ce1659791259aa08fd2c2c3af66c4469b7712380 SHA1 c0485d4a3a51ce088530206a4ff55e7dbbe8c5d4 SHA256 f10f0304becd56ff46a785ea37adb0706570d94a6d6abacb8b23219a085c6a4c
+MISC metadata.xml 845 RMD160 a67a7d4b8af2591502b6e4fedc35315cd0669432 SHA1 c81013e764ce5b611f337c9d6dd2607ff3253de5 SHA256 face01aab7819b2c771273d38a34c7d1cf2a4f74f752c0a6c3ff56f5ed2e33b9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz6k5sACgkQCaWpQKGI+9SVoQCeNOCV0o5kyINT8MC7ckGq23qc
+CkkAn1O7pzSZA71Qc3JhtUoq0McGtBsy
+=knf9
+-----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.28.2-r1.ebuild b/net-im/empathy/empathy-2.28.2-r1.ebuild
deleted file mode 100644
index 49b4c73f63eb..000000000000
--- a/net-im/empathy/empathy-2.28.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2-r1.ebuild,v 1.3 2010/04/16 18:25:38 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2 multilib
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="applet networkmanager python spell test webkit" # map
-
-# FIXME: libnotify & libcanberra hard deps
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.16.0
-	>=gnome-base/gconf-2
-	>=dev-libs/dbus-glib-0.51
-	>=gnome-extra/evolution-data-server-1.2
-	>=net-libs/telepathy-glib-0.7.35
-	>=media-libs/libcanberra-0.4[gtk]
-	>=x11-libs/libnotify-0.4.4
-	>=gnome-base/gnome-keyring-2.22
-
-	dev-libs/libunique
-	net-libs/farsight2
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	net-libs/telepathy-farsight
-	dev-libs/libxml2
-	x11-libs/libX11
-	net-voip/telepathy-connection-managers
-
-	applet? ( >=gnome-base/gnome-panel-2.10 )
-	networkmanager? ( >=net-misc/networkmanager-0.8 )
-	python? (
-		>=dev-lang/python-2.4.4-r5
-		>=dev-python/pygtk-2 )
-	spell? (
-		app-text/enchant
-		app-text/iso-codes )
-	webkit? ( >=net-libs/webkit-gtk-1.1.7 )
-"
-#	map? (
-#		>=media-libs/libchamplain-0.4[gtk]
-#		>=media-libs/clutter-gtk-0.10:1.0 )
-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
-	virtual/python
-"
-PDEPEND=">=net-im/telepathy-mission-control-5"
-
-DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-# FIXME: Highly broken with parallel make, mallard strike 2, see bug #286889
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-static
-		--disable-location
-		--disable-gtk-doc
-		--disable-map
-		$(use_enable applet megaphone)
-		$(use_enable applet nothere)
-		$(use_enable debug)
-		$(use_with networkmanager connectivity nm)
-		$(use_enable python)
-		$(use_enable spell)
-		$(use_enable test coding-style-checks)
-		$(use_enable webkit)
-	"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}/empathy-2.28-networkmanager-0.8.patch"
-	eautoreconf
-
-	# Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687
-	sed -i "s:-Werror::g" configure || die "sed 1 failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed."
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libempathy.so.23
-	preserve_old_lib /usr/$(get_libdir)/libempathy-gtk.so.19
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	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."
-	preserve_old_lib_notify /usr/$(get_libdir)/libempathy.so.23
-	preserve_old_lib_notify /usr/$(get_libdir)/libempathy-gtk.so.19
-}
diff --git a/net-im/empathy/empathy-2.32.2.ebuild b/net-im/empathy/empathy-2.32.2.ebuild
new file mode 100644
index 000000000000..1d09b217da3c
--- /dev/null
+++ b/net-im/empathy/empathy-2.32.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.1 2010/12/04 19:16:37 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="2:2.4"
+
+inherit gnome2 multilib python
+
+DESCRIPTION="Telepathy client and library using GTK+"
+HOMEPAGE="http://live.gnome.org/Empathy"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+# FIXME: Add location support once geoclue stops being idiotic with automagic deps
+IUSE="eds nautilus networkmanager spell test webkit" # map
+
+# 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.25.9:2
+	>=x11-libs/gtk+-2.22:2
+	>=dev-libs/dbus-glib-0.51
+	>=gnome-extra/evolution-data-server-1.2
+	>=net-libs/telepathy-glib-0.11.15
+	>=media-libs/libcanberra-0.4[gtk]
+	>=x11-libs/libnotify-0.4.4
+	>=gnome-base/gnome-keyring-2.26
+	>=net-libs/gnutls-2.8.5
+	>=dev-libs/folks-0.1.15
+
+	>=dev-libs/libunique-1.1.6
+	net-libs/farsight2
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base: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.1.5
+
+	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	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 )"
+#	map? (
+#		>=media-libs/libchamplain-0.7.1[gtk]
+#		>=media-libs/clutter-gtk-0.10:1.0 )
+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"
+
+pkg_setup() {
+	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+
+	# Hard disable favourite_contacts and tpl, TpLogger is buggy.
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-location
+		--disable-map
+		--disable-control-center-embedding
+		--disable-Werror
+		$(use_enable debug)
+		$(use_with eds)
+		$(use_enable nautilus nautilus-sendto)
+		$(use_with networkmanager connectivity nm)
+		$(use_enable spell)
+		$(use_enable test coding-style-checks)
+		$(use_enable webkit)"
+
+	# Build time python tools needs python2
+	python_set_active_version 2
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	python_convert_shebangs -r 2 .
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "emake check failed."
+}
+
+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/files/empathy-2.28-networkmanager-0.8.patch b/net-im/empathy/files/empathy-2.28-networkmanager-0.8.patch
deleted file mode 100644
index cc2739c14090..000000000000
--- a/net-im/empathy/files/empathy-2.28-networkmanager-0.8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-NetworkManager-0.8 renamed libnm_glib to libnm-glib
-
-http://bugs.gentoo.org/show_bug.cgi?id=306977
-
-Patch found by Andrea Pinazzi on the debian bugzilla
----
---- configure.ac
-+++ configure.ac
-@@ -40,7 +40,7 @@
- GEOCLUE_REQUIRED=0.11
- WEBKIT_REQUIRED=1.1.7
- KEYRING_REQUIRED=2.22
--NETWORK_MANAGER_REQUIRED=0.7.0
-+NETWORK_MANAGER_REQUIRED=0.8
- 
- # Use --enable-maintainer-mode to disabled deprecated symbols
- GNOME_MAINTAINER_MODE_DEFINES
-@@ -184,7 +184,7 @@
- 
-    PKG_CHECK_MODULES(NETWORK_MANAGER,
-    [
--      libnm_glib >= $NETWORK_MANAGER_REQUIRED
-+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
-    ], have_nm="yes", have_nm="no")
- 
-    if test "x$have_nm" = "xyes"; then
diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 7af72f5dcb60..58ab9e78ec84 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -4,7 +4,6 @@
 <herd>net-im</herd>
 <herd>gnome</herd>
 <use>
-  <flag name="applet">Enable Empathy's applets for <pkg>gnome-base/gnome-panel</pkg></flag>
   <flag name="nautilus">Enable nautilus-sendto support</flag>
   <flag name="webkit">Build support for Adium-style HTML-based conversation
 	  window themes using <pkg>net-libs/webkit-gtk</pkg></flag>