From 363d2acb3ff0e2c8aed6bef02972f794ef705c00 Mon Sep 17 00:00:00 2001 From: Jan Chren Date: Thu, 28 Apr 2016 23:04:36 +0200 Subject: net-libs/libproxy: update dependencies KDE module dependency changed from linked (against Qt/KDE) to runtime, which uses kreadconfig/kreadconfig5. This change was introduced in https://github.com/libproxy/libproxy/commit/bd9bf72e15107e6c6133b438c700dd42d79c9d60. Thanks to Arfrever for shedding light on this in bug #574046. Since https://github.com/libproxy/libproxy/commit/00975fa11220af11398f9d89ee2ee0cf17c655d2 libproxy supports webkit:4. Thanks-to: Arfrever Frehtes Taifersar Arahesis Gentoo-Bug: 574046 --- net-libs/libproxy/libproxy-0.4.13.ebuild | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'net-libs') diff --git a/net-libs/libproxy/libproxy-0.4.13.ebuild b/net-libs/libproxy/libproxy-0.4.13.ebuild index 9b8a91a61582..d4f69e18769d 100644 --- a/net-libs/libproxy/libproxy-0.4.13.ebuild +++ b/net-libs/libproxy/libproxy-0.4.13.ebuild @@ -22,17 +22,24 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # NOTE: mozjs/spidermonkey might still cause problems like #373397 ? # NOTE: webkit-gtk:3, not :2, needed for libjavascriptcoregtk support -RDEPEND="gnome? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) - kde? ( >=kde-base/kdelibs-4.4.5 ) +CDEPEND=" + gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) mono? ( dev-lang/mono ) - networkmanager? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) + networkmanager? ( sys-apps/dbus:0[${MULTILIB_USEDEP}] ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) spidermonkey? ( >=dev-lang/spidermonkey-1.8.5:0= ) - webkit? ( >=net-libs/webkit-gtk-1.6:3= )" -DEPEND="${RDEPEND} - kde? ( dev-util/automoc ) - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + webkit? ( || ( + net-libs/webkit-gtk:3= + net-libs/webkit-gtk:4= + ) )" +DEPEND="${CDEPEND} + virtual/pkgconfig:0[${MULTILIB_USEDEP}]" +RDEPEND="${CDEPEND} + kde? ( || ( + kde-apps/kreadconfig:4 + kde-frameworks/kconfig:5 + ) )" # avoid dependency loop, bug #467696 PDEPEND="networkmanager? ( net-misc/networkmanager )" -- cgit v1.2.3-65-gdbad