commit: c0c32d814d2e63d0cfb05ac7127ab7697bc5f29d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Aug 19 20:18:33 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 19 20:19:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c32d81
sys-apps/portage: sort deps Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/portage/portage-3.0.50.ebuild | 16 ++++++++-------- sys-apps/portage/portage-9999.ebuild | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sys-apps/portage/portage-3.0.50.ebuild b/sys-apps/portage/portage-3.0.50.ebuild index 752d29f03855..f57dedf5b41b 100644 --- a/sys-apps/portage/portage-3.0.50.ebuild +++ b/sys-apps/portage/portage-3.0.50.ebuild @@ -31,30 +31,30 @@ RESTRICT="!test? ( test )" # setuptools is still needed as a workaround for Python 3.12+ for now. # https://github.com/mesonbuild/meson/issues/7702 - BDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) test? ( - dev-vcs/git dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-vcs/git ) " DEPEND=" ${PYTHON_DEPS} >=app-arch/tar-1.27 dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch + >=sys-apps/sed-4.0.5 + sys-devel/patch !build? ( $(python_gen_impl_dep 'ssl(+)') ) apidoc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/sphinx-epytext[${PYTHON_USEDEP}] ) doc? ( - app-text/xmlto ~app-text/docbook-xml-dtd-4.4 + app-text/xmlto ) " # Require sandbox-2.2 for bug #288863. @@ -62,25 +62,25 @@ DEPEND=" RDEPEND=" ${PYTHON_DEPS} acct-user/portage - app-arch/zstd >=app-arch/tar-1.27 + app-arch/zstd + >=app-misc/pax-utils-0.1.17 dev-lang/python-exec:2 >=sys-apps/baselayout-2.9 >=sys-apps/findutils-4.4 !build? ( >=app-admin/eselect-1.2 >=app-shells/bash-5.0:0 - >=sys-apps/sed-4.0.5 >=sec-keys/openpgp-keys-gentoo-release-20230329 + >=sys-apps/sed-4.0.5 rsync-verify? ( - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) - >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 752d29f03855..f57dedf5b41b 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -31,30 +31,30 @@ RESTRICT="!test? ( test )" # setuptools is still needed as a workaround for Python 3.12+ for now. # https://github.com/mesonbuild/meson/issues/7702 - BDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) test? ( - dev-vcs/git dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-vcs/git ) " DEPEND=" ${PYTHON_DEPS} >=app-arch/tar-1.27 dev-lang/python-exec:2 - >=sys-apps/sed-4.0.5 sys-devel/patch + >=sys-apps/sed-4.0.5 + sys-devel/patch !build? ( $(python_gen_impl_dep 'ssl(+)') ) apidoc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/sphinx-epytext[${PYTHON_USEDEP}] ) doc? ( - app-text/xmlto ~app-text/docbook-xml-dtd-4.4 + app-text/xmlto ) " # Require sandbox-2.2 for bug #288863. @@ -62,25 +62,25 @@ DEPEND=" RDEPEND=" ${PYTHON_DEPS} acct-user/portage - app-arch/zstd >=app-arch/tar-1.27 + app-arch/zstd + >=app-misc/pax-utils-0.1.17 dev-lang/python-exec:2 >=sys-apps/baselayout-2.9 >=sys-apps/findutils-4.4 !build? ( >=app-admin/eselect-1.2 >=app-shells/bash-5.0:0 - >=sys-apps/sed-4.0.5 >=sec-keys/openpgp-keys-gentoo-release-20230329 + >=sys-apps/sed-4.0.5 rsync-verify? ( - >=app-portage/gemato-14.5[${PYTHON_USEDEP}] >=app-crypt/gnupg-2.2.4-r2[ssl(-)] + >=app-portage/gemato-14.5[${PYTHON_USEDEP}] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) - >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3
