| 1 |
commit: 3781323eb0cc2694486cde82e3146074b0bcaa40 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 3 21:16:56 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 3 21:17:15 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3781323e |
| 7 |
|
| 8 |
net-im/pidgin: Fixed dependency on gstreamer to use 1.0 slot (bug #570776). |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
net-im/pidgin/pidgin-2.10.12.ebuild | 15 ++++++++------- |
| 14 |
1 file changed, 8 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-im/pidgin/pidgin-2.10.12.ebuild b/net-im/pidgin/pidgin-2.10.12.ebuild |
| 17 |
index 96f7af6..407fe46 100644 |
| 18 |
--- a/net-im/pidgin/pidgin-2.10.12.ebuild |
| 19 |
+++ b/net-im/pidgin/pidgin-2.10.12.ebuild |
| 20 |
@@ -42,11 +42,9 @@ RDEPEND=" |
| 21 |
spell? ( >=app-text/gtkspell-2.0.2:2 ) |
| 22 |
eds? ( >=gnome-extra/evolution-data-server-3.6:= ) |
| 23 |
prediction? ( >=dev-db/sqlite-3.3:3 ) ) |
| 24 |
- gstreamer? ( =media-libs/gstreamer-0.10* |
| 25 |
- =media-libs/gst-plugins-good-0.10* |
| 26 |
- >=net-libs/farstream-0.2.7:0.2 |
| 27 |
- media-plugins/gst-plugins-meta:0.10 |
| 28 |
- media-plugins/gst-plugins-gconf:0.10 ) |
| 29 |
+ gstreamer? ( media-libs/gstreamer:1.0 |
| 30 |
+ media-libs/gst-plugins-base:1.0 |
| 31 |
+ >=net-libs/farstream-0.2.7:0.2 ) |
| 32 |
zeroconf? ( net-dns/avahi[dbus] ) |
| 33 |
dbus? ( >=dev-libs/dbus-glib-0.71 |
| 34 |
>=sys-apps/dbus-0.90 |
| 35 |
@@ -55,7 +53,10 @@ RDEPEND=" |
| 36 |
gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] |
| 37 |
>=net-libs/libgadu-1.11.0[-ssl] ) ) |
| 38 |
gnutls? ( net-libs/gnutls ) |
| 39 |
- !gnutls? ( >=dev-libs/nss-3.15.4 ) |
| 40 |
+ !gnutls? ( |
| 41 |
+ dev-libs/nspr |
| 42 |
+ dev-libs/nss |
| 43 |
+ ) |
| 44 |
meanwhile? ( net-libs/meanwhile ) |
| 45 |
silc? ( >=net-im/silc-toolkit-1.0.1 ) |
| 46 |
tcl? ( dev-lang/tcl:0= ) |
| 47 |
@@ -202,7 +203,7 @@ src_configure() { |
| 48 |
$(use_enable debug) \ |
| 49 |
$(use_enable dbus) \ |
| 50 |
$(use_enable meanwhile) \ |
| 51 |
- $(use_enable gstreamer) \ |
| 52 |
+ $(use_enable gstreamer gstreamer 1.0) \ |
| 53 |
$(use_enable gstreamer farstream) \ |
| 54 |
$(use_enable gstreamer vv) \ |
| 55 |
$(use_enable sasl cyrus-sasl ) \ |
Archives