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 A50B9158086 for ; Tue, 23 Nov 2021 17:16:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD7ADE08DD; Tue, 23 Nov 2021 17:16:03 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84506E08DD for ; Tue, 23 Nov 2021 17:16:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 878DE342F8F for ; Tue, 23 Nov 2021 17:16:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 087781EF for ; Tue, 23 Nov 2021 17:16:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1637687749.06501a0cf4ae65f885b8b1b83b0db413bc37d34d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad-packages3d/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild X-VCS-Directories: sci-electronics/kicad-packages3d/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 06501a0cf4ae65f885b8b1b83b0db413bc37d34d X-VCS-Branch: master Date: Tue, 23 Nov 2021 17:16:00 +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: 13109edb-666c-45b5-99e2-6c07bf9ac0d2 X-Archives-Hash: 19a93f80d4237c2dd02584da8a075170 commit: 06501a0cf4ae65f885b8b1b83b0db413bc37d34d Author: Sam James gentoo org> AuthorDate: Tue Nov 23 17:11:04 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 23 17:15:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06501a0c sci-electronics/kicad-packages3d: fix deps/keyword order for 9999 Signed-off-by: Sam James gentoo.org> .../kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild | 10 +++++++--- .../kicad-packages3d/kicad-packages3d-9999.ebuild | 12 +++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild index a01ce4d34d88..7fa4fa86d8b6 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ else MY_PV="${PV/_rc/-rc}" MY_P="${PN}-${MY_PV}" SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~arm64" + KEYWORDS="~amd64 ~arm64 ~x86" S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d" fi @@ -25,9 +25,13 @@ IUSE="+occ" LICENSE="CC-BY-SA-4.0" SLOT="0" -DEPEND="" RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]" +if [[ ${PV} == 9999 ]] ; then + # x11-misc-util/macros only required on live ebuilds + BDEPEND=">=x11-misc/util-macros-1.18" +fi + # TODO fix this (ezzieyguywuf) S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d" diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild index 2c4be3dd9690..e241c3447f5a 100644 --- a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild +++ b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,21 +11,23 @@ HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git" inherit git-r3 - # x11-misc-util/macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" else MY_PV="${PV/_rc/-rc}" MY_P="${PN}-${MY_PV}" SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN/3d/3D}-${MY_PV}" # check for directory hash - KEYWORDS="~amd64 ~x86 ~arm64" + KEYWORDS="~amd64 ~arm64 ~x86" fi IUSE="+occ" LICENSE="CC-BY-SA-4.0" SLOT="0" -DEPEND="" RDEPEND=">=sci-electronics/kicad-5.99[occ=]" +if [[ ${PV} == 9999 ]] ; then + # x11-misc-util/macros only required on live ebuilds + BDEPEND=">=x11-misc/util-macros-1.18" +fi + CHECKREQS_DISK_BUILD="11G"