Bump to 0.21.1. Remove old.

Package-Manager: portage-2.1.3.9

12 files changed, 37 insertions, 258 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/Manifest b/net-im/empathy/Manifest
index 9b113262a898..9f47ca1f0313 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,51 +1,24 @@
-AUX empathy-0.12-multilib.patch 1347 RMD160 9f13d63d98ca4baf69f4fe9082eba95d4932e97a SHA1 34aeaf407400c097dcb9f1c0d3d1ed6c3c441830 SHA256 235adc66c1b26477bb33a0fcbaee447d7a35bac3b327195bed224ebb44b7caa5
-MD5 4cb751b27e389bcad5bcc23cd1ab8283 files/empathy-0.12-multilib.patch 1347
-RMD160 9f13d63d98ca4baf69f4fe9082eba95d4932e97a files/empathy-0.12-multilib.patch 1347
-SHA256 235adc66c1b26477bb33a0fcbaee447d7a35bac3b327195bed224ebb44b7caa5 files/empathy-0.12-multilib.patch 1347
-DIST empathy-0.11.tar.bz2 904304 RMD160 49e6be69f2fdef56311e7b961943b9c4e9cebbbb SHA1 a0ab87d4fff5b8493e7cc6a80bf93b868be13a5a SHA256 d860741394a32482a6b361ceb9b9b3350a492bfa280de3a5ded6f35b1abf83b9
-DIST empathy-0.12.tar.bz2 926914 RMD160 78267f7e94e71b0f36c47575798b3a1932e0f5db SHA1 16f4e82de85df07826f8957e03b891ad33e7e6a4 SHA256 8d47953c117e9c73c25f0b3413a06962a6b85ce2e7cb6f3e973823286bf4dfd5
-DIST empathy-0.13.tar.bz2 951572 RMD160 6a8bc86e9f1b9463e67732e10bb99867de0dd8e5 SHA1 2fa824c9833d81ea74df9f516f29b9681971dab1 SHA256 e221dd5f3a0da3f5aa759ca528de12f67efc2141e8ac78a98066cfe9ec30ac2f
 DIST empathy-0.14.tar.bz2 962028 RMD160 b329d12cd6e8f60ff09562507d8bf928872f1cd4 SHA1 cc5a17d8f42c17879bd5804136f2dbbbc24ecf37 SHA256 170d61f1387221b3034a777eb835d5b85d23ddb58d4d81ac42480e4e9ea138a6
-EBUILD empathy-0.11.ebuild 1169 RMD160 03904c7d5d28c625553708e33e4edc3c946bb24b SHA1 12894e5244f8bedfa091de0c2c03a522462393c7 SHA256 cd41a1e9bca97cdb56a1d89f356ab2289d0078485aa78d0ca70cb27d232d73ba
-MD5 4cd2e4d23101dd04930510116d11a346 empathy-0.11.ebuild 1169
-RMD160 03904c7d5d28c625553708e33e4edc3c946bb24b empathy-0.11.ebuild 1169
-SHA256 cd41a1e9bca97cdb56a1d89f356ab2289d0078485aa78d0ca70cb27d232d73ba empathy-0.11.ebuild 1169
-EBUILD empathy-0.12-r1.ebuild 1601 RMD160 875ba7bca9f884e40ccfa558104c43140efec254 SHA1 6a8c34ea5bc8c151293a4932741c6d88a913f550 SHA256 37cad9d04955c6daf185a21f61f5d89190dea85fd9c9630b012bdc2057ac0200
-MD5 44a06eb5639165b70d0a0106b422b93e empathy-0.12-r1.ebuild 1601
-RMD160 875ba7bca9f884e40ccfa558104c43140efec254 empathy-0.12-r1.ebuild 1601
-SHA256 37cad9d04955c6daf185a21f61f5d89190dea85fd9c9630b012bdc2057ac0200 empathy-0.12-r1.ebuild 1601
-EBUILD empathy-0.13.ebuild 1582 RMD160 b4bfbe34742094c4497d8742038a438b41a2400e SHA1 ca1af67d0b58f655aeb6b231e66b32cfb23f4dc4 SHA256 61f1df80151d0a313ef88df31795961746d9c1ac0cd0245178f343b63a3a78a2
-MD5 792eb3a6c83cff6d88061754095c46c7 empathy-0.13.ebuild 1582
-RMD160 b4bfbe34742094c4497d8742038a438b41a2400e empathy-0.13.ebuild 1582
-SHA256 61f1df80151d0a313ef88df31795961746d9c1ac0cd0245178f343b63a3a78a2 empathy-0.13.ebuild 1582
+DIST empathy-0.21.1.tar.bz2 984148 RMD160 c36d8a8bb2cd39712dd8e62ea894e2dbef41277b SHA1 cf808c5c0e270d254b4d840a64588864e22cdd23 SHA256 659fe97f4004aa839ed8afc37f89d5d1e164391a62c31716527d50963ae9ca74
 EBUILD empathy-0.14-r1.ebuild 1619 RMD160 1e69b2bf8ce0079ad55735b56020ed1d8b825e02 SHA1 28746dc2f35b02f73456bf30a23bb2735a13baa7 SHA256 7bf7124b6e1ac607d9cc1068cb0bb9d956d735d76bc3c7aa0ef0d72098ed94fd
 MD5 edaee5543bcc52c79d942404f2f2ceb8 empathy-0.14-r1.ebuild 1619
 RMD160 1e69b2bf8ce0079ad55735b56020ed1d8b825e02 empathy-0.14-r1.ebuild 1619
 SHA256 7bf7124b6e1ac607d9cc1068cb0bb9d956d735d76bc3c7aa0ef0d72098ed94fd empathy-0.14-r1.ebuild 1619
-EBUILD empathy-0.14.ebuild 1589 RMD160 304be30d583de5b9d7d60396fbb4f797409732a9 SHA1 cf57fd6f5272c1503daceb56e06a218eb1cb1a28 SHA256 ca0a53672d8eefdcc661b539e33932443565ab9c1e7eb15d0087f234923d3dc8
-MD5 a269215a1c2fbcbb6fb8dc27f91a4149 empathy-0.14.ebuild 1589
-RMD160 304be30d583de5b9d7d60396fbb4f797409732a9 empathy-0.14.ebuild 1589
-SHA256 ca0a53672d8eefdcc661b539e33932443565ab9c1e7eb15d0087f234923d3dc8 empathy-0.14.ebuild 1589
-MISC ChangeLog 1572 RMD160 1dd0d0e2895a2a7fc3b176a73e38fa4a2c27dbc6 SHA1 4a675991af1f7b139fd97d23566480736e561a54 SHA256 6e6b6204d7b4768bc5272738471958b4d6c62e5c1f7df22f3477fd05ea5e2249
-MD5 fce41c04485ec79b27583863daaad674 ChangeLog 1572
-RMD160 1dd0d0e2895a2a7fc3b176a73e38fa4a2c27dbc6 ChangeLog 1572
-SHA256 6e6b6204d7b4768bc5272738471958b4d6c62e5c1f7df22f3477fd05ea5e2249 ChangeLog 1572
+EBUILD empathy-0.21.1.ebuild 1681 RMD160 e04a461c012b18330651331eb370f47476548e37 SHA1 8a6a62991bdb95171db6d0449b664bd82699f6d6 SHA256 cc80095502a405e8f6950bd732569ca0112273f7d6e556596b17cbf4c267e984
+MD5 c7ec44fcf3d0304222a45c34de065259 empathy-0.21.1.ebuild 1681
+RMD160 e04a461c012b18330651331eb370f47476548e37 empathy-0.21.1.ebuild 1681
+SHA256 cc80095502a405e8f6950bd732569ca0112273f7d6e556596b17cbf4c267e984 empathy-0.21.1.ebuild 1681
+MISC ChangeLog 1846 RMD160 ebf3dd8dc5fd8e1f58ce73fea57294403c6437e0 SHA1 a949531374af6bd74bf02d44762d42b7b2045124 SHA256 830bcacbf9951b6d87bed927f788955d65d2d5937e14097e812173cb9fc2fd47
+MD5 385f4a36d28f81f46f3c27c0a99c8318 ChangeLog 1846
+RMD160 ebf3dd8dc5fd8e1f58ce73fea57294403c6437e0 ChangeLog 1846
+SHA256 830bcacbf9951b6d87bed927f788955d65d2d5937e14097e812173cb9fc2fd47 ChangeLog 1846
 MISC metadata.xml 710 RMD160 f0d4a0b8ab679d77ae64e683d4eed5a2b29b66ee SHA1 cff1fc6b36545ac0afb2cf9eb82556a547209059 SHA256 b8b226d6e8553666e22e8cb840d8ac2a39049f41a908806706c688e42033c8b9
 MD5 6b1b042e3b7f71cf2ad0dc138409abf7 metadata.xml 710
 RMD160 f0d4a0b8ab679d77ae64e683d4eed5a2b29b66ee metadata.xml 710
 SHA256 b8b226d6e8553666e22e8cb840d8ac2a39049f41a908806706c688e42033c8b9 metadata.xml 710
-MD5 8d0dd5c213ce13ea6d1b3a984f97e86a files/digest-empathy-0.11 241
-RMD160 c1b69925cda739cca1d2fe0d230fc4871b901f5b files/digest-empathy-0.11 241
-SHA256 b9aa2e08dc8779bf65f3de781dffb700731db5bb3a88365cbf4e4df319fba63b files/digest-empathy-0.11 241
-MD5 fac2cf57113de33a7cd019254b989f9f files/digest-empathy-0.12-r1 241
-RMD160 cb80379bd14f4a52beba16d3dfa766e2af3c7e84 files/digest-empathy-0.12-r1 241
-SHA256 099df1a2ab24929b644901ca4385972f223dd91f39866b145c01870a25ee6d66 files/digest-empathy-0.12-r1 241
-MD5 1609c116ae7566c11f32b9b74498cc31 files/digest-empathy-0.13 241
-RMD160 3f588cdd4ade9d569404c9984710e795af98d5e2 files/digest-empathy-0.13 241
-SHA256 73991a2d6cee5c8e56d7d53694aaf544e3720780ea6c0f8e01ed1f9bb54bfd5c files/digest-empathy-0.13 241
-MD5 4eac8be59ea325cc542020e3416b2a2b files/digest-empathy-0.14 241
-RMD160 a772323248cff714e476e0c20ff866a8b0f79f6b files/digest-empathy-0.14 241
-SHA256 1b6c3a92d60b1033d949cb937a428c046c050de825d939e2b8aee78f231700af files/digest-empathy-0.14 241
 MD5 4eac8be59ea325cc542020e3416b2a2b files/digest-empathy-0.14-r1 241
 RMD160 a772323248cff714e476e0c20ff866a8b0f79f6b files/digest-empathy-0.14-r1 241
 SHA256 1b6c3a92d60b1033d949cb937a428c046c050de825d939e2b8aee78f231700af files/digest-empathy-0.14-r1 241
+MD5 4f62708426179922dde687d6c0babb37 files/digest-empathy-0.21.1 247
+RMD160 2fd0ca3e9ecc33cff4d5b79f27b8635acddc4bb8 files/digest-empathy-0.21.1 247
+SHA256 04e62c2274e325056fd281aa8e833183538dbfa0102c14e6f774d63d3e6eda41 files/digest-empathy-0.21.1 247
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 =					\