commit:     32964d0c92402bd84b164852ca2a408f01211020
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 12:57:21 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 12:58:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32964d0c

sys-apps/portage: unconditionally depend on sec-keys/openpgp-keys-gentoo-release

It's useful for people to have it installed and this keeps emerge-webrsync
working even with USE=-rsync-verify. The keys are tiny and have no dependencies
themselves, so I don't see the value in trying to mangle the script with sed
to default to --no-pgp-verify or similar.

(It'd be different if we had a proper build system which would let us do it. 
Maybe.)

Closes: https://bugs.gentoo.org/905868
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../portage/{portage-3.0.48.1.ebuild => portage-3.0.48.1-r1.ebuild} | 6 +++---
 sys-apps/portage/portage-9999.ebuild                                | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-apps/portage/portage-3.0.48.1.ebuild 
b/sys-apps/portage/portage-3.0.48.1-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.48.1.ebuild
rename to sys-apps/portage/portage-3.0.48.1-r1.ebuild
index 07b36de0ea7e..9e5f7353bb48 100644
--- a/sys-apps/portage/portage-3.0.48.1.ebuild
+++ b/sys-apps/portage/portage-3.0.48.1-r1.ebuild
@@ -61,12 +61,12 @@ RDEPEND="
        >=sys-apps/baselayout-2.9
        >=sys-apps/findutils-4.4
        !build? (
-               >=sys-apps/sed-4.0.5
-               >=app-shells/bash-5.0:0[readline]
                >=app-admin/eselect-1.2
+               >=app-shells/bash-5.0:0[readline]
+               >=sys-apps/sed-4.0.5
+               >=sec-keys/openpgp-keys-gentoo-release-20230329
                rsync-verify? (
                        >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-                       >=sec-keys/openpgp-keys-gentoo-release-20220101
                        >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
                )
        )

diff --git a/sys-apps/portage/portage-9999.ebuild 
b/sys-apps/portage/portage-9999.ebuild
index 07b36de0ea7e..9e5f7353bb48 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -61,12 +61,12 @@ RDEPEND="
        >=sys-apps/baselayout-2.9
        >=sys-apps/findutils-4.4
        !build? (
-               >=sys-apps/sed-4.0.5
-               >=app-shells/bash-5.0:0[readline]
                >=app-admin/eselect-1.2
+               >=app-shells/bash-5.0:0[readline]
+               >=sys-apps/sed-4.0.5
+               >=sec-keys/openpgp-keys-gentoo-release-20230329
                rsync-verify? (
                        >=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-                       >=sec-keys/openpgp-keys-gentoo-release-20220101
                        >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
                )
        )

Reply via email to