commit: bd2a59b96c1c398630e7a02f5abadd379a37bf40 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sun May 8 09:25:51 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sun May 8 09:25:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2a59b9
net-libs/libproxy: Fix gmcs detection (#549734) and webkit dependencies (#574046#c10) Package-Manager: portage-2.2.28 ...oxy-0.4.13.ebuild => libproxy-0.4.13-r1.ebuild} | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/net-libs/libproxy/libproxy-0.4.13.ebuild b/net-libs/libproxy/libproxy-0.4.13-r1.ebuild similarity index 87% rename from net-libs/libproxy/libproxy-0.4.13.ebuild rename to net-libs/libproxy/libproxy-0.4.13-r1.ebuild index 7e3b1e2..791a522 100644 --- a/net-libs/libproxy/libproxy-0.4.13.ebuild +++ b/net-libs/libproxy/libproxy-0.4.13-r1.ebuild @@ -3,25 +3,23 @@ # $Id$ EAPI=6 - PYTHON_COMPAT=( python2_7 ) inherit cmake-multilib eutils flag-o-matic mono-env python-r1 DESCRIPTION="Library for automatic proxy configuration management" HOMEPAGE="https://github.com/libproxy/libproxy"; -LICENSE="LGPL-2.1+" +SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="LGPL-2.1+" SLOT="0" -SRC_URI="https://github.com/libproxy/libproxy/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~amd64-linux ~arm ~arm-linux ~hppa ~ia64 ~ia64-linux ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-solaris ~x64-macos ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris" -IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit" +IUSE="gnome kde mono networkmanager perl python spidermonkey test webkit" 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 CDEPEND=" gnome? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) mono? ( dev-lang/mono ) @@ -29,17 +27,17 @@ CDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) spidermonkey? ( >=dev-lang/spidermonkey-1.8.5:0= ) - webkit? ( || ( - net-libs/webkit-gtk:3= - net-libs/webkit-gtk:4= - ) )" + webkit? ( net-libs/webkit-gtk:4 ) +" DEPEND="${CDEPEND} - virtual/pkgconfig:0[${MULTILIB_USEDEP}]" + virtual/pkgconfig:0[${MULTILIB_USEDEP}] +" RDEPEND="${CDEPEND} kde? ( || ( - kde-apps/kreadconfig:4 kde-frameworks/kconfig:5 - ) )" + kde-apps/kreadconfig:4 + ) ) +" # avoid dependency loop, bug #467696 PDEPEND="networkmanager? ( net-misc/networkmanager )" @@ -49,11 +47,13 @@ PATCHES=( "${FILESDIR}/${PN}-0.4.10-disable-pac-test.patch" # prevent dependency loop with networkmanager, libsoup, glib-networking; bug #467696 + # https://github.com/libproxy/libproxy/issues/28 "${FILESDIR}/${PN}-0.4.11-avoid-nm-build-dep.patch" # Gentoo's spidermonkey doesn't set Version: in mozjs18[57].pc "${FILESDIR}/${PN}-0.4.12-mozjs.pc.patch" + # https://github.com/libproxy/libproxy/issues/27 "${FILESDIR}/${PN}-0.4.12-macosx.patch" ) @@ -65,14 +65,14 @@ multilib_src_configure() { '-DWITH_VALA=ON' "-DCMAKE_C_FLAGS=${CFLAGS}" "-DCMAKE_CXX_FLAGS=${CXXFLAGS}" + "-DGMCS_EXECUTABLE='${EPREFIX}/usr/bin/mcs'" "-DWITH_GNOME3=$(usex gnome)" "-DWITH_KDE=$(usex kde)" "-DWITH_DOTNET=$(multilib_is_native_abi && usex mono || echo 'OFF')" "-DWITH_NM=$(usex networkmanager)" - "-DWITH_PERL=$(multilib_is_native_abi && usex perl || echo 'OFF')" + "-DWITH_PERL=$(multilib_is_native_abi && usex perl || echo 'OFF')" "-DWITH_PYTHON=$(multilib_is_native_abi && usex python || echo 'OFF')" - "-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo 'OFF')" - "-DWITH_WEBKIT=$(multilib_is_native_abi && usex webkit || echo 'OFF')" + "-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo 'OFF')" "-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo 'OFF')" "-DBUILD_TESTING=$(usex test)" ) @@ -88,6 +88,5 @@ src_configure() { multilib_src_install_all() { doman "${FILESDIR}/proxy.1" - use python && python_foreach_impl python_domodule 'bindings/python/libproxy.py' }
