From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BDF5D13824A for ; Sun, 8 May 2016 04:30:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92FBBE07DD; Sun, 8 May 2016 04:30:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 675E6E07C9 for ; Sun, 8 May 2016 04:30:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A807D340834 for ; Sun, 8 May 2016 04:30:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F6A095D for ; Sun, 8 May 2016 04:30:41 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1462681176.33aa498599d070ece03bac11c3c2e8af654a937f.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libproxy/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libproxy/libproxy-0.4.13.ebuild X-VCS-Directories: net-libs/libproxy/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 33aa498599d070ece03bac11c3c2e8af654a937f X-VCS-Branch: master Date: Sun, 8 May 2016 04:30:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 13ad3519-f7c7-4a06-838a-8ef1eb45ad50 X-Archives-Hash: 35315258a0f7d153b99808915b6d8253 commit: 33aa498599d070ece03bac11c3c2e8af654a937f Author: Jan Chren gmail com> AuthorDate: Thu Apr 28 20:59:55 2016 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun May 8 04:19:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33aa4985 net-libs/libproxy: EAPI6 + update mycmakeargs - `-DWITH_KDE4` -> `-DWITH_KDE` (https://github.com/libproxy/libproxy/commit/bd9bf72e15107e6c6133b438c700dd42d79c9d60) Thanks-to: Arfrever Frehtes Taifersar Arahesis gmail.com> Gentoo-Bug: 574046 net-libs/libproxy/libproxy-0.4.13.ebuild | 54 ++++++++++++++------------------ 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/net-libs/libproxy/libproxy-0.4.13.ebuild b/net-libs/libproxy/libproxy-0.4.13.ebuild index 0a9b94c..9b8a91a 100644 --- a/net-libs/libproxy/libproxy-0.4.13.ebuild +++ b/net-libs/libproxy/libproxy-0.4.13.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 + PYTHON_COMPAT=( python2_7 ) inherit cmake-multilib eutils flag-o-matic mono python-r1 @@ -49,6 +50,28 @@ PATCHES=( "${FILESDIR}/${PN}-0.4.12-macosx.patch" ) +multilib_src_configure() { + local mycmakeargs=( + '-DPERL_VENDORINSTALL=ON' + # WITH_VALA just copies the .vapi file over and needs no deps, + # hence always enable it unconditionally + '-DWITH_VALA=ON' + "-DCMAKE_C_FLAGS=${CFLAGS}" + "-DCMAKE_CXX_FLAGS=${CXXFLAGS}" + "-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_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_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo 'OFF')" + "-DBUILD_TESTING=$(usex test)" + ) + cmake-utils_src_configure +} + src_configure() { [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl @@ -56,35 +79,6 @@ src_configure() { multilib-minimal_src_configure } -multilib_src_configure() { - # WITH_VALA just copies the .vapi file over and needs no deps, - # hence always enable it unconditionally - local mycmakeargs=( - -DPERL_VENDORINSTALL=ON - -DCMAKE_C_FLAGS="${CFLAGS}" - -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - $(cmake-utils_use_with gnome GNOME3) - $(multilib_is_native_abi && cmake-utils_use_with kde KDE4 \ - || echo -DWITH_KDE4=OFF) - $(multilib_is_native_abi && cmake-utils_use_with mono DOTNET \ - || echo -DWITH_DOTNET=OFF) - $(cmake-utils_use_with networkmanager NM) - $(multilib_is_native_abi && cmake-utils_use_with perl PERL \ - || echo -DWITH_PERL=OFF) - $(multilib_is_native_abi && cmake-utils_use_with python PYTHON \ - || echo -DWITH_PYTHON=OFF) - $(multilib_is_native_abi && cmake-utils_use_with spidermonkey MOZJS \ - || echo -DWITH_MOZJS=OFF) - $(multilib_is_native_abi && cmake-utils_use_with webkit WEBKIT \ - || echo -DWITH_WEBKIT=OFF) - $(multilib_is_native_abi && cmake-utils_use_with webkit WEBKIT3 \ - || echo -DWITH_WEBKIT3=OFF) - -DWITH_VALA=ON - $(cmake-utils_use test BUILD_TESTING) - ) - cmake-utils_src_configure -} - multilib_src_install_all() { DOCS="AUTHORS ChangeLog NEWS README" einstalldocs