# diff -u /mnt/repos/{gentoo,fixes}/app-office/scribus/scribus-9999.ebuild --- /mnt/repos/gentoo/app-office/scribus/scribus-9999.ebuild 2019-11-08 17:36:03.176543000 -0500 +++ /mnt/repos/fixes/app-office/scribus/scribus-9999.ebuild 2020-01-01 22:04:59.549652000 -0500 @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_6 python3_7 python3_8 ) PYTHON_REQ_USE="tk?" -inherit cmake-utils desktop flag-o-matic python-single-r1 subversion xdg +inherit cmake desktop flag-o-matic python-single-r1 subversion xdg DESCRIPTION="Desktop publishing (DTP) and layout program" HOMEPAGE="https://www.scribus.net/" @@ -77,7 +77,8 @@ ) src_prepare() { - cmake-utils_src_prepare + default + _CMAKE_SRC_PREPARE_HAS_RUN=1 rm -r codegen/cheetah scribus/third_party/hyphen || die @@ -123,11 +124,11 @@ -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