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 8DF5C1384B4 for ; Sun, 3 Jan 2016 21:17:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26D8EE0872; Sun, 3 Jan 2016 21:17:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B81E8E0872 for ; Sun, 3 Jan 2016 21:17:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2CBB3405CF for ; Sun, 3 Jan 2016 21:17:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7232CAF9 for ; Sun, 3 Jan 2016 21:17:20 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1451855835.3781323eb0cc2694486cde82e3146074b0bcaa40.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/pidgin/pidgin-2.10.12.ebuild X-VCS-Directories: net-im/pidgin/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3781323eb0cc2694486cde82e3146074b0bcaa40 X-VCS-Branch: master Date: Sun, 3 Jan 2016 21:17:20 +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: 71ef26c2-4345-4591-9b25-da56da66bd55 X-Archives-Hash: 7fc7754cc561283dbc455eeefe4f025f commit: 3781323eb0cc2694486cde82e3146074b0bcaa40 Author: Lars Wendler gentoo org> AuthorDate: Sun Jan 3 21:16:56 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Jan 3 21:17:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3781323e net-im/pidgin: Fixed dependency on gstreamer to use 1.0 slot (bug #570776). Package-Manager: portage-2.2.26 Signed-off-by: Lars Wendler gentoo.org> net-im/pidgin/pidgin-2.10.12.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/net-im/pidgin/pidgin-2.10.12.ebuild b/net-im/pidgin/pidgin-2.10.12.ebuild index 96f7af6..407fe46 100644 --- a/net-im/pidgin/pidgin-2.10.12.ebuild +++ b/net-im/pidgin/pidgin-2.10.12.ebuild @@ -42,11 +42,9 @@ RDEPEND=" spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) - gstreamer? ( =media-libs/gstreamer-0.10* - =media-libs/gst-plugins-good-0.10* - >=net-libs/farstream-0.2.7:0.2 - media-plugins/gst-plugins-meta:0.10 - media-plugins/gst-plugins-gconf:0.10 ) + gstreamer? ( media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 @@ -55,7 +53,10 @@ RDEPEND=" gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) - !gnutls? ( >=dev-libs/nss-3.15.4 ) + !gnutls? ( + dev-libs/nspr + dev-libs/nss + ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl:0= ) @@ -202,7 +203,7 @@ src_configure() { $(use_enable debug) \ $(use_enable dbus) \ $(use_enable meanwhile) \ - $(use_enable gstreamer) \ + $(use_enable gstreamer gstreamer 1.0) \ $(use_enable gstreamer farstream) \ $(use_enable gstreamer vv) \ $(use_enable sasl cyrus-sasl ) \