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 97AF9138334 for ; Fri, 3 Jan 2020 20:07:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB655E0972; Fri, 3 Jan 2020 20:07:42 +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 ABEE8E0972 for ; Fri, 3 Jan 2020 20:07:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 630C234DECF for ; Fri, 3 Jan 2020 20:07:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB7EC17 for ; Fri, 3 Jan 2020 20:07:39 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1578082044.7e2afb61ddae9852e6a0834d00aabe6e8b1c8ded.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/scribus-1.5.5.ebuild app-office/scribus/scribus-9999.ebuild X-VCS-Directories: app-office/scribus/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7e2afb61ddae9852e6a0834d00aabe6e8b1c8ded X-VCS-Branch: master Date: Fri, 3 Jan 2020 20:07:39 +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: 1a2d562f-3a66-4055-bfc9-5fc050132a91 X-Archives-Hash: 551c6c33d6e9d3ebc52d4f731c469938 commit: 7e2afb61ddae9852e6a0834d00aabe6e8b1c8ded Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 3 20:06:58 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 3 20:07:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2afb61 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 gentoo.org> app-office/scribus/scribus-1.5.5.ebuild | 8 ++++---- app-office/scribus/scribus-9999.ebuild | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild index 88bcd5cc441..fa0caa4e246 100644 --- 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 da3a47d2520..2fc0d191008 100644 --- 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