Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/openbabel/
Date: Tue, 27 Oct 2015 18:04:15
Message-Id: 1445969044.67637da7accee22cb299954e4aaa831fe2d6faec.jlec@gentoo
1 commit: 67637da7accee22cb299954e4aaa831fe2d6faec
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 27 17:37:08 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 27 18:04:04 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67637da7
7
8 sci-chemistry/openbabel: Fix for gcc-5
9
10 convert mycmakeargs to be an array
11
12 Package-Manager: portage-2.2.23
13 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
14
15 sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild | 14 +++++++++++---
16 1 file changed, 11 insertions(+), 3 deletions(-)
17
18 diff --git a/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild
19 index c123bb0..81b5302 100644
20 --- a/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild
21 +++ b/sci-chemistry/openbabel/openbabel-2.3.2-r1.ebuild
22 @@ -41,13 +41,21 @@ pkg_setup() {
23 fi
24 }
25
26 +src_prepare() {
27 + sed \
28 + -e '/__GNUC__/s:== 4:>= 4:g' \
29 + -i include/openbabel/shared_ptr.h || die
30 + cmake-utils_src_prepare
31 +}
32 +
33 src_configure() {
34 need-wxwidgets unicode
35 - local mycmakeargs=""
36 - mycmakeargs="${mycmakeargs}
37 + local mycmakeargs=()
38 + mycmakeargs+=(
39 -DOPENBABEL_USE_SYSTEM_INCHI=ON
40 $(cmake-utils_use_enable openmp OPENMP)
41 - $(cmake-utils_use wxwidgets BUILD_GUI)"
42 + $(cmake-utils_use wxwidgets BUILD_GUI)
43 + )
44
45 cmake-utils_src_configure
46 }