From 313b01351deeddc59f17cdfd2f95fd0572b99348 Mon Sep 17 00:00:00 2001 From: mschubert Date: Sun, 13 Sep 2015 15:27:10 +0100 Subject: sci-libs/rdkit: simplify USE checks Package-Manager: portage-2.2.20-prefix --- sci-libs/rdkit/ChangeLog | 4 ++++ sci-libs/rdkit/rdkit-2015.03.1.ebuild | 10 ++-------- sci-libs/rdkit/rdkit-9999.ebuild | 10 ++-------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sci-libs/rdkit/ChangeLog b/sci-libs/rdkit/ChangeLog index 2c1da33e5..e5b9ddbd6 100644 --- a/sci-libs/rdkit/ChangeLog +++ b/sci-libs/rdkit/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 13 Sep 2015; Michael Schubert rdkit-2015.03.1.ebuild, + rdkit-9999.ebuild: + sci-libs/rdkit: simplify USE checks + 13 Sep 2015; Marius Brehler rdkit-2015.03.1.ebuild, rdkit-9999.ebuild: sci-libs/rdkit: Fix cmake args diff --git a/sci-libs/rdkit/rdkit-2015.03.1.ebuild b/sci-libs/rdkit/rdkit-2015.03.1.ebuild index fed972aaa..68ee45fa0 100644 --- a/sci-libs/rdkit/rdkit-2015.03.1.ebuild +++ b/sci-libs/rdkit/rdkit-2015.03.1.ebuild @@ -33,15 +33,9 @@ src_configure() { -DCMAKE_INSTALL_PREFIX:PATH="${EPREFIX}"/usr -DRDK_INSTALL_INTREE=0 -DRDK_BUILD_CPP_TESTS=OFF + $(cmake-utils_use static-libs RDK_INSTALL_STATIC_LIBS) + $(cmake-utils_use python RDK_BUILD_PYTHON_WRAPPERS) ) - if ! use static-libs; then - mycmakeargs+=( -DRDK_INSTALL_STATIC_LIBS=OFF ) - fi - - if ! use python; then - mycmakeargs+=( -DRDK_BUILD_PYTHON_WRAPPERS=OFF ) - fi - cmake-utils_src_configure } diff --git a/sci-libs/rdkit/rdkit-9999.ebuild b/sci-libs/rdkit/rdkit-9999.ebuild index d61982e95..0b4f40aa9 100644 --- a/sci-libs/rdkit/rdkit-9999.ebuild +++ b/sci-libs/rdkit/rdkit-9999.ebuild @@ -32,15 +32,9 @@ src_configure() { -DCMAKE_INSTALL_PREFIX:PATH="${EPREFIX}"/usr -DRDK_INSTALL_INTREE=0 -DRDK_BUILD_CPP_TESTS=OFF + $(cmake-utils_use static-libs RDK_INSTALL_STATIC_LIBS) + $(cmake-utils_use python RDK_BUILD_PYTHON_WRAPPERS) ) - if ! use static-libs; then - mycmakeargs+=( -DRDK_INSTALL_STATIC_LIBS=OFF ) - fi - - if ! use python; then - mycmakeargs+=( -DRDK_BUILD_PYTHON_WRAPPERS=OFF ) - fi - cmake-utils_src_configure } -- cgit v1.2.3-65-gdbad