diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-12 00:44:17 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-01-12 00:51:30 +0100 |
commit | fc13399e284cead2bf4edea963e5613e4d093335 (patch) | |
tree | abe3e7e48d182d31af63e9cdc3c25207b0fe971b | |
parent | x11-drivers/nvidia-drivers: Old (diff) | |
download | gentoo-fc13399e284cead2bf4edea963e5613e4d093335.tar.gz gentoo-fc13399e284cead2bf4edea963e5613e4d093335.tar.bz2 gentoo-fc13399e284cead2bf4edea963e5613e4d093335.zip |
*/*: Switch Perlovka's ebuilds to cmake.eclass
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r-- | dev-libs/libarcus/libarcus-4.2.0.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/libarcus/libarcus-4.3.0.ebuild | 6 | ||||
-rw-r--r-- | dev-libs/libcharon/libcharon-4.2.0.ebuild | 2 | ||||
-rw-r--r-- | dev-libs/libcharon/libcharon-4.3.0.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/libsavitar/libsavitar-4.2.0.ebuild | 4 | ||||
-rw-r--r-- | dev-libs/libsavitar/libsavitar-4.3.0.ebuild | 6 | ||||
-rw-r--r-- | dev-python/uranium/uranium-4.2.0.ebuild | 16 | ||||
-rw-r--r-- | dev-python/uranium/uranium-4.3.0.ebuild | 16 | ||||
-rw-r--r-- | media-gfx/cura/cura-4.2.1.ebuild | 8 | ||||
-rw-r--r-- | media-gfx/cura/cura-4.3.0.ebuild | 8 | ||||
-rw-r--r-- | media-gfx/curaengine/curaengine-4.2.0.ebuild | 6 | ||||
-rw-r--r-- | media-gfx/curaengine/curaengine-4.3.0.ebuild | 6 | ||||
-rw-r--r-- | media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild | 2 | ||||
-rw-r--r-- | media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild | 2 |
14 files changed, 47 insertions, 43 deletions
diff --git a/dev-libs/libarcus/libarcus-4.2.0.ebuild b/dev-libs/libarcus/libarcus-4.2.0.ebuild index 1c7ede9b949c..deb2605d5649 100644 --- a/dev-libs/libarcus/libarcus-4.2.0.ebuild +++ b/dev-libs/libarcus/libarcus-4.2.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 +inherit cmake python-single-r1 MY_PN="libArcus" @@ -38,5 +38,5 @@ src_configure() { -DBUILD_STATIC=$(usex static-libs ON OFF) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/dev-libs/libarcus/libarcus-4.3.0.ebuild b/dev-libs/libarcus/libarcus-4.3.0.ebuild index a021b6d2dfa1..0869769e8f5b 100644 --- a/dev-libs/libarcus/libarcus-4.3.0.ebuild +++ b/dev-libs/libarcus/libarcus-4.3.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 +inherit cmake python-single-r1 MY_PN="libArcus" @@ -38,7 +38,7 @@ src_prepare() { sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -48,5 +48,5 @@ src_configure() { -DBUILD_STATIC=$(usex static-libs ON OFF) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/dev-libs/libcharon/libcharon-4.2.0.ebuild b/dev-libs/libcharon/libcharon-4.2.0.ebuild index 1d3eec7064d6..f216952ac7f4 100644 --- a/dev-libs/libcharon/libcharon-4.2.0.ebuild +++ b/dev-libs/libcharon/libcharon-4.2.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 +inherit cmake python-single-r1 MY_PN="libCharon" diff --git a/dev-libs/libcharon/libcharon-4.3.0.ebuild b/dev-libs/libcharon/libcharon-4.3.0.ebuild index 4b4f9516eddc..cf5a18458b03 100644 --- a/dev-libs/libcharon/libcharon-4.3.0.ebuild +++ b/dev-libs/libcharon/libcharon-4.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 +inherit cmake python-single-r1 MY_PN="libCharon" @@ -26,5 +26,5 @@ src_prepare() { # Use current python version, not the latest installed sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild index 4c15ddaee247..26c10c69fca2 100644 --- a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 +inherit cmake python-single-r1 MY_PN="libSavitar" @@ -38,5 +38,5 @@ src_configure() { -DBUILD_STATIC=$(usex static-libs ON OFF) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild index 4ddf5a3e942d..1b2ed0ae3c2b 100644 --- a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild +++ b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 +inherit cmake python-single-r1 MY_PN="libSavitar" @@ -37,7 +37,7 @@ src_prepare() { sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -46,5 +46,5 @@ src_configure() { -DBUILD_STATIC=$(usex static-libs ON OFF) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild index 2b2c66367c38..8b3f307a109c 100644 --- a/dev-python/uranium/uranium-4.2.0.ebuild +++ b/dev-python/uranium/uranium-4.2.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 +inherit cmake python-single-r1 MY_PN="Uranium" @@ -17,9 +17,10 @@ LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug doc test" -RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + BDEPEND="${PYTHON_DEPS} sys-devel/gettext doc? ( app-doc/doxygen ) @@ -44,8 +45,9 @@ S="${WORKDIR}/${MY_PN}-${PV}" src_configure() { local mycmakeargs=( - -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" ) - cmake-utils_src_configure + -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" + ) + cmake_src_configure if ! use debug; then sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die @@ -54,14 +56,14 @@ src_configure() { } src_compile() { - cmake-utils_src_compile + cmake_src_compile if use doc; then - cmake-utils_src_compile doc + cmake_src_compile doc DOCS+=( html ) fi } src_install() { - cmake-utils_src_install + cmake_src_install python_optimize "${D}/usr/$(get_libdir)" } diff --git a/dev-python/uranium/uranium-4.3.0.ebuild b/dev-python/uranium/uranium-4.3.0.ebuild index e0867d59d2f8..4ca593a01581 100644 --- a/dev-python/uranium/uranium-4.3.0.ebuild +++ b/dev-python/uranium/uranium-4.3.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils python-single-r1 +inherit cmake python-single-r1 MY_PN="Uranium" @@ -17,9 +17,10 @@ LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug doc test" -RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + BDEPEND="${PYTHON_DEPS} sys-devel/gettext doc? ( app-doc/doxygen ) @@ -47,8 +48,9 @@ S="${WORKDIR}/${MY_PN}-${PV}" src_configure() { local mycmakeargs=( - -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" ) - cmake-utils_src_configure + -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" + ) + cmake_src_configure if ! use debug; then sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die @@ -57,14 +59,14 @@ src_configure() { } src_compile() { - cmake-utils_src_compile + cmake_src_compile if use doc; then - cmake-utils_src_compile doc + cmake_src_compile doc DOCS+=( html ) fi } src_install() { - cmake-utils_src_install + cmake_src_install python_optimize "${D}/usr/$(get_libdir)" } diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild index 5068f8f59f73..ba1e9563f25e 100644 --- a/media-gfx/cura/cura-4.2.1.ebuild +++ b/media-gfx/cura/cura-4.2.1.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils desktop python-single-r1 xdg +inherit cmake desktop python-single-r1 xdg MY_PN=Cura @@ -36,18 +36,18 @@ S="${WORKDIR}/${MY_PN}-${PV}" src_prepare() { sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { local mycmakeargs=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install doicon icons/*.png python_optimize "${D}${get_libdir}" } diff --git a/media-gfx/cura/cura-4.3.0.ebuild b/media-gfx/cura/cura-4.3.0.ebuild index 5068f8f59f73..ba1e9563f25e 100644 --- a/media-gfx/cura/cura-4.3.0.ebuild +++ b/media-gfx/cura/cura-4.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_6 ) -inherit cmake-utils desktop python-single-r1 xdg +inherit cmake desktop python-single-r1 xdg MY_PN=Cura @@ -36,18 +36,18 @@ S="${WORKDIR}/${MY_PN}-${PV}" src_prepare() { sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { local mycmakeargs=( -DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)" ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install doicon icons/*.png python_optimize "${D}${get_libdir}" } diff --git a/media-gfx/curaengine/curaengine-4.2.0.ebuild b/media-gfx/curaengine/curaengine-4.2.0.ebuild index 8fc2576a3f8f..775c51f9f076 100644 --- a/media-gfx/curaengine/curaengine-4.2.0.ebuild +++ b/media-gfx/curaengine/curaengine-4.2.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils toolchain-funcs +inherit cmake toolchain-funcs MY_PN="CuraEngine" @@ -45,11 +45,11 @@ pkg_pretend() { src_configure() { local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_make + cmake_build if use doc; then doxygen mv docs/html . || die diff --git a/media-gfx/curaengine/curaengine-4.3.0.ebuild b/media-gfx/curaengine/curaengine-4.3.0.ebuild index b2a9c9017ef2..3e767bdc29ba 100644 --- a/media-gfx/curaengine/curaengine-4.3.0.ebuild +++ b/media-gfx/curaengine/curaengine-4.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils toolchain-funcs +inherit cmake toolchain-funcs MY_PN="CuraEngine" @@ -31,11 +31,11 @@ S="${WORKDIR}/${MY_PN}-${PV}" src_configure() { local mycmakeargs=( "-DBUILD_TESTS=$(usex test ON OFF)" ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_make + cmake_build if use doc; then doxygen || die mv docs/html . || die diff --git a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild index e2cea43f6d83..54cf788eca53 100644 --- a/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild +++ b/media-gfx/fdm-materials/fdm-materials-4.2.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake MY_PN="fdm_materials" diff --git a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild b/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild index e2cea43f6d83..54cf788eca53 100644 --- a/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild +++ b/media-gfx/fdm-materials/fdm-materials-4.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake MY_PN="fdm_materials" |