diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2015-11-18 18:18:42 +0100 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2015-11-18 18:18:42 +0100 |
| commit | 76552bd1f4cdb1c0ec3e8a81d79ebbaef1dbf210 (patch) | |
| tree | d34c09a35d7de1e8fc43ff8012a85dce9410bdd6 /app-admin | |
| parent | app-admin/conky: Add patch to build with >=cmake-3.4.0. (diff) | |
| download | gentoo-76552bd1f4cdb1c0ec3e8a81d79ebbaef1dbf210.tar.gz gentoo-76552bd1f4cdb1c0ec3e8a81d79ebbaef1dbf210.tar.bz2 gentoo-76552bd1f4cdb1c0ec3e8a81d79ebbaef1dbf210.zip | |
app-admin/conky: Use an array for mycmakeargs.
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/conky/conky-1.10.0.ebuild | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/app-admin/conky/conky-1.10.0.ebuild b/app-admin/conky/conky-1.10.0.ebuild index b20f331e479c..15b4eed00677 100644 --- a/app-admin/conky/conky-1.10.0.ebuild +++ b/app-admin/conky/conky-1.10.0.ebuild @@ -87,31 +87,35 @@ src_configure() { local mycmakeargs if use X; then - mycmakeargs="-DBUILD_X11=ON" - mycmakeargs="${mycmakeargs} -DOWN_WINDOW=ON" - mycmakeargs="${mycmakeargs} -DBUILD_XDAMAGE=ON" - mycmakeargs="${mycmakeargs} -DBUILD_XDBE=ON" - mycmakeargs="${mycmakeargs} $(cmake-utils_use_build truetype XFT)" - mycmakeargs="${mycmakeargs} $(cmake-utils_use_build imlib IMLIB2)" - mycmakeargs="${mycmakeargs} -DBUILD_XSHAPE=ON" - mycmakeargs="${mycmakeargs} -DBUILD_ARGB=ON" - mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-cairo LUA_CAIRO)" - mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-imlib LUA_IMLIB2)" - mycmakeargs="${mycmakeargs} $(cmake-utils_use_build lua-rsvg LUA_RSVG)" - mycmakeargs="${mycmakeargs} $(cmake-utils_use_build nvidia)" - mycmakeargs="${mycmakeargs} $(cmake-utils_use_build audacious)" - mycmakeargs="${mycmakeargs} $(cmake-utils_use_build xmms2)" + mycmakeargs=( + -DBUILD_X11=ON + -DOWN_WINDOW=ON + -DBUILD_XDAMAGE=ON + -DBUILD_XDBE=ON + $(cmake-utils_use_build truetype XFT) + $(cmake-utils_use_build imlib IMLIB2) + -DBUILD_XSHAPE=ON + -DBUILD_ARGB=ON + $(cmake-utils_use_build lua-cairo LUA_CAIRO) + $(cmake-utils_use_build lua-imlib LUA_IMLIB2) + $(cmake-utils_use_build lua-rsvg LUA_RSVG) + $(cmake-utils_use_build nvidia) + $(cmake-utils_use_build audacious) + $(cmake-utils_use_build xmms2) + ) else - mycmakeargs="-DBUILD_X11=OFF" - mycmakeargs="${mycmakeargs} -DBUILD_NVIDIA=OFF" - mycmakeargs="${mycmakeargs} -DBUILD_LUA_CAIRO=OFF" - mycmakeargs="${mycmakeargs} -DBUILD_LUA_IMLIB2=OFF" - mycmakeargs="${mycmakeargs} -DBUILD_LUA_RSVG=OFF" - mycmakeargs="${mycmakeargs} -DBUILD_AUDACIOUS=OFF" - mycmakeargs="${mycmakeargs} -DBUILD_XMMS2=OFF" + mycmakeargs=( + -DBUILD_X11=OFF + -DBUILD_NVIDIA=OFF + -DBUILD_LUA_CAIRO=OFF + -DBUILD_LUA_IMLIB2=OFF + -DBUILD_LUA_RSVG=OFF + -DBUILD_AUDACIOUS=OFF + -DBUILD_XMMS2=OFF + ) fi - mycmakeargs="${mycmakeargs} + mycmakeargs+=( $(cmake-utils_use_build apcupsd) $(cmake-utils_use_build debug) $(cmake-utils_use_build cmus) @@ -142,7 +146,7 @@ src_configure() { -DBUILD_AUDACIOUS_LEGACY=OFF -DBUILD_BMPX=OFF -DDOC_PATH=/usr/share/doc/${PF} - " + ) cmake-utils_src_configure } |