commit: cf3accce0fa5b3485515f8a00a0f54a39b4de178 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Sat Apr 21 03:49:58 2018 +0000 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Sat Apr 21 04:12:25 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf3accce
app-admin/puppet-agent: 5.5.1 1.10.12 bup with cleanup Package-Manager: Portage-2.3.27, Repoman-2.3.9 app-admin/puppet-agent/Manifest | 6 ++-- ...nt-5.3.4.ebuild => puppet-agent-1.10.12.ebuild} | 39 ++++++++++++++++++---- app-admin/puppet-agent/puppet-agent-5.5.0.ebuild | 2 +- ...gent-5.5.0.ebuild => puppet-agent-5.5.1.ebuild} | 0 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest index 3de5d5fca69..e75a6fa344f 100644 --- a/app-admin/puppet-agent/Manifest +++ b/app-admin/puppet-agent/Manifest @@ -1,6 +1,8 @@ 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_5.3.4-1stretch_amd64.deb 16013766 BLAKE2B 6461011e05d4ea55b95e02a73b195a9aaea46e769f289a856f97df0c0e0809da9c31973b2ac19dc9aeb1911c5cc1379ffb5479c6b1acdc209e123edd1d532eba SHA512 d89014cf597709a0614576f3f8c60d4f76099ec23053e56fbff0d9bec4ebbc24414d1cca1aac1ae0842a8ce59842618845f2c01e6233fc7be033e36d8b5e5389 -DIST puppet-agent_5.3.4-1stretch_i386.deb 16609070 BLAKE2B c4902e8d57c2b522ab8085c0e10e94110fdc44af54790e9c0855c90877504f11a1fe12bb02b9df99f95d6736195000bc41bf4bb8cddd4e2d283da45c31ea8798 SHA512 1f5812f688cbaed4ec64f78a3417d4c83e3d013f908ffa60c33f3adab50ed157558976bdc3564433a7f4595894b1c4f27ef38e0a3f83239234fe68556a1a9e51 +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-5.3.4.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild similarity index 64% rename from app-admin/puppet-agent/puppet-agent-5.3.4.ebuild rename to app-admin/puppet-agent/puppet-agent-1.10.12.ebuild index 657676c3b82..053bc1d011d 100644 --- a/app-admin/puppet-agent/puppet-agent-5.3.4.ebuild +++ b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild @@ -6,15 +6,16 @@ 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_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 )" + x86? ( ${SRC_BASE}_i386.deb ) +" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="puppetdb selinux" +KEYWORDS="~amd64 ~x86" +IUSE="experimental puppetdb selinux" RESTRICT="strip" CDEPEND="!app-admin/augeas @@ -30,21 +31,44 @@ RDEPEND="${CDEPEND} app-portage/eix sys-apps/dmidecode sys-libs/glibc - sys-libs/readline:0/7 - sys-libs/ncurses:0[tinfo] + >=sys-libs/readline-6.0 + <sys-libs/readline-7.0 selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) - puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" + 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 @@ -83,4 +107,5 @@ src_install() { 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-5.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild index a638b7af8a0..657676c3b82 100644 --- a/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild +++ b/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="puppetdb selinux" RESTRICT="strip" diff --git a/app-admin/puppet-agent/puppet-agent-5.5.0.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.1.ebuild similarity index 100% copy from app-admin/puppet-agent/puppet-agent-5.5.0.ebuild copy to app-admin/puppet-agent/puppet-agent-5.5.1.ebuild
