app-office/scribus: Switch to cmake.eclass and fix 9999

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index 88bcd5cc441053da2d5e7ebf7ae42afb8054a90e..fa0caa4e2469de4c38377fb1b981f05a3a2298b5 100644 (file)
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="tk?"
-inherit cmake-utils desktop flag-o-matic python-single-r1 xdg
+inherit cmake desktop flag-o-matic python-single-r1 xdg
 
 DESCRIPTION="Desktop publishing (DTP) and layout program"
 HOMEPAGE="https://www.scribus.net/"
@@ -78,7 +78,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        rm -r codegen/cheetah scribus/third_party/hyphen || die
 
@@ -124,11 +124,11 @@ src_configure() {
                -DWITH_PODOFO=$(usex pdf)
                -DWANT_NOTEMPLATES=$(usex !templates)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if ! use tk; then
                rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index da3a47d252066762b7534d85406bcca2823166a0..2fc0d19100822096bbf05ec00d82e6567735f228 100644 (file)
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -77,8 +77,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       default
-       _CMAKE_SRC_PREPARE_HAS_RUN=1
+       cmake_src_prepare
 
        rm -r codegen/cheetah scribus/third_party/hyphen || die