From 91e7091096936ef82d8ea76edc8b595a4d4f7d92 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Miroslav=20=C5=A0ulc?= <fordfrog@gentoo.org>
Date: Fri, 3 Jan 2020 08:23:37 +0100
Subject: [PATCH] app-office/scribus: fixed 9999
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

1) added python3_8
2) switched from cmake-utils to cmake
3) removed unused config args

Bug: https://bugs.gentoo.org/691684
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Å ulc <fordfrog@gentoo.org>
---
 app-office/scribus/scribus-9999.ebuild | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index ac7b913c7f8e..da3a47d25206 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -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,7,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 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	default
+	_CMAKE_SRC_PREPARE_HAS_RUN=1
 
 	rm -r codegen/cheetah scribus/third_party/hyphen || die
 
@@ -109,8 +110,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DHAVE_PYTHON=ON
-		-DPYTHON_INCLUDE_PATH=$(python_get_includedir)
-		-DPYTHON_LIBRARY=$(python_get_library_path)
 		-DWANT_DISTROBUILD=ON
 		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
 		-DWITH_BOOST=$(usex boost)
@@ -123,11 +122,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
-- 
2.26.2