*/*: Switch proaudio proj packages to cmake.eclass

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
index f50b4e526ed55b835c24a0fd98e460b1a18fbe51..27dd06fd49d788b096f1da2dca712c137a14b7e9 100644 (file)
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ b/media-libs/portmidi/portmidi-217-r3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 # ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils desktop xdg distutils-r1 java-pkg-opt-2
+inherit cmake desktop xdg distutils-r1 java-pkg-opt-2
 
 DESCRIPTION="Library for real time MIDI input and output"
 HOMEPAGE="http://portmedia.sourceforge.net/"
@@ -58,7 +58,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # install wrapper for pmdefaults
        if use java ; then
@@ -88,11 +88,11 @@ src_configure() {
                mycmakeargs+=(-DJAR_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/lib")
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 
        if use python ; then
                sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#" pm_python/setup.py || die
@@ -110,7 +110,7 @@ src_compile() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt
 

diff --git a/media-sound/csound/csound-6.13.0.ebuild b/media-sound/csound/csound-6.13.0.ebuild
index bee79ef487710da13642bd8dc6cb5824210f9530..e7d1d96b3f998d4413d5bcb07bdc68dc5db3d1d8 100644 (file)
--- a/media-sound/csound/csound-6.13.0.ebuild
+++ b/media-sound/csound/csound-6.13.0.ebuild
@@ -8,7 +8,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils python-single-r1 toolchain-funcs
+inherit cmake python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="https://github.com/csound/csound.git"
@@ -113,7 +113,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
                -e '/-O3/d' \
@@ -153,7 +153,6 @@ src_configure() {
                -DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
                -DBUILD_SELECT_OPCODE=ON
                -DBUILD_SERIAL_OPCODES=ON
-               -DBUILD_SHARED_LIBS=ON
                -DBUILD_STACK_OPCODES=ON
                -DBUILD_STATIC_LIBRARY=$(usex static-libs)
                -DBUILD_STATIC_LIBRARY=$(usex test)
@@ -225,11 +224,11 @@ src_configure() {
                -DUSE_LIB64=ON
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        dodoc -r Release_Notes/.
 
        # generate env.d file

diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index d6e3677445f6d5563fe6e5d5b365fcc3326bb377..f29357886e45ba26603d5802112c295f326fd00e 100644 (file)
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -8,7 +8,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils python-single-r1 toolchain-funcs
+inherit cmake python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="https://github.com/csound/csound.git"
@@ -113,7 +113,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
                -e '/-O3/d' \
@@ -154,7 +154,6 @@ src_configure() {
                -DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
                -DBUILD_SELECT_OPCODE=ON
                -DBUILD_SERIAL_OPCODES=ON
-               -DBUILD_SHARED_LIBS=ON
                -DBUILD_STACK_OPCODES=ON
                -DBUILD_STATIC_LIBRARY=$(usex static-libs)
                -DBUILD_STATIC_LIBRARY=$(usex test)
@@ -226,11 +225,11 @@ src_configure() {
                -DUSE_LIB64=ON
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        dodoc -r Release_Notes/.
 
        # generate env.d file

diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index db964f6142564d37c25bfebd9a75e810549bb77c..9245c1140a0d1a7de0c7b846f0265d1d67e3947a 100644 (file)
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit git-r3 xdg cmake-utils
+inherit git-r3 xdg cmake
 
 DESCRIPTION="Advanced drum machine"
 HOMEPAGE="http://www.hydrogen-music.org/"
@@ -62,15 +62,15 @@ src_configure() {
                -DWANT_RUBBERBAND=OFF
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
-       use doc && cmake-utils_src_compile doc
+       cmake_src_compile
+       use doc && cmake_src_compile doc
 }
 
 src_install() {
        use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-       cmake-utils_src_install
+       cmake_src_install
 }

diff --git a/media-sound/rosegarden/rosegarden-17.12.1.ebuild b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
index 34f80417db541ba0bc7f5af1e62694b542539396..dac7760081c171c2ab51fd7840a5acbd3b799be2 100644 (file)
--- a/media-sound/rosegarden/rosegarden-17.12.1.ebuild
+++ b/media-sound/rosegarden/rosegarden-17.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="https://www.rosegardenmusic.com/"
@@ -43,12 +43,12 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
        local mycmakeargs=(
                "-DDISABLE_LIRC=$(usex lirc OFF ON)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }

diff --git a/media-sound/rosegarden/rosegarden-19.06.ebuild b/media-sound/rosegarden/rosegarden-19.06.ebuild
index eaedb77e1951e465c7b29b852d82b9f09c0dce21..a86fbbdda3ed333341ed0b6d8cc55233a532d7cc 100644 (file)
--- a/media-sound/rosegarden/rosegarden-19.06.ebuild
+++ b/media-sound/rosegarden/rosegarden-19.06.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg virtualx
+inherit cmake xdg virtualx
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="https://www.rosegardenmusic.com/"
@@ -44,16 +44,16 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
        local mycmakeargs=(
                "-DDISABLE_LIRC=$(usex lirc OFF ON)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
-        virtx cmake-utils_src_test
+        virtx cmake_src_test
 }

diff --git a/media-sound/rosegarden/rosegarden-19.12.ebuild b/media-sound/rosegarden/rosegarden-19.12.ebuild
index 43ed83b26b8cd736436d18110cb7f14a842e93d7..7ed9801029fe412e2430bac5858cf0886a979803 100644 (file)
--- a/media-sound/rosegarden/rosegarden-19.12.ebuild
+++ b/media-sound/rosegarden/rosegarden-19.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg virtualx
+inherit cmake xdg virtualx
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="https://www.rosegardenmusic.com/"
@@ -44,16 +44,16 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
        local mycmakeargs=(
                "-DDISABLE_LIRC=$(usex lirc OFF ON)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
-        virtx cmake-utils_src_test
+        virtx cmake_src_test
 }

diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
index 01b612a4bcdbde36dad42761fb7369f0b1101354..72b00573167476dfb2b83933b0630c288de77a1c 100644 (file)
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
 HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
@@ -43,7 +43,7 @@ PATCHES=( "${FILESDIR}"/${P}-docs.patch )
 DOCS=( ChangeLog HISTORY.txt README.adoc )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        if ! use dssi; then
                sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
@@ -67,21 +67,21 @@ src_configure() {
 
        local mycmakeargs=(
                -DPluginLibDir=$(get_libdir)
-               $(cmake-utils_use_find_package alsa Alsa)
-               $(cmake-utils_use_find_package doc Doxygen)
-               $(cmake-utils_use_find_package fltk FLTK)
+               $(cmake_use_find_package alsa Alsa)
+               $(cmake_use_find_package doc Doxygen)
+               $(cmake_use_find_package fltk FLTK)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
-       use doc && cmake-utils_src_compile doc
+       cmake_src_compile
+       use doc && cmake_src_compile doc
 }
 
 src_install() {
        use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-       cmake-utils_src_install
+       cmake_src_install
        insinto /usr/share/${PN}
        doins -r instruments/*
 }