From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 054FC138334 for ; Fri, 3 Jan 2020 07:24:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE615E09A5; Fri, 3 Jan 2020 07:24:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C64EFE09A5 for ; Fri, 3 Jan 2020 07:24:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A0BD34DE25 for ; Fri, 3 Jan 2020 07:24:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74FCBA8 for ; Fri, 3 Jan 2020 07:24:12 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1578036240.91e7091096936ef82d8ea76edc8b595a4d4f7d92.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/scribus-9999.ebuild X-VCS-Directories: app-office/scribus/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 91e7091096936ef82d8ea76edc8b595a4d4f7d92 X-VCS-Branch: master Date: Fri, 3 Jan 2020 07:24:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f33e4fe7-03c3-487f-8873-4aa849261909 X-Archives-Hash: d49f44c9b28186dbbec97bbfbbc1bee9 commit: 91e7091096936ef82d8ea76edc8b595a4d4f7d92 Author: Miroslav Šulc gentoo org> AuthorDate: Fri Jan 3 07:23:37 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jan 3 07:24:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e70910 app-office/scribus: fixed 9999 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 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 ac7b913c7f8..da3a47d2520 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