commit: 42bb17eae7aa44047350038300ed8a2e15452690 Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Mon Jan 1 05:26:18 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> 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
