Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-agent/
Date: Thu, 26 May 2022 04:43:44
Message-Id: 1653540216.45995a24ca91d8bf68eed596a26088bb85908e30.prometheanfire@gentoo
1 commit: 45995a24ca91d8bf68eed596a26088bb85908e30
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 26 04:42:46 2022 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Thu May 26 04:43:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45995a24
7
8 app-admin/puppet-agent: 7.14.0 cleanup
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 app-admin/puppet-agent/Manifest | 2 -
14 app-admin/puppet-agent/puppet-agent-7.14.0.ebuild | 91 -----------------------
15 2 files changed, 93 deletions(-)
16
17 diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
18 index cba5ee50f908..a51907050c14 100644
19 --- a/app-admin/puppet-agent/Manifest
20 +++ b/app-admin/puppet-agent/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST puppet-agent_7.14.0-1focal_amd64.deb 20339972 BLAKE2B 3e7a230e73c1eb7d96317e7877fc1bf5dbfb44f2e8faa65a1ba08ca3c7c22115458797e1bf33450d5f45c11ed0a96c2973a0d6a0a83d98739ad52c90fe45f3af SHA512 08cd94e1d5ed1a8827f43a60c80ab64a8370ecebab01cd9d8b6c36e99007a84d9b6d39a8a8eb6370b2e78f2360d4fc0b95bf85f8b59a38b44b4d94a4e266d4b7
23 -DIST puppet-agent_7.14.0-1focal_arm64.deb 19534676 BLAKE2B a809b4beb8c20ce2e45f1c2c552585403494ed2c0eca719077597106fcb91478bfe7cb12bcb420e5b093840fe41f4ae101c978df48690ea47940216dda7b293e SHA512 4d57fe41d6943b3b6d643f55aead3264ed4f4aedd280e8fc0ed8504a1f7e0da1e9a06e9d7e2b4916f2de2c6726b3dcff3ce8096d02503443ad6e74b0528177bc
24 DIST puppet-agent_7.15.0-1focal_amd64.deb 20342292 BLAKE2B 4d8a322182b10462353b4fb78b8a655765e6b91e31626c34126862cf27d7863ed6dcfdf6d8545c9bfb2be25e42bd0f3f34c5726885dc6508eb71aa09646e647a SHA512 b6887ef66c47fcfce7136e13ff96f7a8df8b11011fd9ec8cb01a79d8a7f7b77e43da63033d9c42446c4131ffe04e8bfaf5bdf70ba1cb6c37dcd1d6963024ef29
25 DIST puppet-agent_7.15.0-1focal_arm64.deb 19533904 BLAKE2B 234fc85f20df8bba9d1f33e84ac725326201984c041ab371dd645df2e6cce12b6c81481ceff01819dc884d3c8f6191d6e98aafbb78a6856733b4cc3255d0e905 SHA512 70f389bc29270317fc621ef7be2eea9764b490ae2da32fb3968bd2c966eec53ef7e65469ea7fd5069676e23feede48557575b9020783b50292b146cc17ae840e
26 DIST puppet-agent_7.16.0-1focal_amd64.deb 20349200 BLAKE2B 73a5bc404b988fc009b95e25ab906afdc56cf8a9b977d0974177bdd5dcf9c0882f10d7e56f05c054f2ff1ea89824879671f857d1f1bf41d4f725ae90994d24ac SHA512 57d58b0a4ea74f461e7820e1f99838eb3c357f1be5277623ce8bb5cdf6aa46696d53db7c64c16ede972bc01660f30ea19111d2495087032d412672564b8612f8
27
28 diff --git a/app-admin/puppet-agent/puppet-agent-7.14.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.14.0.ebuild
29 deleted file mode 100644
30 index 0776db0b3b8b..000000000000
31 --- a/app-admin/puppet-agent/puppet-agent-7.14.0.ebuild
32 +++ /dev/null
33 @@ -1,91 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -inherit systemd unpacker tmpfiles
39 -
40 -DESCRIPTION="general puppet client utils along with hiera and facter"
41 -HOMEPAGE="https://puppetlabs.com/"
42 -SRC_URI="amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb )
43 -arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_arm64.deb )"
44 -
45 -LICENSE="Apache-2.0"
46 -SLOT="0"
47 -KEYWORDS="amd64 ~arm64"
48 -IUSE="puppetdb selinux"
49 -RESTRICT="strip"
50 -
51 -# virtual/libcrypt:= is in here despite being a pre-built package
52 -# to ensure that the has_version logic for the symlink doesn't become stale
53 -CDEPEND="!app-admin/puppet
54 - !dev-ruby/hiera
55 - !dev-ruby/facter
56 - app-emulation/virt-what
57 - acct-user/puppet
58 - acct-group/puppet
59 - virtual/libcrypt:="
60 -
61 -DEPEND="
62 - ${CDEPEND}
63 - app-admin/augeas"
64 -RDEPEND="${CDEPEND}
65 - app-portage/eix
66 - sys-apps/dmidecode
67 - sys-libs/libselinux
68 - sys-libs/glibc
69 - sys-libs/readline:0/8
70 - sys-libs/libxcrypt[compat]
71 - sys-libs/ncurses:0[tinfo]
72 - selinux? (
73 - sys-libs/libselinux[ruby]
74 - sec-policy/selinux-puppet
75 - )
76 - puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
77 -
78 -S=${WORKDIR}
79 -
80 -QA_PREBUILT="*"
81 -
82 -src_install() {
83 - # conf.d
84 - doconfd etc/default/puppet
85 - doconfd etc/default/pxp-agent
86 - # logrotate.d
87 - insinto /etc/logrotate.d
88 - doins etc/logrotate.d/pxp-agent
89 - # puppet itself
90 - insinto /etc/puppetlabs
91 - doins -r etc/puppetlabs/*
92 - # logdir for systemd
93 - keepdir var/log/puppetlabs/puppet/
94 - chmod 0750 var/log/puppetlabs/puppet/
95 - # the rest
96 - insinto /opt
97 - dodir opt/puppetlabs/puppet/cache
98 - doins -r opt/*
99 - fperms 0750 /opt/puppetlabs/puppet/cache
100 - # init
101 - newinitd "${FILESDIR}/puppet.initd2" puppet
102 - systemd_dounit lib/systemd/system/puppet.service
103 - systemd_dounit lib/systemd/system/pxp-agent.service
104 - newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
105 - # symlinks
106 - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
107 - dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
108 - dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
109 - dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
110 -
111 - # Handling of the path to the crypt library during the ongoing migration
112 - # from glibc[crypt] to libxcrypt
113 - # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html
114 - if has_version "sys-libs/glibc[crypt]"; then
115 - local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1'
116 - else
117 - local crypt_target='../../../../usr/lib/libcrypt.so.1'
118 - fi
119 - dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1
120 -}
121 -
122 -pkg_postinst() {
123 - tmpfiles_process puppet-agent.conf
124 -}