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 E42501382C5 for ; Wed, 1 Jul 2020 14:17:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 368A5E0973; Wed, 1 Jul 2020 14:17:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 130C0E0973 for ; Wed, 1 Jul 2020 14:17:24 +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 D6C0034F2D3 for ; Wed, 1 Jul 2020 14:17:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 551D4274 for ; Wed, 1 Jul 2020 14:17:21 +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: <1593612987.d6eec871cd9da061cd912294d47ba1de231b514c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/scribus/Manifest app-office/scribus/scribus-1.5.5_p20200626.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: d6eec871cd9da061cd912294d47ba1de231b514c X-VCS-Branch: master Date: Wed, 1 Jul 2020 14:17:21 +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: b77c40f8-a8a4-4949-8e3e-a5281a740172 X-Archives-Hash: cf822ebc890e0fbed014a66367bb49b8 commit: d6eec871cd9da061cd912294d47ba1de231b514c Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jul 1 13:43:52 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jul 1 14:16:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6eec871 app-office/scribus: 1.5.5_p20200626 snapshot bump w/ python3 support Bug: https://bugs.gentoo.org/719938 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/scribus/Manifest | 1 + ...scribus-9999.ebuild => scribus-1.5.5_p20200626.ebuild} | 15 ++++++++------- app-office/scribus/scribus-9999.ebuild | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index e8d12ffa74f..823daf4f2db 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1 +1,2 @@ DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50 +DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245 diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-1.5.5_p20200626.ebuild similarity index 92% copy from app-office/scribus/scribus-9999.ebuild copy to app-office/scribus/scribus-1.5.5_p20200626.ebuild index d532762422e..a017d67eb01 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-1.5.5_p20200626.ebuild @@ -3,19 +3,18 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) PYTHON_REQ_USE="tk?" -inherit cmake desktop flag-o-matic python-single-r1 subversion xdg +COMMIT=aa84120d97003a03d883db33ea9a6ad28550e59a +inherit cmake desktop flag-o-matic python-single-r1 xdg DESCRIPTION="Desktop publishing (DTP) and layout program" HOMEPAGE="https://www.scribus.net/" -SRC_URI="" -ESVN_REPO_URI="svn://scribus.net/trunk/Scribus" -ESVN_PROJECT=Scribus-1.5 +SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -58,8 +57,8 @@ DEPEND="${PYTHON_DEPS} virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.67:= ) - hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) + hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( @@ -82,6 +81,8 @@ PATCHES=( CMAKE_BUILD_TYPE="Release" +S="${WORKDIR}"/${PN}-${COMMIT} + src_prepare() { cmake_src_prepare diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index d532762422e..944a609bb5c 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) PYTHON_REQ_USE="tk?" inherit cmake desktop flag-o-matic python-single-r1 subversion xdg @@ -58,8 +58,8 @@ DEPEND="${PYTHON_DEPS} virtual/jpeg:0= >=x11-libs/cairo-1.10.0[X,svg] boost? ( >=dev-libs/boost-1.67:= ) - hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) + hunspell? ( app-text/hunspell:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? (