diff options
author | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-21 23:13:18 +0000 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-03-21 23:13:18 +0000 |
commit | f98b5b1b7aee9f7555420e126d9b08813ab8244b (patch) | |
tree | f9c50de1b0d2319b7a23555e335dceeab9891cb8 /net-im | |
parent | Fixes bug 359713 (diff) | |
download | gentoo-2-f98b5b1b7aee9f7555420e126d9b08813ab8244b.tar.gz gentoo-2-f98b5b1b7aee9f7555420e126d9b08813ab8244b.tar.bz2 gentoo-2-f98b5b1b7aee9f7555420e126d9b08813ab8244b.zip |
Fix slot-deps on gnome libs
(Portage version: 2.1.9.44/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/empathy/ChangeLog | 6 | ||||
-rw-r--r-- | net-im/empathy/empathy-2.30.2.ebuild | 8 | ||||
-rw-r--r-- | net-im/empathy/empathy-2.30.3.ebuild | 100 | ||||
-rw-r--r-- | net-im/empathy/empathy-2.32.2.ebuild | 8 | ||||
-rw-r--r-- | net-im/empathy/empathy-2.33.2.ebuild | 4 |
5 files changed, 15 insertions, 111 deletions
diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog index 9a2c53715dca..381498210b11 100644 --- a/net-im/empathy/ChangeLog +++ b/net-im/empathy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/empathy # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.79 2011/03/12 21:27:23 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.80 2011/03/21 23:13:18 nirbheek Exp $ + + 21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> empathy-2.30.2.ebuild, + -empathy-2.30.3.ebuild, empathy-2.32.2.ebuild, empathy-2.33.2.ebuild: + Fix slot-deps on gnome libs 12 Mar 2011; Raúl Porcel <armin76@gentoo.org> empathy-2.32.2.ebuild: alpha stable wrt #353436 diff --git a/net-im/empathy/empathy-2.30.2.ebuild b/net-im/empathy/empathy-2.30.2.ebuild index 641c6cfc34c8..f966cd5af127 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-2011 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.8 2011/03/02 20:00:15 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.2.ebuild,v 1.9 2011/03/21 23:13:18 nirbheek Exp $ EAPI="2" @@ -18,7 +18,7 @@ IUSE="nautilus networkmanager spell test webkit" # map # FIXME: libnotify & libcanberra hard deps RDEPEND="dev-libs/glib:2 x11-libs/gtk+:2 - >=gnome-base/gconf-2 + >=gnome-base/gconf-2:2 >=dev-libs/dbus-glib-0.51 >=gnome-extra/evolution-data-server-1.2 >=net-libs/telepathy-glib-0.9.2 @@ -31,7 +31,7 @@ RDEPEND="dev-libs/glib:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 net-libs/telepathy-farsight - dev-libs/libxml2 + dev-libs/libxml2:2 x11-libs/libX11 net-voip/telepathy-connection-managers @@ -42,7 +42,7 @@ RDEPEND="dev-libs/glib:2 spell? ( app-text/enchant app-text/iso-codes ) - webkit? ( >=net-libs/webkit-gtk-1.1.15 )" + webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )" # Upstream says not to ship this, or use this. It is also buggy. # tpl? ( >=net-im/telepathy-logger-0.1.1 ) # map? ( diff --git a/net-im/empathy/empathy-2.30.3.ebuild b/net-im/empathy/empathy-2.30.3.ebuild deleted file mode 100644 index be6fc1a1f668..000000000000 --- a/net-im/empathy/empathy-2.30.3.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.30.3.ebuild,v 1.4 2011/03/02 20:00:15 signals Exp $ - -EAPI="2" - -inherit gnome2 multilib - -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" -# FIXME: Add location support once geoclue stops being idiotic with automagic deps -IUSE="nautilus networkmanager spell test webkit" # map - -# FIXME: libnotify & libcanberra hard deps -# gst-plugins-bad is required for the valve plugin. This should move to good -# eventually at which point the dep can be dropped -RDEPEND="dev-libs/glib:2 - x11-libs/gtk+:2 - >=gnome-base/gconf-2 - >=dev-libs/dbus-glib-0.51 - >=gnome-extra/evolution-data-server-1.2 - >=net-libs/telepathy-glib-0.9.2 - >=media-libs/libcanberra-0.4[gtk] - >=x11-libs/libnotify-0.4.4 - >=gnome-base/gnome-keyring-2.22 - - >=dev-libs/libunique-1.1.6:1 - net-libs/farsight2 - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 - media-libs/gst-plugins-bad - media-plugins/gst-plugins-gconf - net-libs/telepathy-farsight - dev-libs/libxml2 - x11-libs/libX11 - net-voip/telepathy-connection-managers - - 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 - app-text/iso-codes ) - webkit? ( >=net-libs/webkit-gtk-1.1.15 )" -# Upstream says not to ship this, or use this. It is also buggy. -# tpl? ( >=net-im/telepathy-logger-0.1.1 ) -# map? ( -# >=media-libs/libchamplain-0.4[gtk] -# >=media-libs/clutter-gtk-0.10:0.10 ) -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" - -pkg_setup() { - # Hard disable favourite_contacts and tpl, TpLogger is buggy. - G2CONF="${G2CONF} - --disable-maintainer-mode - --disable-static - --disable-location - --disable-map - --disable-control-center-embedding - --disable-Werror - --disable-favourite_contacts - --disable-tpl - $(use_enable debug) - $(use_enable nautilus nautilus-sendto) - $(use_with networkmanager connectivity nm) - $(use_enable spell) - $(use_enable test coding-style-checks) - $(use_enable webkit)" -} - -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 "See the USE flags on net-voip/telepathy-connection-managers" - elog "to install them." -} diff --git a/net-im/empathy/empathy-2.32.2.ebuild b/net-im/empathy/empathy-2.32.2.ebuild index 34d144bfd98b..48d5bbbd1446 100644 --- a/net-im/empathy/empathy-2.32.2.ebuild +++ b/net-im/empathy/empathy-2.32.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.12 2011/03/12 21:27:23 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.32.2.ebuild,v 1.13 2011/03/21 23:13:18 nirbheek Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -36,9 +36,9 @@ RDEPEND=">=dev-libs/glib-2.25.9:2 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 media-libs/gst-plugins-bad - media-plugins/gst-plugins-gconf + media-plugins/gst-plugins-gconf:0.10 >=net-libs/telepathy-farsight-0.0.14 - dev-libs/libxml2 + dev-libs/libxml2:2 x11-libs/libX11 net-voip/telepathy-connection-managers >=net-im/telepathy-logger-0.1.5 @@ -50,7 +50,7 @@ RDEPEND=">=dev-libs/glib-2.25.9:2 spell? ( >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) - webkit? ( >=net-libs/webkit-gtk-1.1.15 )" + webkit? ( >=net-libs/webkit-gtk-1.1.15:2 )" # map? ( # >=media-libs/libchamplain-0.7.1[gtk] # >=media-libs/clutter-gtk-0.10:0.10 ) diff --git a/net-im/empathy/empathy-2.33.2.ebuild b/net-im/empathy/empathy-2.33.2.ebuild index 36d9efec0258..ef6b4e19c521 100644 --- a/net-im/empathy/empathy-2.33.2.ebuild +++ b/net-im/empathy/empathy-2.33.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.33.2.ebuild,v 1.1 2011/02/27 17:28:32 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.33.2.ebuild,v 1.2 2011/03/21 23:13:18 nirbheek Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -51,7 +51,7 @@ RDEPEND=">=dev-libs/glib-2.27.2:2 spell? ( >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) - webkit? ( >=net-libs/webkit-gtk-1.1.15 ) + webkit? ( >=net-libs/webkit-gtk-1.1.15:2 ) " DEPEND="${RDEPEND} app-text/scrollkeeper |