From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 72156138334 for ; Tue, 31 Dec 2019 14:34:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97150E0E2B; Tue, 31 Dec 2019 14:34:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B039E0E30 for ; Tue, 31 Dec 2019 14:34:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D43BB34DD89 for ; Tue, 31 Dec 2019 14:34:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E45A43D for ; Tue, 31 Dec 2019 14:34:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1577802861.8f8c6827621d0aa475f92a2c19b9f530db3db114.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/csound/, media-sound/hydrogen/, media-libs/portmidi/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/portmidi/portmidi-217-r3.ebuild media-sound/csound/csound-6.13.0.ebuild media-sound/csound/csound-9999.ebuild media-sound/hydrogen/hydrogen-9999.ebuild media-sound/rosegarden/rosegarden-17.12.1.ebuild media-sound/rosegarden/rosegarden-19.06.ebuild media-sound/rosegarden/rosegarden-19.12.ebuild media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild X-VCS-Directories: media-sound/hydrogen/ media-libs/portmidi/ media-sound/rosegarden/ media-sound/csound/ media-sound/zynaddsubfx/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8f8c6827621d0aa475f92a2c19b9f530db3db114 X-VCS-Branch: master Date: Tue, 31 Dec 2019 14:34:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4a37769-a9b4-40c7-884f-f33a6e7567da X-Archives-Hash: 871d53a9e9c7303b59a575bc50374758 commit: 8f8c6827621d0aa475f92a2c19b9f530db3db114 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 30 18:15:41 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 31 14:34:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8c6827 */*: Switch proaudio proj packages to cmake.eclass Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/portmidi/portmidi-217-r3.ebuild | 10 +++++----- media-sound/csound/csound-6.13.0.ebuild | 9 ++++----- media-sound/csound/csound-9999.ebuild | 9 ++++----- media-sound/hydrogen/hydrogen-9999.ebuild | 10 +++++----- media-sound/rosegarden/rosegarden-17.12.1.ebuild | 6 +++--- media-sound/rosegarden/rosegarden-19.06.ebuild | 8 ++++---- media-sound/rosegarden/rosegarden-19.12.ebuild | 8 ++++---- media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild | 18 +++++++++--------- 8 files changed, 38 insertions(+), 40 deletions(-) diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild index f50b4e526ed..27dd06fd49d 100644 --- 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 bee79ef4877..e7d1d96b3f9 100644 --- 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 d6e3677445f..f29357886e4 100644 --- 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 db964f61425..9245c1140a0 100644 --- 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 34f80417db5..dac7760081c 100644 --- 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 eaedb77e195..a86fbbdda3e 100644 --- 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 43ed83b26b8..7ed9801029f 100644 --- 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 01b612a4bcd..72b00573167 100644 --- 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/* }