Bump to 0.21.1. Remove old.

(Portage version: 2.1.3.9)

11 files changed, 25 insertions, 219 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 61a506e8d11a..540cd7e6e666 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.9 2007/10/19 17:03:07 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.10 2007/10/29 00:54:20 coldwind Exp $
+
+*empathy-0.21.1 (29 Oct 2007)
+
+  29 Oct 2007; Santiago M. Mola <coldwind@gentoo.org>
+  -files/empathy-0.12-multilib.patch, -empathy-0.11.ebuild,
+  -empathy-0.12-r1.ebuild, -empathy-0.13.ebuild, -empathy-0.14.ebuild,
+  +empathy-0.21.1.ebuild:
+  Bump to 0.21.1. Remove old.
 
 *empathy-0.14-r1 (19 Oct 2007)
 
diff --git a/net-im/empathy/empathy-0.11.ebuild b/net-im/empathy/empathy-0.11.ebuild
deleted file mode 100644
index 5bf2d55fe696..000000000000
--- a/net-im/empathy/empathy-0.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.11.ebuild,v 1.2 2007/08/13 18:12:13 dang Exp $
-
-inherit gnome2
-
-DESCRIPTION="Empathy Telepathy client"
-HOMEPAGE="http://live.gnome.org/Empathy"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-RDEPEND=">=dev-libs/dbus-glib-0.51
-	>=dev-libs/glib-2.12
-	dev-libs/libxml2
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	gnome-base/libgnomeui
-	>=net-libs/libtelepathy-0.0.51
-	>=net-im/telepathy-mission-control-4.33
-	>=x11-libs/gtk+-2.10
-	spell? ( app-text/aspell )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="CONTRIBUTORS AUTHORS README"
-
-pkg_setup() {
-	G2CONF="$(use_enable spell aspell)"
-}
-
-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.12-r1.ebuild b/net-im/empathy/empathy-0.12-r1.ebuild
deleted file mode 100644
index 612e0b76a8f8..000000000000
--- a/net-im/empathy/empathy-0.12-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.12-r1.ebuild,v 1.3 2007/09/09 21:45:55 coldwind Exp $
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Empathy Telepathy client"
-HOMEPAGE="http://live.gnome.org/Empathy"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python spell"
-
-RDEPEND=">=dev-libs/dbus-glib-0.51
-	>=dev-libs/glib-2.12
-	dev-libs/libxml2
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	gnome-base/libgnomeui
-	>=net-libs/libtelepathy-0.0.51
-	>=net-im/telepathy-mission-control-4.33
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/gnome-vfs-2
-	>=gnome-extra/evolution-data-server-1.2
-	spell? ( app-text/aspell )
-	python? ( >=dev-lang/python-2.4.4-r5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/gtk-doc"
-
-DOCS="CONTRIBUTORS AUTHORS README"
-
-pkg_setup() {
-	G2CONF="$(use_enable spell aspell) $(use_enable python)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	epatch "${FILESDIR}/${P}-multilib.patch"
-	eautoreconf
-}
-
-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.13.ebuild b/net-im/empathy/empathy-0.13.ebuild
deleted file mode 100644
index 61b64412a843..000000000000
--- a/net-im/empathy/empathy-0.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.13.ebuild,v 1.1 2007/09/30 01:35:16 coldwind Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Empathy Telepathy client"
-HOMEPAGE="http://live.gnome.org/Empathy"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome python spell"
-
-RDEPEND=">=dev-libs/dbus-glib-0.51
-	>=dev-libs/glib-2.14.0
-	dev-libs/libxml2
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=net-libs/libtelepathy-0.0.57
-	>=net-im/telepathy-mission-control-4.33
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gnome-vfs-2
-	>=gnome-extra/evolution-data-server-1.2
-	gnome? ( gnome-base/gnome-panel )
-	spell? ( app-text/aspell )
-	python? ( >=dev-lang/python-2.4.4-r5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/gtk-doc"
-
-DOCS="CONTRIBUTORS AUTHORS README"
-
-pkg_setup() {
-	G2CONF="$(use_enable spell aspell)
-		$(use_enable python)
-		$(use_enable gnome megaphone)
-		$(use_enable gnome nothere)"
-}
-
-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.14.ebuild b/net-im/empathy/empathy-0.21.1.ebuild
index b7c953ce334e..e4f159e24155 100644
--- a/net-im/empathy/empathy-0.14.ebuild
+++ b/net-im/empathy/empathy-0.21.1.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.14.ebuild,v 1.1 2007/10/01 13:49:19 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.21.1.ebuild,v 1.1 2007/10/29 00:54:20 coldwind Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils versionator
+
+MAJOR_V="$(get_version_component_range 1-2)"
 
 DESCRIPTION="Empathy Telepathy client"
 HOMEPAGE="http://live.gnome.org/Empathy"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.bz2"
+SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/${PN}/${MAJOR_V}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,7 +21,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.51
 	>=gnome-base/gconf-2
 	>=gnome-base/libglade-2
 	>=net-libs/libtelepathy-0.0.57
-	>=net-im/telepathy-mission-control-4.33
+	>=net-im/telepathy-mission-control-4.37
 	>=x11-libs/gtk+-2.12.0
 	>=gnome-base/gnome-vfs-2
 	>=gnome-extra/evolution-data-server-1.2
@@ -27,15 +29,18 @@ RDEPEND=">=dev-libs/dbus-glib-0.51
 	spell? ( app-text/aspell )
 	python? ( >=dev-lang/python-2.4.4-r5 )"
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/gtk-doc"
+	>=dev-util/pkgconfig-0.12.0"
 
 DOCS="CONTRIBUTORS AUTHORS README"
 
 pkg_setup() {
 	# NotHere is too broken to be included by default
-	G2CONF="$(use_enable spell aspell) $(use_enable python)
-		--enable-megaphone --disable-nothere"
+	G2CONF="$(use_enable spell aspell)
+		$(use_enable python)
+		--enable-voip=no
+		--enable-megaphone
+		--disable-nothere
+		--disable-gtk-doc"
 }
 
 src_install() {
diff --git a/net-im/empathy/files/digest-empathy-0.11 b/net-im/empathy/files/digest-empathy-0.11
deleted file mode 100644
index 1a2676426250..000000000000
--- a/net-im/empathy/files/digest-empathy-0.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8ee7ae2993d754fe5dcb3bc6cee2c1cd empathy-0.11.tar.bz2 904304
-RMD160 49e6be69f2fdef56311e7b961943b9c4e9cebbbb empathy-0.11.tar.bz2 904304
-SHA256 d860741394a32482a6b361ceb9b9b3350a492bfa280de3a5ded6f35b1abf83b9 empathy-0.11.tar.bz2 904304
diff --git a/net-im/empathy/files/digest-empathy-0.12-r1 b/net-im/empathy/files/digest-empathy-0.12-r1
deleted file mode 100644
index 14087d18722e..000000000000
--- a/net-im/empathy/files/digest-empathy-0.12-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bd573be24ca435accb9313f41301a656 empathy-0.12.tar.bz2 926914
-RMD160 78267f7e94e71b0f36c47575798b3a1932e0f5db empathy-0.12.tar.bz2 926914
-SHA256 8d47953c117e9c73c25f0b3413a06962a6b85ce2e7cb6f3e973823286bf4dfd5 empathy-0.12.tar.bz2 926914
diff --git a/net-im/empathy/files/digest-empathy-0.13 b/net-im/empathy/files/digest-empathy-0.13
deleted file mode 100644
index 986c02a6dbf7..000000000000
--- a/net-im/empathy/files/digest-empathy-0.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7b2470404e3f5466c015b2eac2120ad2 empathy-0.13.tar.bz2 951572
-RMD160 6a8bc86e9f1b9463e67732e10bb99867de0dd8e5 empathy-0.13.tar.bz2 951572
-SHA256 e221dd5f3a0da3f5aa759ca528de12f67efc2141e8ac78a98066cfe9ec30ac2f empathy-0.13.tar.bz2 951572
diff --git a/net-im/empathy/files/digest-empathy-0.14 b/net-im/empathy/files/digest-empathy-0.14
deleted file mode 100644
index be1d03be9e3f..000000000000
--- a/net-im/empathy/files/digest-empathy-0.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 676154eddfb47f212e4716bebc0fdf26 empathy-0.14.tar.bz2 962028
-RMD160 b329d12cd6e8f60ff09562507d8bf928872f1cd4 empathy-0.14.tar.bz2 962028
-SHA256 170d61f1387221b3034a777eb835d5b85d23ddb58d4d81ac42480e4e9ea138a6 empathy-0.14.tar.bz2 962028
diff --git a/net-im/empathy/files/digest-empathy-0.21.1 b/net-im/empathy/files/digest-empathy-0.21.1
new file mode 100644
index 000000000000..b04b438df842
--- /dev/null
+++ b/net-im/empathy/files/digest-empathy-0.21.1
@@ -0,0 +1,3 @@
+MD5 dff1f9f60920cd41bf56bc121eba0b19 empathy-0.21.1.tar.bz2 984148
+RMD160 c36d8a8bb2cd39712dd8e62ea894e2dbef41277b empathy-0.21.1.tar.bz2 984148
+SHA256 659fe97f4004aa839ed8afc37f89d5d1e164391a62c31716527d50963ae9ca74 empathy-0.21.1.tar.bz2 984148
diff --git a/net-im/empathy/files/empathy-0.12-multilib.patch b/net-im/empathy/files/empathy-0.12-multilib.patch
deleted file mode 100644
index c8d4480c3a52..000000000000
--- a/net-im/empathy/files/empathy-0.12-multilib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- empathy-0.12.orig/configure.ac	2007-08-24 17:49:42.000000000 -0400
-+++ empathy-0.12/configure.ac	2007-08-27 17:14:19.000000000 -0400
-@@ -177,7 +177,12 @@ if test "x$have_python" = "xno"; then
- 	enable_python="no (missing dependencies)"
- else
- 	if test "x$enable_python" != "xno"; then
--		enable_python="yes"
-+		AM_PATH_PYTHON
-+		if test -z "$PYTHON" ; then
-+			enable_python="no"
-+		else
-+			enable_python="yes"
-+		fi
- 	else
- 		enable_python="no (disabled)"
- 	fi
---- empathy-0.12.orig/python/pyempathy/Makefile.am	2007-08-24 17:29:46.000000000 -0400
-+++ empathy-0.12/python/pyempathy/Makefile.am	2007-08-27 17:15:07.000000000 -0400
-@@ -12,7 +12,7 @@ AM_CPPFLAGS =                           
- BUILT_SOURCES = 					\
- 	pyempathy.c					
- 
--pyempathydir = $(prefix)/lib/`pyversions -d`/site-packages
-+pyempathydir = $(pyexecdir)
- pyempathy_LTLIBRARIES = empathy.la
- 
- empathy_la_SOURCES =					\
---- empathy-0.12.orig/python/pyempathygtk/Makefile.am	2007-08-24 17:29:46.000000000 -0400
-+++ empathy-0.12/python/pyempathygtk/Makefile.am	2007-08-27 17:15:43.000000000 -0400
-@@ -11,7 +11,7 @@ AM_CPPFLAGS =                           
- BUILT_SOURCES = 					\
- 	pyempathygtk.c					
- 
--pyempathygtkdir = $(prefix)/lib/`pyversions -d`/site-packages
-+pyempathygtkdir = $(pyexecdir)
- pyempathygtk_LTLIBRARIES = empathygtk.la
- 
- empathygtk_la_SOURCES =					\