| 1 |
commit: 8c47b9f8bb0fa50692609f64318d01871cd55697 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 29 00:31:45 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 29 00:32:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c47b9f8 |
| 7 |
|
| 8 |
app-admin/puppet-agent: add subslot dep on libcrypt |
| 9 |
|
| 10 |
We need this to ensure that the symlink we set doesn't |
| 11 |
become stale during the libxcrypt migration (despite |
| 12 |
being a binary package...) |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/809263 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
...{puppet-agent-6.19.1-r1.ebuild => puppet-agent-6.19.1-r2.ebuild} | 6 ++++-- |
| 18 |
.../{puppet-agent-7.10.0.ebuild => puppet-agent-7.10.0-r1.ebuild} | 5 ++++- |
| 19 |
.../{puppet-agent-7.11.0.ebuild => puppet-agent-7.11.0-r1.ebuild} | 5 ++++- |
| 20 |
3 files changed, 12 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
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 |
| 23 |
similarity index 93% |
| 24 |
rename from app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild |
| 25 |
rename to app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild |
| 26 |
index 22dc570bbd3..8ef74d148ca 100644 |
| 27 |
--- a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild |
| 28 |
+++ b/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild |
| 29 |
@@ -14,13 +14,15 @@ KEYWORDS="amd64" |
| 30 |
IUSE="puppetdb selinux" |
| 31 |
RESTRICT="strip" |
| 32 |
|
| 33 |
+# virtual/libcrypt:= is in here despite being a pre-built package |
| 34 |
+# to ensure that the has_version logic for the symlink doesn't become stale |
| 35 |
CDEPEND="!app-admin/puppet |
| 36 |
!dev-ruby/hiera |
| 37 |
!dev-ruby/facter |
| 38 |
!app-emulation/virt-what |
| 39 |
acct-user/puppet |
| 40 |
- acct-group/puppet" |
| 41 |
- |
| 42 |
+ acct-group/puppet |
| 43 |
+ virtual/libcrypt:=" |
| 44 |
DEPEND=" |
| 45 |
${CDEPEND} |
| 46 |
app-admin/augeas" |
| 47 |
|
| 48 |
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 |
| 49 |
similarity index 92% |
| 50 |
rename from app-admin/puppet-agent/puppet-agent-7.10.0.ebuild |
| 51 |
rename to app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild |
| 52 |
index 8621917db95..77dd8d3fbcf 100644 |
| 53 |
--- a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild |
| 54 |
+++ b/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild |
| 55 |
@@ -14,12 +14,15 @@ KEYWORDS="amd64" |
| 56 |
IUSE="puppetdb selinux" |
| 57 |
RESTRICT="strip" |
| 58 |
|
| 59 |
+# virtual/libcrypt:= is in here despite being a pre-built package |
| 60 |
+# to ensure that the has_version logic for the symlink doesn't become stale |
| 61 |
CDEPEND="!app-admin/puppet |
| 62 |
!dev-ruby/hiera |
| 63 |
!dev-ruby/facter |
| 64 |
app-emulation/virt-what |
| 65 |
acct-user/puppet |
| 66 |
- acct-group/puppet" |
| 67 |
+ acct-group/puppet |
| 68 |
+ virtual/libcrypt:=" |
| 69 |
|
| 70 |
DEPEND=" |
| 71 |
${CDEPEND} |
| 72 |
|
| 73 |
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 |
| 74 |
similarity index 92% |
| 75 |
rename from app-admin/puppet-agent/puppet-agent-7.11.0.ebuild |
| 76 |
rename to app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild |
| 77 |
index 302711db8e5..6e7e8d74150 100644 |
| 78 |
--- a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild |
| 79 |
+++ b/app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild |
| 80 |
@@ -14,12 +14,15 @@ KEYWORDS="~amd64" |
| 81 |
IUSE="puppetdb selinux" |
| 82 |
RESTRICT="strip" |
| 83 |
|
| 84 |
+# virtual/libcrypt:= is in here despite being a pre-built package |
| 85 |
+# to ensure that the has_version logic for the symlink doesn't become stale |
| 86 |
CDEPEND="!app-admin/puppet |
| 87 |
!dev-ruby/hiera |
| 88 |
!dev-ruby/facter |
| 89 |
app-emulation/virt-what |
| 90 |
acct-user/puppet |
| 91 |
- acct-group/puppet" |
| 92 |
+ acct-group/puppet |
| 93 |
+ virtual/libcrypt:=" |
| 94 |
|
| 95 |
DEPEND=" |
| 96 |
${CDEPEND} |
Archives