diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2019-12-15 18:39:22 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2019-12-15 18:39:38 +0100 |
| commit | 72c7eae70abfbd66c6c8b461f113593b584d8ff0 (patch) | |
| tree | 1db8705c308712718d36f04fe0ffedcb9eae9cfb /media-sound/csound | |
| parent | app-benchmarks/interbench: update homepage (diff) | |
| download | gentoo-72c7eae70abfbd66c6c8b461f113593b584d8ff0.tar.gz gentoo-72c7eae70abfbd66c6c8b461f113593b584d8ff0.tar.bz2 gentoo-72c7eae70abfbd66c6c8b461f113593b584d8ff0.zip | |
media-sound/csound-9999: some fixes
1) removed java-pkg-opt-2 from inerit as java use flag is not enabled atm
2) removed code that compiled just some translations selectively
3) fixed boost dep (needed only header files, no linking)
4) added slot to net-libs/libwebsockets
5) added comment to -DUSE_LIB64 to make these line purpose clear
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'media-sound/csound')
| -rw-r--r-- | media-sound/csound/csound-9999.ebuild | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild index b0de613cfe23..60dad6bb9926 100644 --- a/media-sound/csound/csound-9999.ebuild +++ b/media-sound/csound/csound-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit cmake-utils java-pkg-opt-2 python-single-r1 toolchain-funcs +inherit cmake-utils python-single-r1 toolchain-funcs if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/csound/csound.git" @@ -31,8 +31,6 @@ fltk +fluidsynth +image jack keyboard linear lua luajit nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket" -IUSE_LANGS=" de en_US es es_CO fr it ro ru" - REQUIRED_USE=" linear? ( double-precision ) lua? ( cxx ) @@ -41,7 +39,6 @@ REQUIRED_USE=" # java? ( cxx ) BDEPEND=" - dev-libs/boost:= sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) @@ -85,10 +82,13 @@ CDEPEND=" python? ( ${PYTHON_DEPS} ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) - websocket? ( net-libs/libwebsockets ) + websocket? ( net-libs/libwebsockets:= ) " RDEPEND="${CDEPEND}" -DEPEND="${CDEPEND}" +DEPEND=" + ${CDEPEND} + dev-libs/boost +" if [[ ${PV} != "9999" ]]; then DEPEND+="doc? ( app-arch/unzip )" @@ -109,14 +109,6 @@ src_prepare() { sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \ -e '/-O3/d' \ -i CMakeLists.txt || die - - local lang - - for lang in ${IUSE_LANGS} ; do - if ! has ${lang} ${LINGUAS-${lang}} ; then - sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die - fi - done } src_configure() { @@ -216,6 +208,7 @@ src_configure() { -DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)" ) + # this is needed, otherwise it sets LIBRARY INSTALL DIR: lib [[ $(get_libdir) == "lib64" ]] && mycmakeargs+=( -DUSE_LIB64=ON ) |