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 DEB2D158451 for ; Tue, 9 Jan 2024 03:27:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A22F02BC01E; Tue, 9 Jan 2024 03:27:58 +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 7B7942BC01E for ; Tue, 9 Jan 2024 03:27:58 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0651C3432B8 for ; Tue, 9 Jan 2024 03:27:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 305731082 for ; Tue, 9 Jan 2024 03:27:55 +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: <1704770826.42bb17eae7aa44047350038300ed8a2e15452690.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/pkgcore/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/pkgcore/pkgcore-0.12.23-r1.ebuild sys-apps/pkgcore/pkgcore-0.12.23.ebuild sys-apps/pkgcore/pkgcore-0.12.24.ebuild sys-apps/pkgcore/pkgcore-9999.ebuild X-VCS-Directories: sys-apps/pkgcore/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 42bb17eae7aa44047350038300ed8a2e15452690 X-VCS-Branch: master Date: Tue, 9 Jan 2024 03:27:55 +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: 233d3cf5-e137-4f15-81cc-b7ea7334a956 X-Archives-Hash: 2726727587e4a889f78d9a3cfd84d69c commit: 42bb17eae7aa44047350038300ed8a2e15452690 Author: Eli Schwartz gmail com> AuthorDate: Mon Jan 1 05:26:18 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 9 03:27:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42bb17ea sys-apps/pkgcore: depend on snakeoil at build time too Using --buildpkgonly, this fails to build. The build backend imports snakeoil to generate the version number, so it must be available. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> sys-apps/pkgcore/pkgcore-0.12.23-r1.ebuild | 13 ++++++++----- sys-apps/pkgcore/pkgcore-0.12.23.ebuild | 13 ++++++++----- sys-apps/pkgcore/pkgcore-0.12.24.ebuild | 15 +++++++++------ sys-apps/pkgcore/pkgcore-9999.ebuild | 13 ++++++++----- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/sys-apps/pkgcore/pkgcore-0.12.23-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.23-r1.ebuild index dd0437c0c1fd..e976a4ab907a 100644 --- a/sys-apps/pkgcore/pkgcore-0.12.23-r1.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.12.23-r1.ebuild @@ -22,16 +22,19 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore" LICENSE="BSD MIT" SLOT="0" +if [[ ${PV} == *9999 ]]; then + COMMON_DEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" +else + COMMON_DEPEND=">=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]" +fi + RDEPEND=" + ${COMMON_DEPEND} >=app-shells/bash-5.0[readline] dev-python/lxml[${PYTHON_USEDEP}] " -if [[ ${PV} == *9999 ]]; then - RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" -else - RDEPEND+=" >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]" -fi BDEPEND=" + ${COMMON_DEPEND} >=dev-python/flit-core-3.8[${PYTHON_USEDEP}] test? ( dev-vcs/git diff --git a/sys-apps/pkgcore/pkgcore-0.12.23.ebuild b/sys-apps/pkgcore/pkgcore-0.12.23.ebuild index 5b1d3415ec55..eb2065fe8341 100644 --- a/sys-apps/pkgcore/pkgcore-0.12.23.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.12.23.ebuild @@ -22,16 +22,19 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore" LICENSE="BSD MIT" SLOT="0" +if [[ ${PV} == *9999 ]]; then + COMMON_DEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" +else + COMMON_DEPEND=">=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]" +fi + RDEPEND=" + ${COMMON_DEPEND} >=app-shells/bash-5.0[readline] dev-python/lxml[${PYTHON_USEDEP}] " -if [[ ${PV} == *9999 ]]; then - RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" -else - RDEPEND+=" >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]" -fi BDEPEND=" + ${COMMON_DEPEND} >=dev-python/flit-core-3.8[${PYTHON_USEDEP}] test? ( dev-vcs/git diff --git a/sys-apps/pkgcore/pkgcore-0.12.24.ebuild b/sys-apps/pkgcore/pkgcore-0.12.24.ebuild index 5b1d3415ec55..d0d06f8a6b4e 100644 --- a/sys-apps/pkgcore/pkgcore-0.12.24.ebuild +++ b/sys-apps/pkgcore/pkgcore-0.12.24.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,16 +22,19 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore" LICENSE="BSD MIT" SLOT="0" +if [[ ${PV} == *9999 ]]; then + COMMON_DEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" +else + COMMON_DEPEND=">=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]" +fi + RDEPEND=" + ${COMMON_DEPEND} >=app-shells/bash-5.0[readline] dev-python/lxml[${PYTHON_USEDEP}] " -if [[ ${PV} == *9999 ]]; then - RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" -else - RDEPEND+=" >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]" -fi BDEPEND=" + ${COMMON_DEPEND} >=dev-python/flit-core-3.8[${PYTHON_USEDEP}] test? ( dev-vcs/git diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild index 3f64d0ccb6e6..6258b5b378c7 100644 --- a/sys-apps/pkgcore/pkgcore-9999.ebuild +++ b/sys-apps/pkgcore/pkgcore-9999.ebuild @@ -22,16 +22,19 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore" LICENSE="BSD MIT" SLOT="0" +if [[ ${PV} == *9999 ]]; then + COMMON_DEPEND="~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" +else + COMMON_DEPEND=">=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]" +fi + RDEPEND=" + ${COMMON_DEPEND} >=app-shells/bash-5.0[readline] dev-python/lxml[${PYTHON_USEDEP}] " -if [[ ${PV} == *9999 ]]; then - RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" -else - RDEPEND+=" >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]" -fi BDEPEND=" + ${COMMON_DEPEND} >=dev-python/flit-core-3.8[${PYTHON_USEDEP}] test? ( dev-vcs/git