Version bump and correct some dependencies

Package-Manager: portage-2.1.4_rc7

5 files changed, 104 insertions, 15 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index e003f7cd7454..593abd5fadc6 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2007/11/21 15:07:06 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.12 2007/12/04 15:40:14 leio Exp $
+
+*empathy-0.21.3 (04 Dec 2007)
+
+  04 Dec 2007; Mart Raudsepp <leio@gentoo.org> empathy-0.21.2.ebuild,
+  +empathy-0.21.3.ebuild:
+  Version bump and correct some dependencies
 
 *empathy-0.21.2 (21 Nov 2007)
 
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 0f71b133728f..29d8b8ff7265 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,6 +1,7 @@
 DIST empathy-0.14.tar.bz2 962028 RMD160 b329d12cd6e8f60ff09562507d8bf928872f1cd4 SHA1 cc5a17d8f42c17879bd5804136f2dbbbc24ecf37 SHA256 170d61f1387221b3034a777eb835d5b85d23ddb58d4d81ac42480e4e9ea138a6
 DIST empathy-0.21.1.tar.bz2 984148 RMD160 c36d8a8bb2cd39712dd8e62ea894e2dbef41277b SHA1 cf808c5c0e270d254b4d840a64588864e22cdd23 SHA256 659fe97f4004aa839ed8afc37f89d5d1e164391a62c31716527d50963ae9ca74
 DIST empathy-0.21.2.tar.bz2 988179 RMD160 1b6826465d16ce6cd2a790b6a52d125cc55e27ab SHA1 afd4d7e42bc947db3216cbea8b681b94fee881a7 SHA256 deec24234edb4b6cf856de061c50e5482fc34788a2efc772853e71dd948fa092
+DIST empathy-0.21.3.tar.bz2 1015791 RMD160 8471d9101fb4b47e1d34896ffc1d049be35261bf SHA1 887b72b5cd569c17ae8846c9e5e4fd1b12710a02 SHA256 c956d9fba73358c1434815323bdb6d4f1acc87282ec6b65bc614787f3f910f22
 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
@@ -9,14 +10,18 @@ EBUILD empathy-0.21.1.ebuild 1681 RMD160 e04a461c012b18330651331eb370f47476548e3
 MD5 c7ec44fcf3d0304222a45c34de065259 empathy-0.21.1.ebuild 1681
 RMD160 e04a461c012b18330651331eb370f47476548e37 empathy-0.21.1.ebuild 1681
 SHA256 cc80095502a405e8f6950bd732569ca0112273f7d6e556596b17cbf4c267e984 empathy-0.21.1.ebuild 1681
-EBUILD empathy-0.21.2.ebuild 1677 RMD160 5feb62c695c6660a0e2d3622fa2084a108269a76 SHA1 9d0ace965599373c8fc810963bbe83f9615349c5 SHA256 586ae19183f92385ab12d571f23199a24f9a14b585905f7e89a9da7a89d7c784
-MD5 19d5eae9a2c9cbff9e3fc52abe6588ef empathy-0.21.2.ebuild 1677
-RMD160 5feb62c695c6660a0e2d3622fa2084a108269a76 empathy-0.21.2.ebuild 1677
-SHA256 586ae19183f92385ab12d571f23199a24f9a14b585905f7e89a9da7a89d7c784 empathy-0.21.2.ebuild 1677
-MISC ChangeLog 2028 RMD160 fb1da5fa75bc4ba7172e8f9d854881901281e0f8 SHA1 5fbecdc86b9847170ac74a7d34d4dc60c29d589a SHA256 fc9fbdd294ec887e55ad298719cde8258d173dc8f5d5878d6b89c62b89b73971
-MD5 c9a33d34c8873e14957a7c0f0efc8b96 ChangeLog 2028
-RMD160 fb1da5fa75bc4ba7172e8f9d854881901281e0f8 ChangeLog 2028
-SHA256 fc9fbdd294ec887e55ad298719cde8258d173dc8f5d5878d6b89c62b89b73971 ChangeLog 2028
+EBUILD empathy-0.21.2.ebuild 1760 RMD160 544566a842e516469df07be8814e3c3ee59f58c4 SHA1 fe81c51da73ca3b6db4d88268b6cc88cab3c7aaf SHA256 c4d76f9d243a7cc15614f82b82a32ed4b58ceb04749c51734e3209cd4e1fb1f4
+MD5 a87f2954922a5c265a64165f8d7b1a7d empathy-0.21.2.ebuild 1760
+RMD160 544566a842e516469df07be8814e3c3ee59f58c4 empathy-0.21.2.ebuild 1760
+SHA256 c4d76f9d243a7cc15614f82b82a32ed4b58ceb04749c51734e3209cd4e1fb1f4 empathy-0.21.2.ebuild 1760
+EBUILD empathy-0.21.3.ebuild 1790 RMD160 30c17b68abb6291f485a8858ad6e2ce15cd7e031 SHA1 35075a2c13cc9adc30a7124d6b54d7158d9f565f SHA256 e31d69b2d42d119d6edf72c85c7497d19f7f3013dadbb1242eba8db979335734
+MD5 89106e52e22d5cce2517e120890d3066 empathy-0.21.3.ebuild 1790
+RMD160 30c17b68abb6291f485a8858ad6e2ce15cd7e031 empathy-0.21.3.ebuild 1790
+SHA256 e31d69b2d42d119d6edf72c85c7497d19f7f3013dadbb1242eba8db979335734 empathy-0.21.3.ebuild 1790
+MISC ChangeLog 2201 RMD160 eefd9f84d548af5ea58deefed9d2c69b115f494c SHA1 1421fc2c6b9b64e1efbf9731b052ff3651810e75 SHA256 3bff78c1bb95db4d643b79ec9b622e3eba6f817245ac2e461a33019bc74c9862
+MD5 3fa0a5ad90e01e421264ed48d5cde8dc ChangeLog 2201
+RMD160 eefd9f84d548af5ea58deefed9d2c69b115f494c ChangeLog 2201
+SHA256 3bff78c1bb95db4d643b79ec9b622e3eba6f817245ac2e461a33019bc74c9862 ChangeLog 2201
 MISC metadata.xml 729 RMD160 dd581bc64d5b187d87bbea2988d5f2c7287242e5 SHA1 ffb1c02ad248ccc8989a5dfc89dcdcb9830e4253 SHA256 11f4e97190814131cd468f13251fdc8089893c772aaea9292ca7b09d23b40808
 MD5 3e4b52f0f2b901b1a2e90e7e8028d3c7 metadata.xml 729
 RMD160 dd581bc64d5b187d87bbea2988d5f2c7287242e5 metadata.xml 729
@@ -30,3 +35,6 @@ SHA256 04e62c2274e325056fd281aa8e833183538dbfa0102c14e6f774d63d3e6eda41 files/di
 MD5 701fd121520c7f36003c9400f5631ab6 files/digest-empathy-0.21.2 247
 RMD160 5e238a8c85119df7c120e9d558e24df0e29dc7d3 files/digest-empathy-0.21.2 247
 SHA256 dc1378b3ce08cd9412a9d53ed2e872f82d4e35059309d9533870eb82ff5142d6 files/digest-empathy-0.21.2 247
+MD5 6b2ee4d6a50e347f9eb3773c22e04ce2 files/digest-empathy-0.21.3 250
+RMD160 23ef2fe55ba901ed76ec05292273436b9f8028f2 files/digest-empathy-0.21.3 250
+SHA256 1fd376818c81aead6aca516f79a238280a55690a1a504012ef9af4bf5b3b15e8 files/digest-empathy-0.21.3 250
diff --git a/net-im/empathy/empathy-0.21.2.ebuild b/net-im/empathy/empathy-0.21.2.ebuild
index e78948d97b0c..5d11017b0335 100644
--- a/net-im/empathy/empathy-0.21.2.ebuild
+++ b/net-im/empathy/empathy-0.21.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2007/11/21 15:07:06 leio Exp $
+# $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
 
@@ -17,18 +17,23 @@ IUSE="python spell"
 
 RDEPEND=">=dev-libs/dbus-glib-0.51
 	>=dev-libs/glib-2.14.0
-	dev-libs/libxml2
+	>=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
-	>=x11-libs/gtk+-2.12.0
+	dev-libs/libxml2
 	>=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 )"
+	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"
diff --git a/net-im/empathy/empathy-0.21.3.ebuild b/net-im/empathy/empathy-0.21.3.ebuild
new file mode 100644
index 000000000000..f54853cddc31
--- /dev/null
+++ b/net-im/empathy/empathy-0.21.3.ebuild
@@ -0,0 +1,67 @@
+# 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.3.ebuild,v 1.1 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.3.1
+	>=net-libs/telepathy-glib-0.7.0
+	>=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.16"
+
+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/files/digest-empathy-0.21.3 b/net-im/empathy/files/digest-empathy-0.21.3
new file mode 100644
index 000000000000..1fdcdedcdeb3
--- /dev/null
+++ b/net-im/empathy/files/digest-empathy-0.21.3
@@ -0,0 +1,3 @@
+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