From: Hans de Graaff Date: Tue, 20 Feb 2018 06:28:28 +0000 (+0100) Subject: app-admin/puppet: drop webrick patch from 5.4.0 as well X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=120363f7262c5514bd77b3bf4c3f51da0179e10e;p=gentoo.git app-admin/puppet: drop webrick patch from 5.4.0 as well This issue is also fixed in puppet 5.x, similar to 4.10.10. Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- diff --git a/app-admin/puppet/puppet-5.4.0.ebuild b/app-admin/puppet/puppet-5.4.0-r1.ebuild similarity index 97% rename from app-admin/puppet/puppet-5.4.0.ebuild rename to app-admin/puppet/puppet-5.4.0-r1.ebuild index 1f8461b191db..c274ee7b9505 100644 --- a/app-admin/puppet/puppet-5.4.0.ebuild +++ b/app-admin/puppet/puppet-5.4.0-r1.ebuild @@ -71,9 +71,6 @@ all_ruby_prepare() { # fix systemd path epatch "${FILESDIR}/puppet-systemd.patch" - # backport upstream fix for ruby 2.3.6 compatibility - epatch "${FILESDIR}/puppet-4-webrick-ruby.patch" - # Avoid specs that can only run in the puppet.git repository. This # should be narrowed down to the specific specs. rm spec/integration/parser/compiler_spec.rb || die