summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-09-29 01:31:45 +0100
committerSam James <sam@gentoo.org>2021-09-29 01:32:18 +0100
commit8c47b9f8bb0fa50692609f64318d01871cd55697 (patch)
treeb8227b2f995df781ba3a5b3fb2b9f1ddf1572e9b
parentnet-misc/memcached: 1.6.12 bump... (diff)
downloadgentoo-8c47b9f8bb0fa50692609f64318d01871cd55697.tar.gz
gentoo-8c47b9f8bb0fa50692609f64318d01871cd55697.tar.bz2
gentoo-8c47b9f8bb0fa50692609f64318d01871cd55697.zip
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@gentoo.org>
-rw-r--r--app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild (renamed from app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild)6
-rw-r--r--app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild (renamed from app-admin/puppet-agent/puppet-agent-7.10.0.ebuild)5
-rw-r--r--app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild (renamed from app-admin/puppet-agent/puppet-agent-7.11.0.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
index 22dc570bbd32..8ef74d148ca4 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
index 8621917db95a..77dd8d3fbcfa 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
index 302711db8e50..6e7e8d74150a 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}