From 5b9a82aba230974c6c96826869f27e1b71fe3dfe Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Mon, 23 Jan 2017 19:07:42 -0600 Subject: app-admin/puppet-agent: fixing bug 606918 Package-Manager: portage-2.3.0 --- .../puppet-agent/puppet-agent-1.8.3-r1.ebuild | 105 +++++++++++++++++++++ app-admin/puppet-agent/puppet-agent-1.8.3.ebuild | 104 -------------------- 2 files changed, 105 insertions(+), 104 deletions(-) create mode 100644 app-admin/puppet-agent/puppet-agent-1.8.3-r1.ebuild delete mode 100644 app-admin/puppet-agent/puppet-agent-1.8.3.ebuild (limited to 'app-admin/puppet-agent') diff --git a/app-admin/puppet-agent/puppet-agent-1.8.3-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.8.3-r1.ebuild new file mode 100644 index 00000000000..323f064e9d2 --- /dev/null +++ b/app-admin/puppet-agent/puppet-agent-1.8.3-r1.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial" +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 + 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_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.8.3.ebuild b/app-admin/puppet-agent/puppet-agent-1.8.3.ebuild deleted file mode 100644 index af25c744880..00000000000 --- a/app-admin/puppet-agent/puppet-agent-1.8.3.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial" -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 - 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_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 -} -- cgit v1.2.1