From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DAC94138010 for ; Sun, 9 Sep 2012 12:43:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D8AEE0417; Sun, 9 Sep 2012 12:43:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1BF42E0417 for ; Sun, 9 Sep 2012 12:43:32 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4DED833C9F6 for ; Sun, 9 Sep 2012 12:43:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 50B49E5443 for ; Sun, 9 Sep 2012 12:43:29 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1347192667.e3cafc570842c9d002f18910aee4612b8b1cdf01.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-im/empathy/ X-VCS-Repository: proj/gnome X-VCS-Files: net-im/empathy/empathy-3.5.91.1.ebuild net-im/empathy/empathy-9999.ebuild X-VCS-Directories: net-im/empathy/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: e3cafc570842c9d002f18910aee4612b8b1cdf01 X-VCS-Branch: master Date: Sun, 9 Sep 2012 12:43:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 81099a8e-f497-40bd-bc7a-5bf85aaec3fe X-Archives-Hash: dd1c0ca3340e55d4f55f6313e05cbfbd commit: e3cafc570842c9d002f18910aee4612b8b1cdf01 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sun Sep 9 06:06:53 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sun Sep 9 12:11:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e3cafc57 Add net-im/empathy-3.5.91.1 --- ...empathy-9999.ebuild => empathy-3.5.91.1.ebuild} | 45 +++++++------------ net-im/empathy/empathy-9999.ebuild | 45 +++++++------------ 2 files changed, 34 insertions(+), 56 deletions(-) diff --git a/net-im/empathy/empathy-9999.ebuild b/net-im/empathy/empathy-3.5.91.1.ebuild similarity index 75% copy from net-im/empathy/empathy-9999.ebuild copy to net-im/empathy/empathy-3.5.91.1.ebuild index 99f45fb..448f42f 100644 --- a/net-im/empathy/empathy-9999.ebuild +++ b/net-im/empathy/empathy-3.5.91.1.ebuild @@ -17,54 +17,50 @@ HOMEPAGE="http://live.gnome.org/Empathy" LICENSE="GPL-2" SLOT="0" -IUSE="debug eds +geocode +geoloc gnome gnome-online-accounts legacy-call +map +networkmanager sendto spell test +v4l" +IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else KEYWORDS="~amd64 ~x86 ~x86-linux" fi -# libgee extensively used in libempathy # gdk-pixbuf and pango extensively used in libempathy-gtk -# clutter-1.10 dep is missing in configure, newer API is used -# folks-0.6.8 is needed to load the contacts list, configure is wrong again -COMMON_DEPEND=">=dev-libs/glib-2.30:2 +COMMON_DEPEND=">=dev-libs/glib-2.33.3:2 x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.3.6:3 + >=x11-libs/gtk+-3.5.1:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 - >=dev-libs/folks-0.6.8 + >=dev-libs/folks-0.7.1 dev-libs/libgee:0 - >=gnome-base/gnome-keyring-2.91.4-r300 + >=app-crypt/libsecret-0.5 >=media-libs/libcanberra-0.25[gtk3] >=net-libs/gnutls-2.8.5 >=net-libs/webkit-gtk-1.3.13:3 >=x11-libs/libnotify-0.7 + media-libs/gstreamer:0.10 >=media-libs/clutter-1.10.0:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 >=media-libs/clutter-gst-1.5.2:1.0 - >=net-libs/telepathy-glib-0.18 - >=net-im/telepathy-logger-0.2.13 >=net-libs/telepathy-farstream-0.2.1 + >=net-libs/telepathy-glib-0.19.6 + >=net-im/telepathy-logger-0.2.13 + app-crypt/gcr dev-libs/libxml2:2 gnome-base/gsettings-desktop-schemas - media-libs/gstreamer:0.10 media-sound/pulseaudio[glib] net-libs/libsoup:2.4 x11-libs/libX11 - eds? ( >=gnome-extra/evolution-data-server-1.2 ) geocode? ( sci-geosciences/geocode-glib ) geoloc? ( >=app-misc/geoclue-0.12 ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.3.0 ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 ) map? ( >=media-libs/clutter-1.7.14:1.0 >=media-libs/clutter-gtk-0.90.3:1.0 >=media-libs/libchamplain-0.12.1:0.12[gtk] ) - networkmanager? ( >=net-misc/networkmanager-0.7 ) sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 ) spell? ( >=app-text/enchant-1.2 @@ -72,8 +68,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2 v4l? ( media-plugins/gst-plugins-v4l2:0.10 >=media-video/cheese-3.4 - sys-fs/udev[gudev] ) -" + sys-fs/udev[gudev] )" # FIXME: gst-plugins-bad is required for the valve plugin. This should move to good # eventually at which point the dep can be dropped # empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861 @@ -83,38 +78,32 @@ RDEPEND="${COMMON_DEPEND} net-im/telepathy-connection-managers !=dev-libs/glib-2.33.3:2 x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.3.6:3 + >=x11-libs/gtk+-3.5.1:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 - >=dev-libs/folks-0.6.8 + >=dev-libs/folks-0.7.1 dev-libs/libgee:0 - >=gnome-base/gnome-keyring-2.91.4-r300 + >=app-crypt/libsecret-0.5 >=media-libs/libcanberra-0.25[gtk3] >=net-libs/gnutls-2.8.5 >=net-libs/webkit-gtk-1.3.13:3 >=x11-libs/libnotify-0.7 + media-libs/gstreamer:0.10 >=media-libs/clutter-1.10.0:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 >=media-libs/clutter-gst-1.5.2:1.0 - >=net-libs/telepathy-glib-0.18 - >=net-im/telepathy-logger-0.2.13 >=net-libs/telepathy-farstream-0.2.1 + >=net-libs/telepathy-glib-0.19.6 + >=net-im/telepathy-logger-0.2.13 + app-crypt/gcr dev-libs/libxml2:2 gnome-base/gsettings-desktop-schemas - media-libs/gstreamer:0.10 media-sound/pulseaudio[glib] net-libs/libsoup:2.4 x11-libs/libX11 - eds? ( >=gnome-extra/evolution-data-server-1.2 ) geocode? ( sci-geosciences/geocode-glib ) geoloc? ( >=app-misc/geoclue-0.12 ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.3.0 ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.1 ) map? ( >=media-libs/clutter-1.7.14:1.0 >=media-libs/clutter-gtk-0.90.3:1.0 >=media-libs/libchamplain-0.12.1:0.12[gtk] ) - networkmanager? ( >=net-misc/networkmanager-0.7 ) sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 ) spell? ( >=app-text/enchant-1.2 @@ -72,8 +68,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2 v4l? ( media-plugins/gst-plugins-v4l2:0.10 >=media-video/cheese-3.4 - sys-fs/udev[gudev] ) -" + sys-fs/udev[gudev] )" # FIXME: gst-plugins-bad is required for the valve plugin. This should move to good # eventually at which point the dep can be dropped # empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861 @@ -83,38 +78,32 @@ RDEPEND="${COMMON_DEPEND} net-im/telepathy-connection-managers !