summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Chren <dev.rindeal@gmail.com>2016-04-28 22:59:55 +0200
committerJason Zaman <perfinion@gentoo.org>2016-05-08 12:19:36 +0800
commit33aa498599d070ece03bac11c3c2e8af654a937f (patch)
tree325cde221b7f202ea9f441e477722afb1fc3d331 /net-libs
parentnet-libs/libproxy: update patches (diff)
downloadgentoo-33aa498599d070ece03bac11c3c2e8af654a937f.tar.gz
gentoo-33aa498599d070ece03bac11c3c2e8af654a937f.tar.bz2
gentoo-33aa498599d070ece03bac11c3c2e8af654a937f.zip
net-libs/libproxy: EAPI6 + update mycmakeargs
- `-DWITH_KDE4` -> `-DWITH_KDE` (https://github.com/libproxy/libproxy/commit/bd9bf72e15107e6c6133b438c700dd42d79c9d60) Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> Gentoo-Bug: 574046
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/libproxy/libproxy-0.4.13.ebuild54
1 files 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 0a9b94c282d..9b8a91a6158 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