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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 55F0F158087 for ; Sat, 22 Jan 2022 19:35:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68CC42BC009; Sat, 22 Jan 2022 19:35:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 314322BC009 for ; Sat, 22 Jan 2022 19:35:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 179F4343155 for ; Sat, 22 Jan 2022 19:35:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A4BB2A4 for ; Sat, 22 Jan 2022 19:35:41 +0000 (UTC) From: "Andreas K. Hüttel" 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 K. Hüttel" Message-ID: <1642880053.04075de4c2049b5cc6f30857beedab1009493477.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/inkscape-9999.ebuild X-VCS-Directories: media-gfx/inkscape/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 04075de4c2049b5cc6f30857beedab1009493477 X-VCS-Branch: master Date: Sat, 22 Jan 2022 19:35:41 +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: e097958c-d462-4247-894e-aedbf5139ea6 X-Archives-Hash: fd130a27ce68c80703dbad5d37733120 commit: 04075de4c2049b5cc6f30857beedab1009493477 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Jan 22 19:34:13 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Jan 22 19:34:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04075de4 media-gfx/inkscape: Fix up live ebuild Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas K. Hüttel gentoo.org> media-gfx/inkscape/inkscape-9999.ebuild | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index df45f11b2dc0..863a38c311f8 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -6,15 +6,21 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" MY_P="${P/_/}" -inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3 +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" +else + SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi DESCRIPTION="SVG based generic vector-drawing program" HOMEPAGE="https://inkscape.org/" -EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="" IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg" @@ -105,6 +111,15 @@ pkg_pretend() { fi } +src_unpack() { + if [[ ${PV} = 9999* ]]; then + git-r3_src_unpack + else + default + fi + [[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die +} + src_prepare() { cmake_src_prepare sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die