Bump to 0.23.1, NotHere applet is now enabled, gnome-vfs dependency is gone. Remove old ebuilds.

(Portage version: 2.1.4.4)

5 files changed, 23 insertions, 214 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 5f8ec5ebd6c0..43dde681ab02 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,14 @@
 # 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.21 2008/05/01 14:07:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.22 2008/05/01 14:56:11 coldwind Exp $
+
+*empathy-0.23.1 (01 May 2008)
+
+  01 May 2008; Santiago M. Mola <coldwind@gentoo.org>
+  -empathy-0.21.5.2.ebuild, -empathy-0.21.90.ebuild,
+  -empathy-0.21.91.ebuild, -empathy-0.22.0.ebuild, +empathy-0.23.1.ebuild:
+  Bump to 0.23.1, NotHere applet is now enabled, gnome-vfs dependency is
+  gone. Remove old ebuilds.
 
   01 May 2008; Gilles Dartiguelongue <eva@gentoo.org> empathy-0.22.1.ebuild:
   Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug #218687
diff --git a/net-im/empathy/empathy-0.21.5.2.ebuild b/net-im/empathy/empathy-0.21.5.2.ebuild
deleted file mode 100644
index bdd1d135860e..000000000000
--- a/net-im/empathy/empathy-0.21.5.2.ebuild
+++ /dev/null
@@ -1,68 +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.21.5.2.ebuild,v 1.2 2008/03/03 22:57:39 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.14.0
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-panel-2.10
-	>=net-libs/libtelepathy-0.3.1
-	>=net-libs/telepathy-glib-0.7.0
-	>=net-im/telepathy-mission-control-4.55
-	dev-libs/libxml2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-extra/evolution-data-server-1.2
-	spell? (
-		app-text/aspell
-		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 )"
-
-DOCS="CONTRIBUTORS AUTHORS README"
-
-pkg_setup() {
-	# NotHere is too broken to be included by default
-	G2CONF="$(use_enable spell aspell)
-		$(use_enable python)
-		--enable-voip=no
-		--enable-megaphone
-		--disable-nothere
-		--disable-gtk-doc"
-}
-
-src_install() {
-	gnome2_src_install
-	make_desktop_entry "${PN}" "Empathy" \
-		"/usr/share/icons/hicolor/scalable/apps/${PN}.svg" \
-		"Network;InstantMessaging"
-}
-
-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"
-}
diff --git a/net-im/empathy/empathy-0.21.90.ebuild b/net-im/empathy/empathy-0.21.90.ebuild
deleted file mode 100644
index dbc4921de744..000000000000
--- a/net-im/empathy/empathy-0.21.90.ebuild
+++ /dev/null
@@ -1,68 +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.21.90.ebuild,v 1.2 2008/03/03 22:57:39 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.14.0
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-panel-2.10
-	>=net-libs/libtelepathy-0.3.1
-	>=net-libs/telepathy-glib-0.7.0
-	>=net-im/telepathy-mission-control-4.55
-	dev-libs/libxml2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-extra/evolution-data-server-1.2
-	spell? (
-		app-text/aspell
-		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 )"
-
-DOCS="CONTRIBUTORS AUTHORS README"
-
-pkg_setup() {
-	# NotHere is too broken to be included by default
-	G2CONF="$(use_enable spell aspell)
-		$(use_enable python)
-		--enable-voip=no
-		--enable-megaphone
-		--disable-nothere
-		--disable-gtk-doc"
-}
-
-src_install() {
-	gnome2_src_install
-	make_desktop_entry "${PN}" "Empathy" \
-		"/usr/share/icons/hicolor/scalable/apps/${PN}.svg" \
-		"Network;InstantMessaging"
-}
-
-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"
-}
diff --git a/net-im/empathy/empathy-0.22.0.ebuild b/net-im/empathy/empathy-0.22.0.ebuild
deleted file mode 100644
index 844a69943df4..000000000000
--- a/net-im/empathy/empathy-0.22.0.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.22.0.ebuild,v 1.1 2008/03/10 14:04:57 leio 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.14.0
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-panel-2.10
-	>=net-libs/libtelepathy-0.3.1
-	>=net-libs/telepathy-glib-0.7.3
-	>=net-im/telepathy-mission-control-4.55
-	dev-libs/libxml2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-extra/evolution-data-server-1.2
-	spell? (
-		app-text/aspell
-		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() {
-	# NotHere is too broken to be included by default
-	G2CONF="$(use_enable spell aspell)
-		$(use_enable python)
-		--enable-voip=yes
-		--enable-megaphone
-		--disable-nothere
-		--disable-gtk-doc"
-}
-
-src_install() {
-	gnome2_src_install
-	make_desktop_entry "${PN}" "Empathy" \
-		"/usr/share/icons/hicolor/scalable/apps/${PN}.svg" \
-		"Network;InstantMessaging"
-}
-
-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"
-}
diff --git a/net-im/empathy/empathy-0.21.91.ebuild b/net-im/empathy/empathy-0.23.1.ebuild
index c51fc98e76cd..888759d3e839 100644
--- a/net-im/empathy/empathy-0.21.91.ebuild
+++ b/net-im/empathy/empathy-0.23.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-0.21.91.ebuild,v 1.3 2008/03/06 09:41:22 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.23.1.ebuild,v 1.1 2008/05/01 14:56:11 coldwind Exp $
 
 inherit gnome2 eutils versionator
 
@@ -16,16 +16,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE="python spell test"
 
 RDEPEND=">=dev-libs/dbus-glib-0.51
-	>=dev-libs/glib-2.14.0
+	>=dev-libs/glib-2.15.5
 	>=x11-libs/gtk+-2.12.0
 	>=gnome-base/gconf-2
 	>=gnome-base/libglade-2
 	>=gnome-base/gnome-panel-2.10
-	>=net-libs/libtelepathy-0.3.1
 	>=net-libs/telepathy-glib-0.7.3
-	>=net-im/telepathy-mission-control-4.55
+	>=net-im/telepathy-mission-control-4.61
 	dev-libs/libxml2
-	>=gnome-base/gnome-vfs-2
 	>=gnome-extra/evolution-data-server-1.2
 	spell? (
 		app-text/aspell
@@ -43,15 +41,21 @@ DEPEND="${RDEPEND}
 DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	# NotHere is too broken to be included by default
 	G2CONF="$(use_enable spell aspell)
 		$(use_enable python)
 		--enable-voip=yes
 		--enable-megaphone
-		--disable-nothere
+		--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"
+}
+
 src_install() {
 	gnome2_src_install
 	make_desktop_entry "${PN}" "Empathy" \
@@ -67,4 +71,7 @@ pkg_postinst() {
 	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."
 }