From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C48CC158017 for ; Wed, 29 Sep 2021 00:32:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0D8EE0845; Wed, 29 Sep 2021 00:32:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C33E6E0845 for ; Wed, 29 Sep 2021 00:32:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E796342F93 for ; Wed, 29 Sep 2021 00:32:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13361D0 for ; Wed, 29 Sep 2021 00:32:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1632875538.8c47b9f8bb0fa50692609f64318d01871cd55697.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-agent/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild app-admin/puppet-agent/puppet-agent-7.10.0.ebuild app-admin/puppet-agent/puppet-agent-7.11.0-r1.ebuild app-admin/puppet-agent/puppet-agent-7.11.0.ebuild X-VCS-Directories: app-admin/puppet-agent/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8c47b9f8bb0fa50692609f64318d01871cd55697 X-VCS-Branch: master Date: Wed, 29 Sep 2021 00:32:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b11d22e2-eaaa-4cc7-bf0a-ce363ab16384 X-Archives-Hash: 0a5daff23d3f171ea7d764dbed0aee26 commit: 8c47b9f8bb0fa50692609f64318d01871cd55697 Author: Sam James gentoo org> AuthorDate: Wed Sep 29 00:31:45 2021 +0000 Commit: Sam James gentoo 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 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}