commit:     f668591b65d1c01f8849f33670b4d14f3087f094
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 09:56:15 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 09:56:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f668591b

app-admin/puppet: drop webrick patch for newer rubies

This issue is fixed in 4.10.10 in a more complete way, and the old fix,
which does not clash with the new fixes, now breaks things.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-admin/puppet/{puppet-4.10.10.ebuild => puppet-4.10.10-r1.ebuild} | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-admin/puppet/puppet-4.10.10.ebuild 
b/app-admin/puppet/puppet-4.10.10-r1.ebuild
similarity index 98%
rename from app-admin/puppet/puppet-4.10.10.ebuild
rename to app-admin/puppet/puppet-4.10.10-r1.ebuild
index c404e787afc..a75388c365f 100644
--- a/app-admin/puppet/puppet-4.10.10.ebuild
+++ b/app-admin/puppet/puppet-4.10.10-r1.ebuild
@@ -79,9 +79,6 @@ all_ruby_prepare() {
                epatch 
"${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
        fi
 
-       # fix compatibility with ruby 2.3.6/2.4.3 webrick
-       epatch "${FILESDIR}/puppet-4-webrick-ruby.patch"
-
        # Use working version of mocha
        sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' 
spec/spec_helper.rb || die
 

Reply via email to