[gentoo-commits] gentoo-x86 commit in net-im/empathy: metadata.xml ChangeLog empathy-2.28.1.1.ebuild empathy-2.26.1.ebuild

[Gilles Dartiguelongue (eva)]

eva         09/10/30 16:43:44

  Modified:             metadata.xml ChangeLog
  Added:                empathy-2.28.1.1.ebuild
  Removed:              empathy-2.26.1.ebuild
  Log:
  New version for GNOME 2.28. Clean up old revision.
  (Portage version: 2.2_rc46/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  net-im/empathy/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/metadata.xml?r1=1.4&r2=1.5

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml	25 Oct 2009 17:13:32 -0000	1.4
+++ metadata.xml	30 Oct 2009 16:43:43 -0000	1.5
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
-  <herd>gnome</herd>
-  <use>
-    <flag name="applet">Enable Empathy's applets for
-  <pkg>gnome-base/gnome-panel</pkg>.</flag>
-  </use>
+<herd>net-im</herd>
+<maintainer>
+  <email>coldwind@g.o</email>
+  <name>Santiago M. Mola</name>
+</maintainer>
+<herd>gnome</herd>
+<use>
+  <flag name="applet">Enable Empathy's applets for <pkg>gnome-base/gnome-panel</pkg></flag>
+  <flag name="webkit">Build support for Adium-style HTML-based conversation
+	  window themes using <pkg>net-libs/webkit-gtk</pkg></flag>
+</use>
   <longdescription>Empathy consists of a rich set of reusable instant messaging
   widgets, and a GNOME client using those widgets. It uses Telepathy and Nokia's
   Mission Control, and reuses Gossip's UI. The main goal is to permit desktop



1.44                 net-im/empathy/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	25 Oct 2009 17:13:32 -0000	1.43
+++ ChangeLog	30 Oct 2009 16:43:43 -0000	1.44
@@ -1,6 +1,13 @@
 # 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.43 2009/10/25 17:13:32 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.44 2009/10/30 16:43:43 eva Exp $
+
+*empathy-2.28.1.1 (30 Oct 2009)
+
+  30 Oct 2009; Gilles Dartiguelongue <eva@g.o>
+  -empathy-2.26.1.ebuild, -files/empathy-2.26.1-fix-doc.patch,
+  +empathy-2.28.1.1.ebuild, metadata.xml:
+  New version for GNOME 2.28. Clean up old revision.
 
   25 Oct 2009; Torsten Veller <tove@g.o> metadata.xml:
   Remove coldwind from metadata.xml (#181764)



1.1                  net-im/empathy/empathy-2.28.1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.1.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/empathy/empathy-2.28.1.1.ebuild?rev=1.1&content-type=text/plain

Index: empathy-2.28.1.1.ebuild
===================================================================
# 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 $

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 doc 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

	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
	doc? ( >=dev-util/gtk-doc-1.3 )
"
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
		$(use_enable applet megaphone)
		$(use_enable applet nothere)
		$(use_enable debug)
		$(use_with networkmanager connectivity nm)
		$(use_enable map)
		$(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 "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
	preserve_old_lib_notify /usr/$(get_libdir)/libempathy.so.23
	preserve_old_lib_notify /usr/$(get_libdir)/libempathy-gtk.so.19
}