[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-agent/, app-admin/puppet-agent/files/

[Matt Thode]

commit:     a4584b802c811edb1f6e8fa4bf1eddf122c533eb
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 21:16:32 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 21:18:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4584b80

app-admin/puppet-agent: 5.5.6 stable amd64/x86 with cleanup

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 app-admin/puppet-agent/Manifest                    |   4 -
 .../43e2c935252b995134ce353e5e6312cf77aea480.patch | 329 ---------------------
 app-admin/puppet-agent/metadata.xml                |   1 -
 app-admin/puppet-agent/puppet-agent-1.10.12.ebuild | 111 -------
 app-admin/puppet-agent/puppet-agent-5.5.3.ebuild   |  85 ------
 app-admin/puppet-agent/puppet-agent-5.5.6.ebuild   |   2 +-
 6 files changed, 1 insertion(+), 531 deletions(-)

diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 2acefe7bf59..cbcfcd9c2cf 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,7 +1,3 @@
-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.3-1stretch_amd64.deb 17272112 BLAKE2B 5e052f837184b1d1dd5965ccb18e3a52dc88ea6ba85c0c3c5222ffe50e32e0a72a6f14274f5dd6c1bd63b3a160affa8a6b3399ac75e27d9cc2c267a1e1c0e89d SHA512 1629b3535b900081676647f64c17e3c0d23df38525d90d5f3993877d0749d18cf55f72fb20c47e20a63d18c2c7ad95cc0f179449c386ce3b8ec8a6d0f40243e7
-DIST puppet-agent_5.5.3-1stretch_i386.deb 18189670 BLAKE2B a8791926a5ce08edad363670ab5269fcef208c3137db4126f33295fd7fdd447620578445eb0a9396e263fed8612981581cef0c5f6d3e51634722c01c79e2c9dc SHA512 83a1f472c4af97a48703ca61a00740fc7806155732bd488d3f9d757f969dca0a19cec014dad0bb5e6d8b5384d32c2d906ad0e8438efeeae5fdd39524cc11f6f8
 DIST puppet-agent_5.5.4-1stretch_amd64.deb 17273314 BLAKE2B e296cda8219deafe9b36039298823edb6007f42047e90e120fc16e941bb91c8d660e1a7f1341aa9463c67d4a5e05fbd8bf9c072a7768b0e885536efe5956115c SHA512 599aef07bb39b8d209e806ea1539157419de96376113ba88de6160525e96d6fa28f9865d7a89aff96698a0ff4e85ec474dd43ff4ea512b06a64c491c252cd973
 DIST puppet-agent_5.5.4-1stretch_i386.deb 18195740 BLAKE2B aa1e5b7030de4ec58a389a552c0d2c870875244f6a722c9b87d4aca28261f073b347476aaa313edd4f66fa07621a333c777a3a6b04228aa7d2f35391f4f84df8 SHA512 3e7346ccde7d3bc9e99bb38a2958c9ddda3dd4a5124ced21dc048df41566a0d9e6d9e5250f7c93433c02585fd83031292f8197a7c6537a1563dd6ebec464b979
 DIST puppet-agent_5.5.6-1stretch_amd64.deb 17279588 BLAKE2B d9614ee1cbec786303ac72fc9b704c90056771c9e3c23a93d6b7cff11f27394fbd277d5ae0d8eca20d9801d31019e7ca381af0cb60b72fc109ce6b2a99ee1124 SHA512 1172d72a1054cf04ab8033ab319313b7da6fd76684738bdb4aa1bc6bd9fa9dc0f2b00d765382023e0e854efbee6adba5b66bd62e2e04a9f153da79bccad427f7

diff --git a/app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch b/app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
deleted file mode 100644
index 619c5dd68cb..00000000000
--- a/app-admin/puppet-agent/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
-index 374667c..12160c6 100644
---- a/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/provider/package/portage.rb
-+++ b/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/provider/package/portage.rb
-@@ -2,14 +2,19 @@
- require 'fileutils'
- 
- Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
--  desc "Provides packaging support for Gentoo's portage system."
-+  desc "Provides packaging support for Gentoo's portage system.
- 
--  has_features :versionable, :reinstallable
-+    This provider supports the `install_options` and `uninstall_options` attributes, which allows command-line
-+    flags to be passed to emerge.  These options should be specified as a string (e.g. '--flag'), a hash
-+    (e.g. {'--flag' => 'value'}), or an array where each element is either a string or a hash."
-+
-+  has_features :install_options, :purgeable, :reinstallable, :uninstall_options, :versionable, :virtual_packages
- 
-   {
--    :emerge => "/usr/bin/emerge",
--    :eix => "/usr/bin/eix",
--    :update_eix => "/usr/bin/eix-update",
-+    :emerge => '/usr/bin/emerge',
-+    :eix => '/usr/bin/eix',
-+    :qatom_bin => '/usr/bin/qatom',
-+    :update_eix => '/usr/bin/eix-update',
-   }.each_pair do |name, path|
-     has_command(name, path) do
-       environment :HOME => '/'
-@@ -24,15 +29,18 @@ def self.instances
-     result_format = self.eix_result_format
-     result_fields = self.eix_result_fields
- 
-+    limit = self.eix_limit
-     version_format = self.eix_version_format
-     slot_versions_format = self.eix_slot_versions_format
-+    installed_versions_format = self.eix_installed_versions_format
-+    installable_versions_format = self.eix_install_versions_format
-     begin
--      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
-+      eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
-       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
- 
-       search_output = nil
--      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
--        search_output = eix *(self.eix_search_arguments + ["--installed"])
-+      Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
-+        search_output = eix *(self.eix_search_arguments + ['--installed'])
-       end
- 
-       packages = []
-@@ -57,65 +65,123 @@ def self.instances
- 
-   def install
-     should = @resource.should(:ensure)
--    name = package_name
--    unless should == :present or should == :latest
--      # We must install a specific version
--      name = package_atom_with_version(should)
-+    cmd = %w{}
-+    name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
-+    name = qatom[:pfx] + name if qatom[:pfx]
-+    name = name + '-' + qatom[:pv] if qatom[:pv]
-+    name = name + '-' + qatom[:pr] if qatom[:pr]
-+    name = name + qatom[:slot] if qatom[:slot]
-+    cmd << '--update' if [:latest].include?(should)
-+    cmd += install_options if @resource[:install_options]
-+    cmd << name
-+    emerge *cmd
-+  end
-+
-+  def uninstall
-+    should = @resource.should(:ensure)
-+    cmd = %w{--rage-clean}
-+    name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
-+    name = qatom[:pfx] + name if qatom[:pfx]
-+    name = name + '-' + qatom[:pv] if qatom[:pv]
-+    name = name + '-' + qatom[:pr] if qatom[:pr]
-+    name = name + qatom[:slot] if qatom[:slot]
-+    cmd += uninstall_options if @resource[:uninstall_options]
-+    cmd << name
-+    if [:purged].include?(should)
-+      Puppet::Util.withenv :CONFIG_PROTECT => "-*" do
-+        emerge *cmd
-+      end
-+    else
-+      emerge *cmd
-     end
--    emerge name
-   end
- 
--  # The common package name format.
--  def package_name
--    @resource[:category] ? "#{@resource[:category]}/#{@resource[:name]}" : @resource[:name]
-+  def reinstall
-+    self.install
-   end
- 
--  def package_name_without_slot
--    package_name.sub(self.class.slot_pattern, '')
-+  def update
-+    self.install
-   end
- 
--  def package_slot
--    if match = package_name.match(self.class.slot_pattern)
--      match[1]
-+  def qatom
-+    output_format = self.qatom_output_format
-+    result_format = self.qatom_result_format
-+    result_fields = self.qatom_result_fields
-+    @atom ||= begin
-+      search_output = nil
-+      package_info = {}
-+      # do the search
-+      search_output = qatom_bin *([@resource[:name], '--format', output_format])
-+      # verify if the search found anything
-+      match = result_format.match(search_output)
-+      if match
-+        result_fields.zip(match.captures) do |field, value|
-+          # some fields can be empty or (null) (if we are not passed a category in the package name for instance)
-+          if value == '(null)'
-+            package_info[field] = nil
-+          elsif !value or value.empty?
-+            package_info[field] = nil
-+          else
-+            package_info[field] = value
-+          end
-+        end
-+      end
-+      @atom = package_info
-+    rescue Puppet::ExecutionFailure => detail
-+      raise Puppet::Error.new(detail)
-     end
-   end
- 
--  def package_atom_with_version(version)
--    if slot = package_slot
--      "=#{package_name_without_slot}-#{version}:#{package_slot}"
--    else
--      "=#{package_name}-#{version}"
--    end
-+  def qatom_output_format
-+    '"[%{CATEGORY}] [%{PN}] [%{PV}] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
-   end
- 
--  def uninstall
--    emerge "--unmerge", package_name
-+  def qatom_result_format
-+    /^\"\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\](.*)\"$/
-   end
- 
--  def reinstall
--    self.install
-+  def qatom_result_fields
-+    [:category, :pn, :pv, :pr, :slot, :pfx, :sfx]
-   end
- 
--  def update
--    self.install
-+  def self.get_sets
-+    @sets ||= begin
-+      @sets = emerge *(['--list-sets'])
-+    end
-   end
- 
-   def query
-+    limit = self.class.eix_limit
-     result_format = self.class.eix_result_format
-     result_fields = self.class.eix_result_fields
- 
-     version_format = self.class.eix_version_format
-     slot_versions_format = self.class.eix_slot_versions_format
--    search_field = package_name_without_slot.count('/') > 0 ? "--category-name" : "--name"
--    search_value = package_name_without_slot
-+    installed_versions_format = self.class.eix_installed_versions_format
-+    installable_versions_format = self.class.eix_install_versions_format
-+    search_field = qatom[:category] ? '--category-name' : '--name'
-+    search_value = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
-+
-+    @eix_result ||= begin
-+      # package sets
-+      package_sets = []
-+      self.class.get_sets.each_line do |package_set|
-+        package_sets << package_set.to_s.strip
-+      end
- 
--    begin
--      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
-+      if @resource[:name].match(/^@/)
-+         if package_sets.include?(@resource[:name][1..-1].to_s)
-+           return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
-+        end
-+      end
-+
-+      eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
-       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
- 
-       search_output = nil
--      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
--        search_output = eix *(self.class.eix_search_arguments + ["--exact",search_field,search_value])
-+      Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
-+        search_output = eix *(self.class.eix_search_arguments + ['--exact',search_field,search_value])
-       end
- 
-       packages = []
-@@ -127,10 +193,19 @@ def query
-           result_fields.zip(match.captures) do |field, value|
-             package[field] = value unless !value or value.empty?
-           end
--          if package_slot
--            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], package_slot)
--            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], package_slot)
-+          # dev-lang python [3.4.5] [3.5.2] [2.7.12:2.7,3.4.5:3.4] [2.7.12:2.7,3.4.5:3.4,3.5.2:3.5] https://www.python.org/ An interpreted, interactive, object-oriented programming language
-+          # version_available is what we CAN install / update to
-+          # ensure is what is currently installed
-+          # This DOES NOT choose to install/upgrade or not, just provides current info
-+          # prefer checking versions to slots as versions are finer grained
-+          if qatom[:pv]
-+            package[:version_available] = eix_get_version_for_versions(package[:installable_versions], qatom[:pv])
-+            package[:ensure] = eix_get_version_for_versions(package[:installed_versions], qatom[:pv])
-+          elsif qatom[:slot]
-+            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], qatom[:slot])
-+            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], qatom[:slot])
-           end
-+
-           package[:ensure] = package[:ensure] ? package[:ensure] : :absent
-           packages << package
-         end
-@@ -138,10 +213,9 @@ def query
- 
-       case packages.size
-         when 0
--          not_found_value = "#{@resource[:category] ? @resource[:category] : "<unspecified category>"}/#{@resource[:name]}"
--          raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
-+          raise Puppet::Error.new("No package found with the specified name [#{@resource[:name]}]")
-         when 1
--          return packages[0]
-+          @eix_result = packages[0]
-         else
-           raise Puppet::Error.new("More than one package with the specified name [#{search_value}], please use the category parameter to disambiguate")
-       end
-@@ -155,39 +229,73 @@ def latest
-   end
- 
-   private
-+  def eix_get_version_for_versions(versions, target)
-+    # [2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] 3.5.2
-+    return nil if versions.nil?
-+    versions = versions.split(',')
-+    # [2.7.10-r1 2.7.12 3.4.3-r1 3.4.5 3.5.2]
-+    versions.find { |version| version == target }
-+    # 3.5.2
-+  end
-+
-+  private
-   def eix_get_version_for_slot(versions_and_slots, slot)
-+    # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5] 3.5
-     return nil if versions_and_slots.nil?
--    versions_and_slots = versions_and_slots.split(",")
--    versions_and_slots.map! { |version_and_slot| version_and_slot.split(":") }
--    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot }
-+    versions_and_slots = versions_and_slots.split(',')
-+    # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5]
-+    versions_and_slots.map! { |version_and_slot| version_and_slot.split(':') }
-+    # [2.7.12: 2.7
-+    #  3.4.5:  3.4
-+    #  3.5.2:  3.5]
-+    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot[1..-1] }
-+    # [3.5.2:  3.5]
-     version_for_slot.first if version_for_slot
--  end
--
--  def self.slot_pattern
--    /:([\w+.\/*=-]+)$/
-+    # 3.5.2
-   end
- 
-   def self.eix_search_format
--    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
-+    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<installedversions:INSTALLEDVERSIONS>] [<availableversions:STABLEVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
-   end
- 
-   def self.eix_result_format
--    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
-+    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
-   end
- 
-   def self.eix_result_fields
--    [:category, :name, :ensure, :version_available, :installed_slots, :slot_versions_available, :vendor, :description]
-+    # ensure:[3.4.5], version_available:[3.5.2], installed_slots:[2.7.12:2.7,3.4.5:3.4], installable_versions:[2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] slot_versions_available:[2.7.12:2.7,3.4.5:3.4,3.5.2:3.5]
-+    [:category, :name, :ensure, :version_available, :installed_slots, :installed_versions, :installable_versions, :slot_versions_available, :vendor, :description]
-   end
- 
-   def self.eix_version_format
--    "{last}<version>{}"
-+    '{last}<version>{}'
-   end
- 
-   def self.eix_slot_versions_format
--    "{!first},{}<version>:<slot>"
-+    '{!first},{}<version>:<slot>'
-+  end
-+
-+  def self.eix_installed_versions_format
-+    '{!first},{}<version>'
-+  end
-+
-+  def self.eix_install_versions_format
-+    '{!first}{!last},{}{}{isstable}<version>{}'
-+  end
-+
-+  def self.eix_limit
-+    '0'
-   end
- 
-   def self.eix_search_arguments
--    ["--nocolor", "--pure-packages", "--format",self.eix_search_format]
-+    ['--nocolor', '--pure-packages', '--format', self.eix_search_format]
-+  end
-+
-+  def install_options
-+    join_options(@resource[:install_options])
-+  end
-+
-+  def uninstall_options
-+    join_options(@resource[:uninstall_options])
-   end
- end

diff --git a/app-admin/puppet-agent/metadata.xml b/app-admin/puppet-agent/metadata.xml
index 423c18e429e..aef6ae7f136 100644
--- a/app-admin/puppet-agent/metadata.xml
+++ b/app-admin/puppet-agent/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="puppetdb">Adds puppetdb support</flag>
-		<flag name="experimental">Add patches for things in testing</flag>
 	</use>
 	<longdescription lang="en">
 		Collection of puppet utils, clients and batteries included.

diff --git a/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild b/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
deleted file mode 100644
index 22bc1d19c4a..00000000000
--- a/app-admin/puppet-agent/puppet-agent-1.10.12.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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
-	eapply_user
-}
-
-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/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-5.5.3.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.3.ebuild
deleted file mode 100644
index 784b06891e1..00000000000
--- a/app-admin/puppet-agent/puppet-agent-5.5.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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/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.6.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.6.ebuild
index 5570060df99..784b06891e1 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.6.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"