1 |
commit: 120363f7262c5514bd77b3bf4c3f51da0179e10e |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 20 06:28:28 2018 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 20 06:49:37 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120363f7 |
7 |
|
8 |
app-admin/puppet: drop webrick patch from 5.4.0 as well |
9 |
|
10 |
This issue is also fixed in puppet 5.x, similar to 4.10.10. |
11 |
|
12 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
13 |
|
14 |
app-admin/puppet/{puppet-5.4.0.ebuild => puppet-5.4.0-r1.ebuild} | 3 --- |
15 |
1 file changed, 3 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/puppet/puppet-5.4.0.ebuild b/app-admin/puppet/puppet-5.4.0-r1.ebuild |
18 |
similarity index 97% |
19 |
rename from app-admin/puppet/puppet-5.4.0.ebuild |
20 |
rename to app-admin/puppet/puppet-5.4.0-r1.ebuild |
21 |
index 1f8461b191d..c274ee7b950 100644 |
22 |
--- a/app-admin/puppet/puppet-5.4.0.ebuild |
23 |
+++ b/app-admin/puppet/puppet-5.4.0-r1.ebuild |
24 |
@@ -71,9 +71,6 @@ all_ruby_prepare() { |
25 |
# fix systemd path |
26 |
epatch "${FILESDIR}/puppet-systemd.patch" |
27 |
|
28 |
- # backport upstream fix for ruby 2.3.6 compatibility |
29 |
- epatch "${FILESDIR}/puppet-4-webrick-ruby.patch" |
30 |
- |
31 |
# Avoid specs that can only run in the puppet.git repository. This |
32 |
# should be narrowed down to the specific specs. |
33 |
rm spec/integration/parser/compiler_spec.rb || die |