commit: 3a07366122f0949b3264f1d4037345e7a95a079f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Dec 31 12:57:48 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Dec 31 12:57:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a073661
sys-apps/portage: depend on fixed file for sandbox-2.30 Bug: https://bugs.gentoo.org/889046 Signed-off-by: Sam James <sam <AT> gentoo.org> ....0.38.1-r5.ebuild => portage-3.0.38.1-r6.ebuild} | 18 +++++++++++++----- ...ge-3.0.41-r1.ebuild => portage-3.0.41-r2.ebuild} | 21 +++++++++++++++------ ...rtage-3.0.42.ebuild => portage-3.0.42-r1.ebuild} | 21 +++++++++++++++------ sys-apps/portage/portage-9999.ebuild | 15 +++++++++++---- 4 files changed, 54 insertions(+), 21 deletions(-) diff --git a/sys-apps/portage/portage-3.0.38.1-r5.ebuild b/sys-apps/portage/portage-3.0.38.1-r6.ebuild similarity index 97% rename from sys-apps/portage/portage-3.0.38.1-r5.ebuild rename to sys-apps/portage/portage-3.0.38.1-r6.ebuild index 2f21f269366b..636d3faab4a1 100644 --- a/sys-apps/portage/portage-3.0.38.1-r5.ebuild +++ b/sys-apps/portage/portage-3.0.38.1-r6.ebuild @@ -22,7 +22,8 @@ RESTRICT="!test? ( test )" BDEPEND=" app-arch/xz-utils test? ( dev-vcs/git )" -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) +DEPEND=" + !build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch @@ -30,7 +31,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) apidoc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/sphinx-epytext[${PYTHON_USEDEP}] - )" + ) +" # Require sandbox-2.2 for bug #288863. # For whirlpool hash, require python[ssl] (bug #425046). # For compgen, require bash[readline] (bug #445576). @@ -63,13 +65,19 @@ RDEPEND=" !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0" + !~app-portage/repoman-3.0.0 +" +# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 - >=sys-apps/file-5.41 + || ( + >=sys-apps/file-5.44-r1 + =sys-apps/file-5.43-r2 + ) >=sys-apps/coreutils-6.4 - )" + ) +" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # NOTE: FEATURES=installsources requires debugedit and rsync diff --git a/sys-apps/portage/portage-3.0.41-r1.ebuild b/sys-apps/portage/portage-3.0.41-r2.ebuild similarity index 97% rename from sys-apps/portage/portage-3.0.41-r1.ebuild rename to sys-apps/portage/portage-3.0.41-r2.ebuild index 7c0dd5a89947..7654a8382e76 100644 --- a/sys-apps/portage/portage-3.0.41-r1.ebuild +++ b/sys-apps/portage/portage-3.0.41-r2.ebuild @@ -21,8 +21,10 @@ RESTRICT="!test? ( test )" BDEPEND=" app-arch/xz-utils - test? ( dev-vcs/git )" -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + test? ( dev-vcs/git ) +" +DEPEND=" + !build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch @@ -30,7 +32,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) apidoc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/sphinx-epytext[${PYTHON_USEDEP}] - )" + ) +" # Require sandbox-2.2 for bug #288863. # For whirlpool hash, require python[ssl] (bug #425046). # For compgen, require bash[readline] (bug #445576). @@ -63,13 +66,19 @@ RDEPEND=" !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0" + !~app-portage/repoman-3.0.0 +" +# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 - >=sys-apps/file-5.41 + || ( + >=sys-apps/file-5.44-r1 + =sys-apps/file-5.43-r2 + ) >=sys-apps/coreutils-6.4 - )" + ) +" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # NOTE: FEATURES=installsources requires debugedit and rsync diff --git a/sys-apps/portage/portage-3.0.42.ebuild b/sys-apps/portage/portage-3.0.42-r1.ebuild similarity index 97% rename from sys-apps/portage/portage-3.0.42.ebuild rename to sys-apps/portage/portage-3.0.42-r1.ebuild index f01eddfc50ae..cba50d3d026d 100644 --- a/sys-apps/portage/portage-3.0.42.ebuild +++ b/sys-apps/portage/portage-3.0.42-r1.ebuild @@ -21,8 +21,10 @@ RESTRICT="!test? ( test )" BDEPEND=" app-arch/xz-utils - test? ( dev-vcs/git )" -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + test? ( dev-vcs/git ) +" +DEPEND=" + !build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch @@ -30,7 +32,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) apidoc? ( dev-python/sphinx[${PYTHON_USEDEP}] dev-python/sphinx-epytext[${PYTHON_USEDEP}] - )" + ) +" # Require sandbox-2.2 for bug #288863. # For whirlpool hash, require python[ssl] (bug #425046). # For compgen, require bash[readline] (bug #445576). @@ -63,13 +66,19 @@ RDEPEND=" !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 - !~app-portage/repoman-3.0.0" + !~app-portage/repoman-3.0.0 +" +# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 - >=sys-apps/file-5.41 + || ( + >=sys-apps/file-5.44-r1 + =sys-apps/file-5.43-r2 + ) >=sys-apps/coreutils-6.4 - )" + ) +" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # NOTE: FEATURES=installsources requires debugedit and rsync diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index f44665dcdb56..27741e2fdd31 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -21,8 +21,10 @@ IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux RESTRICT="!test? ( test )" BDEPEND=" - test? ( dev-vcs/git )" -DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) + test? ( dev-vcs/git ) +" +DEPEND=" + !build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch @@ -64,12 +66,17 @@ RDEPEND=" !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 !~app-portage/repoman-3.0.0" +# Weird dep construct for sys-apps/file can be removed once >=file-5.44-r1 stable PDEPEND=" !build? ( >=net-misc/rsync-2.6.4 - >=sys-apps/file-5.41 + || ( + >=sys-apps/file-5.44-r1 + =sys-apps/file-5.43-r2 + ) >=sys-apps/coreutils-6.4 - )" + ) +" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # NOTE: FEATURES=installsources requires debugedit and rsync
