Version bump and remove old.

(Portage version: 2.1.3.19)

10 files changed, 18 insertions, 205 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index b3602b5bfee4..bdcc13ac539a 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2007/12/18 12:51:27 coldwind Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.14 2008/01/16 22:11:15 coldwind Exp $
+
+*empathy-0.21.5.2 (16 Jan 2008)
+
+  16 Jan 2008; Santiago M. Mola <coldwind@gentoo.org>
+  -empathy-0.14-r1.ebuild, -empathy-0.21.1.ebuild, -empathy-0.21.2.ebuild,
+  -empathy-0.21.3.ebuild, +empathy-0.21.5.2.ebuild:
+  Version bump and remove old.
 
 *empathy-0.21.4 (18 Dec 2007)
 
diff --git a/net-im/empathy/empathy-0.14-r1.ebuild b/net-im/empathy/empathy-0.14-r1.ebuild
deleted file mode 100644
index 39f15968c829..000000000000
--- a/net-im/empathy/empathy-0.14-r1.ebuild
+++ /dev/null
@@ -1,59 +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.14-r1.ebuild,v 1.1 2007/10/19 17:03:07 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="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-base/gnome-panel
-	spell? ( app-text/aspell )
-	python? ( >=dev-lang/python-2.4.4-r5 )"
-DEPEND="${RDEPEND}
-	>=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-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.1.ebuild b/net-im/empathy/empathy-0.21.1.ebuild
deleted file mode 100644
index e4f159e24155..000000000000
--- a/net-im/empathy/empathy-0.21.1.ebuild
+++ /dev/null
@@ -1,61 +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.21.1.ebuild,v 1.1 2007/10/29 00:54:20 coldwind Exp $
-
-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}/${MAJOR_V}/${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.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.37
-	>=x11-libs/gtk+-2.12.0
-	>=gnome-base/gnome-vfs-2
-	>=gnome-extra/evolution-data-server-1.2
-	gnome-base/gnome-panel
-	spell? ( app-text/aspell )
-	python? ( >=dev-lang/python-2.4.4-r5 )"
-DEPEND="${RDEPEND}
-	>=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-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.2.ebuild b/net-im/empathy/empathy-0.21.2.ebuild
deleted file mode 100644
index 5d11017b0335..000000000000
--- a/net-im/empathy/empathy-0.21.2.ebuild
+++ /dev/null
@@ -1,66 +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.21.2.ebuild,v 1.2 2007/12/04 15:40:14 leio Exp $
-
-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}/${MAJOR_V}/${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.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.0.57
-	>=net-im/telepathy-mission-control-4.37
-	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.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-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.3.ebuild b/net-im/empathy/empathy-0.21.5.2.ebuild
index f54853cddc31..6922cb4d2f1e 100644
--- a/net-im/empathy/empathy-0.21.3.ebuild
+++ b/net-im/empathy/empathy-0.21.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.3.ebuild,v 1.1 2007/12/04 15:40:14 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-0.21.5.2.ebuild,v 1.1 2008/01/16 22:11:15 coldwind Exp $
 
 inherit gnome2 eutils versionator
 
@@ -13,7 +13,7 @@ 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"
+IUSE="python spell test"
 
 RDEPEND=">=dev-libs/dbus-glib-0.51
 	>=dev-libs/glib-2.14.0
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.51
 	>=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.37
+	>=net-im/telepathy-mission-control-4.55
 	dev-libs/libxml2
 	>=gnome-base/gnome-vfs-2
 	>=gnome-extra/evolution-data-server-1.2
@@ -35,7 +35,8 @@ RDEPEND=">=dev-libs/dbus-glib-0.51
 		>=dev-python/pygtk-2 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.16"
+	>=dev-util/pkgconfig-0.16
+	test? ( >=dev-libs/check-0.9.4 )"
 
 DOCS="CONTRIBUTORS AUTHORS README"
 
diff --git a/net-im/empathy/files/digest-empathy-0.14-r1 b/net-im/empathy/files/digest-empathy-0.14-r1
deleted file mode 100644
index be1d03be9e3f..000000000000
--- a/net-im/empathy/files/digest-empathy-0.14-r1
+++ /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
deleted file mode 100644
index b04b438df842..000000000000
--- a/net-im/empathy/files/digest-empathy-0.21.1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-empathy-0.21.2 b/net-im/empathy/files/digest-empathy-0.21.2
deleted file mode 100644
index 8f8adf1f2232..000000000000
--- a/net-im/empathy/files/digest-empathy-0.21.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c7951d16d843f64a73ea475797308c64 empathy-0.21.2.tar.bz2 988179
-RMD160 1b6826465d16ce6cd2a790b6a52d125cc55e27ab empathy-0.21.2.tar.bz2 988179
-SHA256 deec24234edb4b6cf856de061c50e5482fc34788a2efc772853e71dd948fa092 empathy-0.21.2.tar.bz2 988179
diff --git a/net-im/empathy/files/digest-empathy-0.21.3 b/net-im/empathy/files/digest-empathy-0.21.3
deleted file mode 100644
index 1fdcdedcdeb3..000000000000
--- a/net-im/empathy/files/digest-empathy-0.21.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4beeb0fc1eab0a6f733d4a9f4165064e empathy-0.21.3.tar.bz2 1015791
-RMD160 8471d9101fb4b47e1d34896ffc1d049be35261bf empathy-0.21.3.tar.bz2 1015791
-SHA256 c956d9fba73358c1434815323bdb6d4f1acc87282ec6b65bc614787f3f910f22 empathy-0.21.3.tar.bz2 1015791
diff --git a/net-im/empathy/files/digest-empathy-0.21.5.2 b/net-im/empathy/files/digest-empathy-0.21.5.2
new file mode 100644
index 000000000000..6bd21bb173ef
--- /dev/null
+++ b/net-im/empathy/files/digest-empathy-0.21.5.2
@@ -0,0 +1,3 @@
+MD5 d9eb1d4ffc292b9bb83d0854b5a89515 empathy-0.21.5.2.tar.bz2 1184067
+RMD160 cace4735218448079cc7e3301c0169b49749d56c empathy-0.21.5.2.tar.bz2 1184067
+SHA256 1f0bd5dfc7133b966859d3ae5371e23b20cf8ec299e90da86da7e9bc7e11f9c1 empathy-0.21.5.2.tar.bz2 1184067