commit:     3781323eb0cc2694486cde82e3146074b0bcaa40
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 21:16:56 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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 ) \

Reply via email to