commit: dc95daa201182c299cce95eff811217a1acd943b Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Tue May 15 15:10:13 2018 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Tue May 15 15:26:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc95daa2
app-admin/puppet-agent: 5.5.1 and 1.10.12 stable amd64 and x86 Package-Manager: Portage-2.3.36, Repoman-2.3.9 app-admin/puppet-agent/Manifest | 4 - app-admin/puppet-agent/puppet-agent-1.10.10.ebuild | 111 --------------------- app-admin/puppet-agent/puppet-agent-1.10.12.ebuild | 6 +- app-admin/puppet-agent/puppet-agent-5.5.0.ebuild | 86 ---------------- app-admin/puppet-agent/puppet-agent-5.5.1.ebuild | 4 +- 5 files changed, 5 insertions(+), 206 deletions(-) diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest index e75a6fa344f..4de6d55530d 100644 --- a/app-admin/puppet-agent/Manifest +++ b/app-admin/puppet-agent/Manifest @@ -1,8 +1,4 @@ -DIST puppet-agent_1.10.10-1stretch_amd64.deb 15422814 BLAKE2B 77d23e6b66620ab9718316f9c273cef86ed2c194cb234ab55765fd28178bbdbff963f9117a5fe904ebea4ffdb901f7e5386e1b75781fe497217e261d087bb57e SHA512 49d391f63197122f2d9e1505091e09d167873255172edb6843e4e6ce28d257ca1d99ca2ec72647c349eb8367c43ef1d4390bbaa0d1aa46cab9b8bd4474c12376 -DIST puppet-agent_1.10.10-1stretch_i386.deb 16281012 BLAKE2B f03f59649724797b1f2366ce95ed1684dcfa5fa765840a7107d6b1803def4c4925a6913e44e10b72d4eac5235efb1565dadd995ac1a865c2a21e0d791d9e29d5 SHA512 2e6115b8fe16f888d315a940bed77b4a310528c5cba3d21a2d52013a6d5081f38f1120c5d5e5e19bdcab69c2836920687ac259320a1ca45d9e56210c86061e63 DIST puppet-agent_1.10.12-1stretch_amd64.deb 15443166 BLAKE2B 74c8465fd8cc98ca114acdc600c3f259072d64765cdd8308092b7177233d44656f429407520ead2e02494951f57f1c79b5dfe8c76b2dd7bba7c1316426746df8 SHA512 1391530be340ad0439260f7bd3df8ad251ffaa02fc2f358e4ff2189b8c64a0b2d0caab9f84b84b26ebe2176decef2a39d3114f6433ba6eacd962ff45e1e04c43 DIST puppet-agent_1.10.12-1stretch_i386.deb 16308082 BLAKE2B 6606c15aac51b28e9e8011168563dff9069b6b065f861c01f4fc768064fe266f83211fbc8fefebfe4bdf81c6220b5daa19f66a9214bd1f2ff53a3b1a2e87128a SHA512 fce0a3ac12afcc293fbdf3cc990407b82592228ed8ed609f4b98c17cea35c8e5ff5f47287880601fa80ac2f7fa608dfe00b3594a906d52bc2bd2e04117ccb856 -DIST puppet-agent_5.5.0-1stretch_amd64.deb 16911686 BLAKE2B c80fdd9aa00a060abb8a6ff5def8cba23e61766701bbded1290f559328a5f097742f47c2ed14ac18121002de3599ef50606b1cde82085148ea17836fdac98e35 SHA512 3fe56f65c01ca23e110d9f1e4ebeefd5fec00ad248c3e1ae663fa04918272f5e4077dde819b3343ab4142233b4e3f7c5b589bc5d52c409b78c5d00ab3aa21646 -DIST puppet-agent_5.5.0-1stretch_i386.deb 17631262 BLAKE2B bc67729d4222933f7f589e3ca1db2f0e8cddcf6cecb92293070db545a95b6c1552ce2b6b3365ea19ec87565e8cbff0112f801d217eb335644454f5eb01199362 SHA512 8daa15c589726c391f34908b7e6543ef7dd2e86724d40ae6a1a38803247e2cc41775211378dcdc04dbd5b43af50ac350b9b209a969488fae3c679056763b28c2 DIST puppet-agent_5.5.1-1stretch_amd64.deb 17325604 BLAKE2B 1fab815d5d238cb6a05da91a4a9645644915493b2117ff29b8ba258edab18084394c8054f37c5bcbee9bf903dabce5741d7ef4be0a94a0ec8c13ac4b825b8bca SHA512 c4c7ce50cf576a6b12ecee8b9a6c7969512b3625e7ea0f16cc4cd367cebee5271cdaf7cc084fe4d344b42ab6e200664fe7b167acd9cd0da23d2ff3cd9028d6f7 DIST puppet-agent_5.5.1-1stretch_i386.deb 18063690 BLAKE2B ea7c7068e57da1249c1b1c7232e1af673840b0c8c7e5795574ffcb1861c68683ac9f21f8f4216272130b12a61bb8b324e49d6bf7f0c3d314857fd2591a7ad6ff SHA512 1a64616191a5143b150fe1d145ea786233ab763e87d5fe86bd1b3306fa73bab60d2f3d5c0bb7fcb6fe7c700a47a4c94c72eef1509732b18a5caf0fcd7f060602 diff --git a/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild deleted file mode 100644 index 63e1635600f..00000000000 --- a/app-admin/puppet-agent/puppet-agent-1.10.10.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils systemd unpacker user - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/"; -SRC_BASE="http://apt.puppetlabs.com/pool/stretch/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"; -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="experimental puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - app-portage/eix - sys-apps/dmidecode - sys-libs/glibc - >=sys-libs/readline-6.0 - <sys-libs/readline-7.0 - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )" - -S=${WORKDIR} - -QA_PREBUILT=" - /opt/puppetlabs/puppet - /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/* - /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/* - /opt/puppetlabs/puppet/lib/engines/* - /opt/puppetlabs/puppet/lib/virt-what/* - /opt/puppetlabs/puppet/lib/* - /opt/puppetlabs/puppet/bin/*" - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /var/run/puppet puppet -} - -src_prepare() { - if use experimental; then - epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch" - fi -} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - doconfd etc/default/pxp-agent - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - doins etc/logrotate.d/pxp-agent - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit lib/systemd/system/puppet.service - systemd_dounit lib/systemd/system/mcollective.service - systemd_dounit lib/systemd/system/pxp-agent.service - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter - dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco - dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool - dosym ../../opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera -} diff --git a/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild index 053bc1d011d..22bc1d19c4a 100644 --- a/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild +++ b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit eutils systemd unpacker user DESCRIPTION="general puppet client utils along with mcollective hiera and facter" @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="experimental puppetdb selinux" RESTRICT="strip" @@ -67,6 +67,7 @@ src_prepare() { if use experimental; then epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch" fi + eapply_user } src_install() { @@ -76,7 +77,6 @@ src_install() { doconfd etc/default/pxp-agent # logrotate.d insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective doins etc/logrotate.d/pxp-agent # puppet itself insinto /etc/puppetlabs diff --git a/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild deleted file mode 100644 index 657676c3b82..00000000000 --- a/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils systemd unpacker user - -DESCRIPTION="general puppet client utils along with mcollective hiera and facter" -HOMEPAGE="https://puppetlabs.com/"; -SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"; -SRC_URI=" - amd64? ( ${SRC_BASE}_amd64.deb ) - x86? ( ${SRC_BASE}_i386.deb )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="puppetdb selinux" -RESTRICT="strip" - -CDEPEND="!app-admin/augeas - !app-admin/mcollective - !app-admin/puppet - !dev-ruby/hiera - !dev-ruby/facter - !app-emulation/virt-what" - -DEPEND=" - ${CDEPEND}" -RDEPEND="${CDEPEND} - app-portage/eix - sys-apps/dmidecode - sys-libs/glibc - sys-libs/readline:0/7 - sys-libs/ncurses:0[tinfo] - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" - -S=${WORKDIR} - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /var/run/puppet puppet -} - -src_install() { - # conf.d - doconfd etc/default/puppet - doconfd etc/default/mcollective - doconfd etc/default/pxp-agent - # logrotate.d - insinto /etc/logrotate.d - doins etc/logrotate.d/mcollective - doins etc/logrotate.d/pxp-agent - # puppet itself - insinto /etc/puppetlabs - doins -r etc/puppetlabs/* - # logdir for systemd - dodir var/log/puppetlabs/puppet/ - fperms 0750 var/log/puppetlabs/puppet/ - # the rest - insinto /opt - dodir opt/puppetlabs/puppet/cache - doins -r opt/* - fperms 0750 /opt/puppetlabs/puppet/cache - # init - newinitd "${FILESDIR}/puppet.initd" puppet - newinitd "${FILESDIR}/mcollective.initd" mcollective - systemd_dounit lib/systemd/system/puppet.service - systemd_dounit lib/systemd/system/mcollective.service - systemd_dounit lib/systemd/system/pxp-agent.service - systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf - # symlinks - chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" - chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" - dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter - dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera - dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco - dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived - dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse - dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool -} diff --git a/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild index f006c5cc9d5..784b06891e1 100644 --- a/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild +++ b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 inherit eutils systemd unpacker user DESCRIPTION="general puppet client utils along with mcollective hiera and facter" @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="puppetdb selinux" RESTRICT="strip"
