Version bump. Translation updates, webkit fix.

Package-Manager: portage-2.2_rc60/cvs/Linux x86_64

3 files changed, 133 insertions, 2 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index fa310a835e56..a73572b2b210 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2009/11/21 09:55:15 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.48 2009/12/21 22:39:37 eva Exp $
+
+*empathy-2.28.2 (21 Dec 2009)
+
+  21 Dec 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +empathy-2.28.2.ebuild:
+  Version bump. Translation updates, webkit fix.
 
 *empathy-2.28.1.2 (21 Nov 2009)
 
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 7f7b6eb43ccb..fafe9469b097 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST empathy-2.24.1.tar.bz2 1761446 RMD160 97e58664c1cf3977806884cc401d679ecca91365 SHA1 7c2b6434d5fd855e887e6ef27300601609706ea5 SHA256 24b675e389fb91898bd2924f8b35db7e7aef4c40bbb69412e445048dd9e18123
 DIST empathy-2.26.2.tar.bz2 2021659 RMD160 58d995c9e616aa5d429dde9fad5861d66a33521f SHA1 d2eb4de3d3efd7728dc28eb16dfe60c64141be70 SHA256 2790502f62056926feeab71681033e5787856f7b56ae0beaa49f89b4763f1b9a
 DIST empathy-2.28.1.1.tar.bz2 2368699 RMD160 b159cd7875810e5934d77fac358a94e57a080f3b SHA1 40d4f32efd0fc0875a90789eb7514c1712d3e0c2 SHA256 113409676b2770da2736c17a8ca58eb012816b3741f02415c3f6bdae5e4b0f09
 DIST empathy-2.28.1.2.tar.bz2 2432256 RMD160 d9e9131e7ed21180ac4e5ecf07016f17b4bfc5c9 SHA1 59569ca129191a2b73c3b7337853c31783275abd SHA256 7af58b5d6c315dd08f7ad519d1aeed545a6c2c99ff1275ad3a442bcf513b7a0d
+DIST empathy-2.28.2.tar.bz2 2432940 RMD160 a306be47d681c5192eb30db91792ac823ef27528 SHA1 712752a7675429215dc92e3f35106b91baa9772b SHA256 8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b
 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 2975 RMD160 a37d380fde792ed3418e88dc07234757c49ba364 SHA1 3894e4ae0dae341ec7cab8632865d6561f2d2643 SHA256 9db23f10016a488a8d3b627cbedaceeef7138422a105d8d202f309b934490d7f
 EBUILD empathy-2.28.1.2.ebuild 2976 RMD160 a649fd6d74115b57f1c6a7898d64530121368ddf SHA1 16e83dbfe8196ab361abcb337b40b7a3e75b08fe SHA256 78e93cc49c23954cf8ed587b397ca65e984026548cf1c9471b9f7d8fa6087f7a
-MISC ChangeLog 8994 RMD160 06988f676bb52b6f86f7f375e84ef23d83dabc77 SHA1 591201f49579fb1c37663ea2b8e02b5e18da9869 SHA256 4f08ea831aa9f193a0ffb1a39478644003ee07776ad12f349277df15500b5dc5
+EBUILD empathy-2.28.2.ebuild 2966 RMD160 0b053f2834881ec77de17479c77947cc50f8109d SHA1 94c0a19c7e2096a8f9dacfb3dde872d3126ed491 SHA256 872b6d3247bba8291801410d9593cbfd88492f407d35f7fe3bdcd77798b11694
+MISC ChangeLog 9151 RMD160 b5428df9b35604cbaae36682ea18d3b6456e0588 SHA1 0ea812ed535b216fa51a3391bb06453400670865 SHA256 05368f9316c8529d63b45176b10d19dfb29e8dc74f2455527e8e051328e4dbae
 MISC metadata.xml 875 RMD160 34c44fbdf7f04c70b4ee8d0a85c4ec6c90cc832d SHA1 15265e3df973d8d6232717a2d5967f15e03851f0 SHA256 31b4ba56cbe74d9625fb7d1dcc90bfa79c91699df872d3dffa51197e2fd31ba6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksv+S8ACgkQ1fmVwcYIWAbxogCcCdkVHL6zXlbaDJ9MWkZamjkP
+CRgAnixL1Hq+44zUqJvircwDuKwTVbV6
+=trPa
+-----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.28.2.ebuild b/net-im/empathy/empathy-2.28.2.ebuild
new file mode 100644
index 000000000000..294036ed8578
--- /dev/null
+++ b/net-im/empathy/empathy-2.28.2.ebuild
@@ -0,0 +1,113 @@
+# 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.2.ebuild,v 1.1 2009/12/21 22:39:37 eva Exp $
+
+EAPI="2"
+
+inherit eutils gnome2 multilib
+
+DESCRIPTION="Telepathy client and library using GTK+"
+HOMEPAGE="http://live.gnome.org/Empathy"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# FIXME: Add location support once geoclue stops being idiotic with automagic deps
+IUSE="applet networkmanager python spell test webkit" # map
+
+# FIXME: libnotify & libcanberra hard deps
+RDEPEND=">=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.16.0
+	>=gnome-base/gconf-2
+	>=dev-libs/dbus-glib-0.51
+	>=gnome-extra/evolution-data-server-1.2
+	>=net-libs/telepathy-glib-0.7.35
+	>=media-libs/libcanberra-0.4[gtk]
+	>=x11-libs/libnotify-0.4.4
+	>=gnome-base/gnome-keyring-2.22
+
+	dev-libs/libunique
+	net-libs/farsight2
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	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 )
+	python? (
+		>=dev-lang/python-2.4.4-r5
+		>=dev-python/pygtk-2 )
+	spell? (
+		app-text/enchant
+		app-text/iso-codes )
+	webkit? ( >=net-libs/webkit-gtk-1.1.7 )
+"
+#	map? (
+#		>=media-libs/libchamplain-0.4[gtk]
+#		>=media-libs/clutter-gtk-0.10:1.0 )
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.17.3
+	>=dev-util/intltool-0.35.0
+	>=dev-util/pkgconfig-0.16
+	test? (
+		sys-apps/grep
+		>=dev-libs/check-0.9.4 )
+	dev-libs/libxslt
+	virtual/python
+"
+PDEPEND=">=net-im/telepathy-mission-control-5"
+
+DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
+
+# FIXME: Highly broken with parallel make, mallard strike 2, see bug #286889
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-maintainer-mode
+		--disable-static
+		--disable-location
+		--disable-gtk-doc
+		--disable-map
+		$(use_enable applet megaphone)
+		$(use_enable applet nothere)
+		$(use_enable debug)
+		$(use_with networkmanager connectivity nm)
+		$(use_enable python)
+		$(use_enable spell)
+		$(use_enable test coding-style-checks)
+		$(use_enable webkit)
+	"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687
+	sed -i "s:-Werror::g" configure || die "sed 1 failed"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "emake check failed."
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libempathy.so.23
+	preserve_old_lib /usr/$(get_libdir)/libempathy-gtk.so.19
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	echo
+	elog "Empathy needs telepathy's connection managers to use any IM protocol."
+	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
+}