commit: 8c47b9f8bb0fa50692609f64318d01871cd55697 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Sep 29 00:31:45 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Sep 29 00:32:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c47b9f8
app-admin/puppet-agent: add subslot dep on libcrypt We need this to ensure that the symlink we set doesn't become stale during the libxcrypt migration (despite being a binary package...) Bug: https://bugs.gentoo.org/809263 Signed-off-by: Sam James <sam <AT> gentoo.org> ...{puppet-agent-6.19.1-r1.ebuild => puppet-agent-6.19.1-r2.ebuild} | 6 ++++-- .../{puppet-agent-7.10.0.ebuild => puppet-agent-7.10.0-r1.ebuild} | 5 ++++- .../{puppet-agent-7.11.0.ebuild => puppet-agent-7.11.0-r1.ebuild} | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild b/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild similarity index 93% rename from app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild rename to app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild index 22dc570bbd3..8ef74d148ca 100644 --- a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild +++ b/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild @@ -14,13 +14,15 @@ KEYWORDS="amd64" IUSE="puppetdb selinux" RESTRICT="strip" +# virtual/libcrypt:= is in here despite being a pre-built package +# to ensure that the has_version logic for the symlink doesn't become stale CDEPEND="!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what acct-user/puppet - acct-group/puppet" - + acct-group/puppet + virtual/libcrypt:=" DEPEND=" ${CDEPEND} app-admin/augeas" diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild similarity index 92% rename from app-admin/puppet-agent/puppet-agent-7.10.0.ebuild rename to app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild index 8621917db95..77dd8d3fbcf 100644 --- a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild +++ b/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild @@ -14,12 +14,15 @@ KEYWORDS="amd64" IUSE="puppetdb selinux" RESTRICT="strip" +# virtual/libcrypt:= is in here despite being a pre-built package +# to ensure that the has_version logic for the symlink doesn't become stale CDEPEND="!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet - acct-group/puppet" + acct-group/puppet + virtual/libcrypt:=" DEPEND=" ${CDEPEND} diff --git a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild similarity index 92% rename from app-admin/puppet-agent/puppet-agent-7.11.0.ebuild rename to app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild index 302711db8e5..6e7e8d74150 100644 --- a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild +++ b/app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild @@ -14,12 +14,15 @@ KEYWORDS="~amd64" IUSE="puppetdb selinux" RESTRICT="strip" +# virtual/libcrypt:= is in here despite being a pre-built package +# to ensure that the has_version logic for the symlink doesn't become stale CDEPEND="!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet - acct-group/puppet" + acct-group/puppet + virtual/libcrypt:=" DEPEND=" ${CDEPEND}
