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 691611381F3 for ; Fri, 21 Dec 2012 23:27:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9ED621C07C; Fri, 21 Dec 2012 23:27:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C1E121C07C for ; Fri, 21 Dec 2012 23:27:07 +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 2A76A33D938 for ; Fri, 21 Dec 2012 23:27:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C3CDAE5442 for ; Fri, 21 Dec 2012 23:27:04 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1356132087.155e6b34d1bc0da9b107181c3c7b4de6f03d2e6a.eva@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.6.2-r1.ebuild net-im/empathy/empathy-3.6.2-r2.ebuild net-im/empathy/empathy-9999.ebuild X-VCS-Directories: net-im/empathy/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 155e6b34d1bc0da9b107181c3c7b4de6f03d2e6a X-VCS-Branch: master Date: Fri, 21 Dec 2012 23:27:04 +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: effe28d3-f327-4076-8b74-256065d5b1d2 X-Archives-Hash: 98d68151ea8144cae3079a60c7328599 commit: 155e6b34d1bc0da9b107181c3c7b4de6f03d2e6a Author: Gilles Dartiguelongue gentoo org> AuthorDate: Fri Dec 21 23:21:27 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Fri Dec 21 23:21:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=155e6b34 net-im/empathy: switch to gstreamer:1.0 * Switch to python-any-r1 for build env. * Switch to gstreamer:1.0 * Raise telepathy-mission-control according to mail on distributor list. * Add missing folks[telepathy] dependency. * Add missing licenses. --- ...thy-3.6.2-r1.ebuild => empathy-3.6.2-r2.ebuild} | 53 ++++++++------------ net-im/empathy/empathy-9999.ebuild | 53 ++++++++------------ 2 files changed, 42 insertions(+), 64 deletions(-) diff --git a/net-im/empathy/empathy-3.6.2-r1.ebuild b/net-im/empathy/empathy-3.6.2-r2.ebuild similarity index 72% rename from net-im/empathy/empathy-3.6.2-r1.ebuild rename to net-im/empathy/empathy-3.6.2-r2.ebuild index 9066c88..d454a7f 100644 --- a/net-im/empathy/empathy-3.6.2-r1.ebuild +++ b/net-im/empathy/empathy-3.6.2-r2.ebuild @@ -5,9 +5,9 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="2:2.5" +PYTHON_COMPAT=( python2_{5,6,7} ) -inherit gnome2 python virtualx +inherit gnome2 python-any-r1 virtualx if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -15,7 +15,7 @@ fi DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME" HOMEPAGE="http://live.gnome.org/Empathy" -LICENSE="GPL-2" +LICENSE="GPL-2 CCPL-Attribution-ShareAlike-3.0" SLOT="0" IUSE="debug +geocode +geoloc gnome gnome-online-accounts +map sendto spell test +v4l" if [[ ${PV} = 9999 ]]; then @@ -25,12 +25,13 @@ else fi # gdk-pixbuf and pango extensively used in libempathy-gtk -COMMON_DEPEND=">=dev-libs/glib-2.33.3:2 +COMMON_DEPEND=" + >=dev-libs/glib-2.33.3:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.5.1:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 - >=dev-libs/folks-0.7.3:= + >=dev-libs/folks-0.7.3:=[telepathy] dev-libs/libgee:0= >=app-crypt/libsecret-0.5 >=media-libs/libcanberra-0.25[gtk3] @@ -38,16 +39,16 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2 >=net-libs/webkit-gtk-1.3.13:3 >=x11-libs/libnotify-0.7 - media-libs/gstreamer:0.10 + media-libs/gstreamer:1.0 >=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 + media-libs/clutter-gst:2.0 media-libs/cogl:1.0= - net-libs/farstream - >=net-libs/telepathy-farstream-0.2.1 + net-libs/farstream:0.2 + >=net-libs/telepathy-farstream-0.5:= >=net-libs/telepathy-glib-0.19.9 - >=net-im/telepathy-logger-0.2.13 + >=net-im/telepathy-logger-0.2.13:= app-crypt/gcr dev-libs/libxml2:2 @@ -68,46 +69,36 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2 >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) v4l? ( - media-plugins/gst-plugins-v4l2:0.10 + media-plugins/gst-plugins-v4l2:1.0 + >=media-video/cheese-3.4 virtual/udev[gudev] )" -# >=media-video/cheese-3.4 - -# 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 +# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861 RDEPEND="${COMMON_DEPEND} - media-libs/gst-plugins-base:0.10 - media-libs/gst-plugins-bad:0.10 + media-libs/gst-plugins-base:1.0 net-im/telepathy-connection-managers !=dev-libs/glib-2.33.3:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.5.1:3 x11-libs/pango >=dev-libs/dbus-glib-0.51 - >=dev-libs/folks-0.7.3:= + >=dev-libs/folks-0.7.3:=[telepathy] dev-libs/libgee:0= >=app-crypt/libsecret-0.5 >=media-libs/libcanberra-0.25[gtk3] @@ -38,16 +39,16 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2 >=net-libs/webkit-gtk-1.3.13:3 >=x11-libs/libnotify-0.7 - media-libs/gstreamer:0.10 + media-libs/gstreamer:1.0 >=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 + media-libs/clutter-gst:2.0 media-libs/cogl:1.0= - net-libs/farstream - >=net-libs/telepathy-farstream-0.2.1 + net-libs/farstream:0.2 + >=net-libs/telepathy-farstream-0.5:= >=net-libs/telepathy-glib-0.19.9 - >=net-im/telepathy-logger-0.2.13 + >=net-im/telepathy-logger-0.2.13:= app-crypt/gcr dev-libs/libxml2:2 @@ -68,46 +69,36 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.3:2 >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) v4l? ( - media-plugins/gst-plugins-v4l2:0.10 + media-plugins/gst-plugins-v4l2:1.0 + >=media-video/cheese-3.4 virtual/udev[gudev] )" -# >=media-video/cheese-3.4 - -# 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 +# >=empathy-3.4 is incompatible with telepathy-rakia-0.6, bug #403861 RDEPEND="${COMMON_DEPEND} - media-libs/gst-plugins-base:0.10 - media-libs/gst-plugins-bad:0.10 + media-libs/gst-plugins-base:1.0 net-im/telepathy-connection-managers !