*/*: Switch proxy-maint to cmake.eclass
authorAndreas Sturmlechner <asturm@gentoo.org>
Mon, 30 Dec 2019 19:12:17 +0000 (20:12 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sun, 19 Jan 2020 13:08:06 +0000 (14:08 +0100)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
20 files changed:
app-arch/innoextract/innoextract-1.8.ebuild
dev-db/cpp-driver/cpp-driver-2.11.0.ebuild
dev-libs/hyperscan/hyperscan-5.1.0.ebuild
dev-libs/hyperscan/hyperscan-5.1.1.ebuild
dev-libs/hyperscan/hyperscan-5.2.0.ebuild
dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild
dev-util/edb-debugger/edb-debugger-9999.ebuild
dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
mail-filter/rspamd/rspamd-2.2.ebuild
mail-filter/rspamd/rspamd-9999.ebuild
media-libs/libsoundio/libsoundio-2.0.0.ebuild
media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
media-sound/loudness-scanner/loudness-scanner-9999.ebuild
net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild
net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild
net-libs/tox/tox-0.2.10.ebuild
net-libs/tox/tox-0.2.9-r1.ebuild
net-libs/tox/tox-9999.ebuild

index b5df9fba5b816f1897aa603fe987683ba9041dd6..5c58d878b0ffd13cbce0d1578a95d0aa60b6e1e4 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A tool to unpack installers created by Inno Setup"
 HOMEPAGE="https://constexpr.org/innoextract/"
@@ -29,5 +29,5 @@ src_configure() {
                -DWITH_CONV=$(usex iconv iconv builtin)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 9413734574c64abc8321bba61024a2dfc9a34630..6ef9399da250b0cf1dfc717e4729c2cb7275535d 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="DataStax C/C++ Driver for Cassandra"
 HOMEPAGE="https://datastax.github.io/cpp-driver/"
@@ -24,5 +24,5 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
        local mycmakeargs=( -DCASS_USE_OPENSSL=$(usex ssl) )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 8cecb0a904af86d45f3a28271bd79fcbd94a2175..ec3fa0a718e45b6b2d80635db1f6cddfa98fc1e7 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-r1
+inherit cmake python-r1
 
 DESCRIPTION="High-performance regular expression matching library"
 HOMEPAGE="https://01.org/hyperscan"
@@ -33,5 +33,5 @@ src_configure() {
                -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
                -DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 6e6970b8c429fc38f9e60d9a64b4fcac3e3c8ef5..f21c9535c2df1efd3878223c04082d83f13496c7 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-r1 flag-o-matic
+inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
 SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -27,7 +27,7 @@ REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
 src_prepare() {
        # upstream workaround
        append-cxxflags -Wno-redundant-move
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -35,5 +35,5 @@ src_configure() {
                -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
                -DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 6e6970b8c429fc38f9e60d9a64b4fcac3e3c8ef5..f21c9535c2df1efd3878223c04082d83f13496c7 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-r1 flag-o-matic
+inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
 SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -27,7 +27,7 @@ REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
 src_prepare() {
        # upstream workaround
        append-cxxflags -Wno-redundant-move
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -35,5 +35,5 @@ src_configure() {
                -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
                -DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index c5dadbd7bf7f7fa499544f4fd7af20b031c72b37..bb8d77db7914111917ae0e7f5a17a0a43740158d 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
@@ -47,5 +47,5 @@ src_prepare() {
                sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
        fi
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
index 12fcafb7f2c31e452c5b99fc614f1d201e52e9f2..21c906d48591d7d1c59dafd1801c756a6da7b659 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
@@ -45,5 +45,5 @@ src_prepare() {
                sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
        fi
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
index b6517f3c57f33fa777dded4ce351d7f849c836e5..6ff5cb3e1c08301d10df5335e4df3e6c761821ec 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake git-r3
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
@@ -38,12 +38,12 @@ src_prepare() {
        if ! use graphviz; then
                sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
        fi
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
        local mycmakeargs=(
                -DBUILD_JUMBO=$(usex jumbo-build)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index b8d2337eeb5e60f04c945ab99cfd9a0000c77b63..f430b5be2790849995baffb9531e545230c4f78d 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -49,5 +49,5 @@ src_configure() {
                -DBUILD_TESTING=$(usex test)
                -DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index b8d2337eeb5e60f04c945ab99cfd9a0000c77b63..f430b5be2790849995baffb9531e545230c4f78d 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -49,5 +49,5 @@ src_configure() {
                -DBUILD_TESTING=$(usex test)
                -DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index c428effd2fe452bdc90e8aa692a0aa9f86f7a79b..dea0ef8dd70303f3df0eeff30314507b193cfc1c 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils pax-utils systemd tmpfiles
+inherit cmake pax-utils systemd tmpfiles
 
 if [[ ${PV} == *9999 ]] ; then
        EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -42,7 +42,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \
                || die "sed CMakeLists.txt failed"
@@ -63,15 +63,15 @@ src_configure() {
                -DENABLE_LUAJIT=$(usex jit ON OFF)
                -DENABLE_PCRE2=$(usex pcre2 ON OFF)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
-       cmake-utils_src_test
+       cmake_src_test
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        newconfd "${FILESDIR}"/rspamd.conf rspamd
        newinitd "${FILESDIR}/rspamd-r7.init" rspamd
index 3a11c07504fe6441c1ca4eb09195ddd3b86b12d3..c99c087f76d17170dcf78a5d10f57f722684db23 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils pax-utils systemd tmpfiles
+inherit cmake pax-utils systemd tmpfiles
 
 if [[ ${PV} == *9999 ]] ; then
        EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
@@ -42,7 +42,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -i -e 's/User=_rspamd/User=rspamd/g' \
                rspamd.service \
@@ -61,15 +61,15 @@ src_configure() {
                -DENABLE_LUAJIT=$(usex jit ON OFF)
                -DENABLE_PCRE2=$(usex pcre2 ON OFF)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
-       cmake-utils_src_test
+       cmake_src_test
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        newconfd "${FILESDIR}"/rspamd.conf rspamd
        newinitd "${FILESDIR}/rspamd-r7.init" rspamd
index 33ece577af324bf3d058e3b0c36f00e4c4f8a23f..3ea88b323db11c3e3e7e261b1e79afdaaa2d648c 100644 (file)
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="C library for cross-platform real-time audio input and output"
@@ -30,5 +31,5 @@ multilib_src_configure() {
                -DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples)
                -DBUILD_TESTS=no
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 725c5aaa0a4552ac2b420b9ec8a57f57a0e483d7..ee2ac482713c9dfd16697f49fba8886cfb3fe744 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Scans your music files and tags them with loudness information"
 HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
                "${S}"/scanner/inputaudio/input.c
 }
@@ -59,7 +59,7 @@ src_configure() {
                -DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
                -DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
index 4c6bb45b8be942d1d106bdfbd596b7b85ffc64e0..0608e103196a8dd9a8cd8188f741b6b98d7e45ba 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3
+inherit cmake git-r3
 
 DESCRIPTION="Scans your music files and tags them with loudness information"
 HOMEPAGE="https://github.com/jiixyj/loudness-scanner/"
@@ -38,7 +38,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \
                "${S}"/scanner/inputaudio/input.c
 }
@@ -57,7 +57,7 @@ src_configure() {
                -DDISABLE_RSVG2:BOOL=$(usex gtk no yes)
                -DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
index fc1c8f6ae91c9ca7c4073e810b306dcf5275f695..4a5341b2b8bb01ead2c68f42f8bf1bb3da23a0b5 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib cmake-utils
+inherit cmake
 
 DESCRIPTION="Signal Protocol C Library"
 HOMEPAGE="https://www.whispersystems.org/"
index e56f24c04c63b1d62fd112616c520da779a24527..b14bcd42a76daa9a011d649930aecab7cce8954b 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit git-r3 multilib cmake-utils
+inherit git-r3 cmake
 
 DESCRIPTION="Signal Protocol C Library"
 HOMEPAGE="https://www.whispersystems.org/"
index 11d676ea613713d9a5af578468e7ab1dbb08a68b..d8e4d1d2a74b8ed2c42e29a07159ee1c158509d2 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 MY_P="c-toxcore-${PV}"
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
@@ -38,7 +38,7 @@ RDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        #remove faulty tests
        for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
                sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
@@ -81,11 +81,11 @@ src_configure() {
                einfo "Logging disabled"
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use daemon; then
                newinitd "${FILESDIR}"/initd tox-dht-daemon
index 5307394b1288bd5bc16ef2b1940ee5580672456c..a6e9875d9fcb933e324334be2395049d16c5bd4a 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils systemd
+inherit cmake systemd
 
 MY_P="c-toxcore-${PV}"
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        #remove faulty tests
        for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
                sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
@@ -74,11 +74,11 @@ src_configure() {
                einfo "Logging disabled"
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use daemon; then
                newinitd "${FILESDIR}"/initd tox-dht-daemon
index 02c5345628225c6db1da89534886ed9555eb31d8..151001dd8ee220053cbb004a61c2938026447bfd 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3 systemd
+inherit cmake git-r3 systemd
 
 DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform"
 HOMEPAGE="https://tox.chat"
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        #remove faulty tests
        for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do
                sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die
@@ -74,11 +74,11 @@ src_configure() {
                mycmakeargs+=(-DMIN_LOGGER_LEVEL="")
                einfo "Logging Disabled"
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use daemon; then
                newinitd "${FILESDIR}"/initd tox-dht-daemon