Version bump. Fixes Python 2.6 compatibility (bug #239477).

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)

3 files changed, 15 insertions, 79 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 6a0f49103a6b..0046bc4a3eb1 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.31 2008/10/03 17:54:39 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.32 2008/10/21 10:50:23 coldwind Exp $
+
+*empathy-2.24.1 (21 Oct 2008)
+
+  21 Oct 2008; Santiago M. Mola <coldwind@gentoo.org>
+  -empathy-0.23.4.ebuild, -empathy-2.24.0.ebuild, +empathy-2.24.1.ebuild:
+  Version bump. Fixes Python 2.6 compatibility (bug #239477).
 
 *empathy-2.24.0-r1 (03 Oct 2008)
 
diff --git a/net-im/empathy/empathy-0.23.4.ebuild b/net-im/empathy/empathy-0.23.4.ebuild
deleted file mode 100644
index 12edc40c0be4..000000000000
--- a/net-im/empathy/empathy-0.23.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.23.4.ebuild,v 1.1 2008/07/18 22:47:15 coldwind Exp $
-
-inherit gnome2 eutils versionator
-
-MAJOR_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${MAJOR_V}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python spell test"
-
-RDEPEND=">=dev-libs/dbus-glib-0.51
-	>=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-panel-2.10
-	>=net-libs/telepathy-glib-0.7.7
-	>=net-im/telepathy-mission-control-4.61
-	dev-libs/libxml2
-	>=gnome-extra/evolution-data-server-1.2
-	spell? (
-		app-text/enchant
-		app-text/iso-codes )
-	python? (
-		>=dev-lang/python-2.4.4-r5
-		>=dev-python/pygtk-2 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.16
-	test? ( >=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-	virtual/python"
-
-DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="$(use_enable debug)
-		$(use_enable spell)
-		$(use_enable python)
-		--enable-megaphone
-		--enable-nothere
-		--disable-gtk-doc"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687
-	sed -i "s:-Werror::g" configure || die "sed failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	elog "Empathy needs telepathy's connection managers to use any protocol."
-	elog "You'll need to install connection managers yourself."
-	elog "MSN: net-voip/telepathy-butterfly"
-	elog "Jabber and Gtalk: net-voip/telepathy-gabble"
-	elog "IRC: net-irc/telepathy-idle"
-	elog
-	elog "Additionally, you'll need >=net-voip/telepathy-stream-engine-0.5.0"
-	elog "if you want any voip functionality."
-}
diff --git a/net-im/empathy/empathy-2.24.0.ebuild b/net-im/empathy/empathy-2.24.1.ebuild
index 3cd33aa07d94..764754c18806 100644
--- a/net-im/empathy/empathy-2.24.0.ebuild
+++ b/net-im/empathy/empathy-2.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.24.0.ebuild,v 1.1 2008/09/25 13:45:34 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.24.1.ebuild,v 1.1 2008/10/21 10:50:23 coldwind Exp $
 
 inherit gnome2
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://live.gnome.org/Empathy"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="python spell test"
+IUSE="applet python spell test"
 
 RDEPEND=">=dev-libs/dbus-glib-0.51
 	>=dev-libs/glib-2.16.0
 	>=x11-libs/gtk+-2.12.0
 	>=gnome-base/gconf-2
 	>=gnome-base/libglade-2
-	>=gnome-base/gnome-panel-2.10
+	applet? ( >=gnome-base/gnome-panel-2.10 )
 	>=net-libs/telepathy-glib-0.7.7
 	>=net-im/telepathy-mission-control-4.61
 	dev-libs/libxml2
@@ -41,8 +41,8 @@ pkg_setup() {
 	G2CONF="$(use_enable debug)
 		$(use_enable spell)
 		$(use_enable python)
-		--enable-megaphone
-		--enable-nothere
+		$(use_enable applet megaphone)
+		$(use_enable applet nothere)
 		--disable-gtk-doc"
 }
 
@@ -56,12 +56,12 @@ src_unpack() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	echo
-	elog "Empathy needs telepathy's connection managers to use any protocol."
-	elog "You'll need to install connection managers yourself."
+	elog "Empathy needs telepathy's connection managers to use any IM protocol."
+	elog "You will need to install connection managers yourself."
 	elog "MSN: net-voip/telepathy-butterfly"
 	elog "Jabber and Gtalk: net-voip/telepathy-gabble"
 	elog "IRC: net-irc/telepathy-idle"
 	elog
-	elog "Additionally, you'll need >=net-voip/telepathy-stream-engine-0.5.0"
+	elog "Additionally, you will need >=net-voip/telepathy-stream-engine-0.5.0"
 	elog "if you want any voip functionality."
 }