diff options
| -rw-r--r-- | net-im/empathy/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/empathy/empathy-2.24.1.ebuild | 69 | ||||
| -rw-r--r-- | net-im/empathy/empathy-2.26.2.ebuild | 93 | ||||
| -rw-r--r-- | net-im/empathy/empathy-2.30.2.ebuild | 3 |
4 files changed, 6 insertions, 165 deletions
diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog index 79239066dcd5..10360c5da8d7 100644 --- a/net-im/empathy/ChangeLog +++ b/net-im/empathy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/empathy # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.61 2010/08/01 11:53:09 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.62 2010/08/22 20:40:11 eva Exp $ + + 22 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org> + -empathy-2.24.1.ebuild, -empathy-2.26.2.ebuild, empathy-2.30.2.ebuild: + Clean up old revisions. 01 Aug 2010; Christian Faulhammer <fauli@gentoo.org> empathy-2.30.2.ebuild: diff --git a/net-im/empathy/empathy-2.24.1.ebuild b/net-im/empathy/empathy-2.24.1.ebuild deleted file mode 100644 index 5d9cffc3692c..000000000000 --- a/net-im/empathy/empathy-2.24.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.24.1.ebuild,v 1.6 2010/01/05 04:38:50 josejx Exp $ - -inherit gnome2 - -DESCRIPTION="Telepathy client and library using GTK+" -HOMEPAGE="http://live.gnome.org/Empathy" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="applet python spell test" - -RDEPEND=">=dev-libs/dbus-glib-0.51 - >=dev-libs/glib-2.16.0 - >=x11-libs/gtk+-2.12.0 - >=gnome-base/gconf-2 - >=gnome-base/libglade-2 - applet? ( >=gnome-base/gnome-panel-2.10 ) - >=net-libs/telepathy-glib-0.7.7 - >=net-im/telepathy-mission-control-4.61 - =net-im/telepathy-mission-control-4* - dev-libs/libxml2 - >=gnome-extra/evolution-data-server-1.2 - spell? ( - app-text/enchant - app-text/iso-codes ) - python? ( - >=dev-lang/python-2.4.4-r5 - >=dev-python/pygtk-2 )" -DEPEND="${RDEPEND} - app-text/gnome-doc-utils - >=dev-util/intltool-0.35.0 - >=dev-util/pkgconfig-0.16 - test? ( >=dev-libs/check-0.9.4 ) - dev-libs/libxslt - virtual/python" - -DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" - -pkg_setup() { - G2CONF="$(use_enable debug) - $(use_enable spell) - $(use_enable python) - $(use_enable applet megaphone) - $(use_enable applet nothere) - --disable-gtk-doc" -} - -src_unpack() { - gnome2_src_unpack - - # Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687 - sed -i "s:-Werror::g" configure || die "sed failed" -} - -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 - elog "Additionally, you will need >=net-voip/telepathy-stream-engine-0.5.0" - elog "if you want any voip functionality." -} diff --git a/net-im/empathy/empathy-2.26.2.ebuild b/net-im/empathy/empathy-2.26.2.ebuild deleted file mode 100644 index 886faf9ce0dd..000000000000 --- a/net-im/empathy/empathy-2.26.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.26.2.ebuild,v 1.6 2010/02/19 19:33:27 armin76 Exp $ - -EAPI="2" - -inherit eutils gnome2 - -DESCRIPTION="Telepathy client and library using GTK+" -HOMEPAGE="http://live.gnome.org/Empathy" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="applet doc python spell test" - -# FIXME: libnotify & libcanberra hard deps -RDEPEND=">=dev-libs/glib-2.16.0 - >=x11-libs/gtk+-2.14.0 - >=gnome-base/gconf-2 - >=gnome-base/libglade-2 - >=dev-libs/dbus-glib-0.51 - >=gnome-extra/evolution-data-server-1.2 - >=net-libs/telepathy-glib-0.7.23 - >=net-im/telepathy-mission-control-4.61 - =net-im/telepathy-mission-control-4* - media-libs/libcanberra[gtk] - >=x11-libs/libnotify-0.4.4 - - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - net-libs/telepathy-farsight - dev-libs/libxml2 - - applet? ( >=gnome-base/gnome-panel-2.10 ) - spell? ( - app-text/enchant - app-text/iso-codes ) - python? ( - >=dev-lang/python-2.4.4-r5 - >=dev-python/pygtk-2 )" -DEPEND="${RDEPEND} - app-text/scrollkeeper - app-text/gnome-doc-utils - >=dev-util/intltool-0.35.0 - >=dev-util/pkgconfig-0.16 - test? ( >=dev-libs/check-0.9.4 ) - dev-libs/libxslt - virtual/python - doc? ( >=dev-util/gtk-doc-1.3 )" - -DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README" - -# FIXME: Tests are broken, upstream bug #576785 -RESTRICT="test" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-static - $(use_enable debug) - $(use_enable spell) - $(use_enable python) - $(use_enable applet megaphone) - $(use_enable applet nothere)" -} - -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" - - # FIXME: report upstream their package is broken - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed 2 failed" -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - emake check || die "emake check failed." -} - -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 -} diff --git a/net-im/empathy/empathy-2.30.2.ebuild b/net-im/empathy/empathy-2.30.2.ebuild index 8d35eda871a1..06d648013ea6 100644 --- a/net-im/empathy/empathy-2.30.2.ebuild +++ b/net-im/empathy/empathy-2.30.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.2.ebuild,v 1.3 2010/08/01 11:53:09 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.2.ebuild,v 1.4 2010/08/22 20:40:11 eva Exp $ EAPI="2" @@ -38,7 +38,6 @@ RDEPEND=">=dev-libs/glib-2.22.0 nautilus? ( || ( >=gnome-extra/nautilus-sendto-2.28.1[-empathy] >=gnome-extra/nautilus-sendto-2.28.4-r1 ) ) - networkmanager? ( >=net-misc/networkmanager-0.7 ) spell? ( app-text/enchant |