summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2016-01-03 22:16:56 +0100
committerLars Wendler <polynomial-c@gentoo.org>2016-01-03 22:17:15 +0100
commit3781323eb0cc2694486cde82e3146074b0bcaa40 (patch)
tree95a0fc0d3522261b015904c6f428b0b459c17827 /net-im/pidgin
parentdev-java/icedtea: Allow newer icedtea-web and update CACAO patch (diff)
downloadgentoo-3781323eb0cc2694486cde82e3146074b0bcaa40.tar.gz
gentoo-3781323eb0cc2694486cde82e3146074b0bcaa40.tar.bz2
gentoo-3781323eb0cc2694486cde82e3146074b0bcaa40.zip
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@gentoo.org>
Diffstat (limited to 'net-im/pidgin')
-rw-r--r--net-im/pidgin/pidgin-2.10.12.ebuild15
1 files 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 96f7af6afcb4..407fe463613c 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 ) \