From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EB9471382C5 for ; Mon, 19 Feb 2018 09:56:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18C67E0B34; Mon, 19 Feb 2018 09:56:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC5DCE0B34 for ; Mon, 19 Feb 2018 09:56:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D5B9335C07 for ; Mon, 19 Feb 2018 09:56:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C5AE215 for ; Mon, 19 Feb 2018 09:56:30 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1519034175.f668591b65d1c01f8849f33670b4d14f3087f094.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/puppet/puppet-4.10.10-r1.ebuild app-admin/puppet/puppet-4.10.10.ebuild X-VCS-Directories: app-admin/puppet/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: f668591b65d1c01f8849f33670b4d14f3087f094 X-VCS-Branch: master Date: Mon, 19 Feb 2018 09:56:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 853c3054-a52a-4663-9346-ebfd054d895c X-Archives-Hash: 0dd013edc26992e581e745077cc76a73 commit: f668591b65d1c01f8849f33670b4d14f3087f094 Author: Hans de Graaff gentoo org> AuthorDate: Mon Feb 19 09:56:15 2018 +0000 Commit: Hans de Graaff gentoo 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