Remove gtk-doc rebuild, it wont work without geoclue. Add dep on the net-voip/telepathy-connection-managers metapackage

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 16 insertions, 15 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 8b416aba62e1..825c012b7acc 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.44 2009/10/30 16:43:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.45 2009/11/01 16:38:25 tester Exp $
+
+  01 Nov 2009; Olivier Crête <tester@gentoo.org> empathy-2.28.1.1.ebuild:
+  Remove gtk-doc rebuild, it wont work without geoclue. Add dep on the
+  net-voip/telepathy-connection-managers metapackage
 
 *empathy-2.28.1.1 (30 Oct 2009)
 
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 6df18d609761..2303da05e3fe 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -6,13 +6,13 @@ DIST empathy-2.26.2.tar.bz2 2021659 RMD160 58d995c9e616aa5d429dde9fad5861d66a335
 DIST empathy-2.28.1.1.tar.bz2 2368699 RMD160 b159cd7875810e5934d77fac358a94e57a080f3b SHA1 40d4f32efd0fc0875a90789eb7514c1712d3e0c2 SHA256 113409676b2770da2736c17a8ca58eb012816b3741f02415c3f6bdae5e4b0f09
 EBUILD empathy-2.24.1.ebuild 1894 RMD160 a8240bdc8e7f59ecd929b38880f69b8c86ffbb56 SHA1 c835ea642a5e1dd6fbc89cd50ff38a4c087c637a SHA256 071e806e9f1fbd3e3c49d6a8361157ab2f483477c0c97be9e9786a343dc9d499
 EBUILD empathy-2.26.2.ebuild 2439 RMD160 0f26af410c1cb556f61a810dd3634d14ad9d22e5 SHA1 8906c62e8c86d31ae4bb8c7f321d2c93238fb36f SHA256 9cf6bfa07670dfb5aa778bf745958beeb855e7a7ce386184d23cfa43cabaf10b
-EBUILD empathy-2.28.1.1.ebuild 3104 RMD160 c6981c48f805e19322868b9b8de028b6f5eef6f7 SHA1 3c129c4bc20e4c187a955aaec800775d29df997e SHA256 f2f97dd038c50d350566ce9788e3f54afbb8c4c0e63052cf742638e40bf2504a
-MISC ChangeLog 8556 RMD160 f1a4f18cf862139d46c7ce8e0eb485595c6977d5 SHA1 e38e409462c334ecea67c5fcdf5fa0c9b18514b4 SHA256 63ae6bbbf0ffec598892a856308dcad198e536e710be35ddb7310d72c70f72a5
+EBUILD empathy-2.28.1.1.ebuild 2975 RMD160 a37d380fde792ed3418e88dc07234757c49ba364 SHA1 3894e4ae0dae341ec7cab8632865d6561f2d2643 SHA256 9db23f10016a488a8d3b627cbedaceeef7138422a105d8d202f309b934490d7f
+MISC ChangeLog 8759 RMD160 209db64d218349f770c7c3d1ef71df58f09504de SHA1 5d87fef232b0f3b5af9a1fe534b59f2f4d991692 SHA256 417f79172fb2e368f0a7d0dd229c4f021bb1a5b8e5c814665c2883431de8fbf6
 MISC metadata.xml 971 RMD160 846ef9136f5693f0ac661308fbf380face1f21a7 SHA1 7f17016a5d13b7bdf8d8005143c9344d2c0cd632 SHA256 22c0fb6bfd33894b3666fe6a938584662df2615f5f90510c508f09d2000c059c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrrF88ACgkQ1fmVwcYIWAZsrQCgkd4JcxNrdxxu8k4lhgvCLEGW
-HI0An0IMw5ObKl0HOdIDo/2XvCHsSGJv
-=9hwI
+iEYEARECAAYFAkrtuYcACgkQmOfEJZHYOKfVZQCgnPAcYgewB0g0SVOFksrBqYDC
+ZIcAnRC0zWD3ZVmvotpg+JVoFzyD41sR
+=o07T
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.28.1.1.ebuild b/net-im/empathy/empathy-2.28.1.1.ebuild
index 3f7223e32a69..daafdf669135 100644
--- a/net-im/empathy/empathy-2.28.1.1.ebuild
+++ b/net-im/empathy/empathy-2.28.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.1.1.ebuild,v 1.1 2009/10/30 16:43:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.1.1.ebuild,v 1.2 2009/11/01 16:38:25 tester Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="applet doc networkmanager python spell test webkit" # map
+IUSE="applet networkmanager python spell test webkit" # map
 
 # FIXME: libnotify & libcanberra hard deps
 RDEPEND=">=dev-libs/glib-2.16.0
@@ -33,6 +33,7 @@ RDEPEND=">=dev-libs/glib-2.16.0
 	net-libs/telepathy-farsight
 	dev-libs/libxml2
 	x11-libs/libX11
+	net-voip/telepathy-connection-managers
 
 	applet? ( >=gnome-base/gnome-panel-2.10 )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
@@ -57,7 +58,6 @@ DEPEND="${RDEPEND}
 		>=dev-libs/check-0.9.4 )
 	dev-libs/libxslt
 	virtual/python
-	doc? ( >=dev-util/gtk-doc-1.3 )
 "
 PDEPEND=">=net-im/telepathy-mission-control-5"
 
@@ -71,6 +71,7 @@ pkg_setup() {
 		--disable-maintainer-mode
 		--disable-static
 		--disable-location
+		--disable-gtk-doc
 		$(use_enable applet megaphone)
 		$(use_enable applet nothere)
 		$(use_enable debug)
@@ -105,12 +106,8 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 	echo
 	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "You will 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"
-	elog "Link-local XMPP: net-irc/telepathy-salut"
-	echo
+	elog "See the USE flags on net-voip/telepathy-connection-managers"
+	elog "to install them."
 	preserve_old_lib_notify /usr/$(get_libdir)/libempathy.so.23
 	preserve_old_lib_notify /usr/$(get_libdir)/libempathy-gtk.so.19
 }