From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E377058973 for ; Wed, 20 Jan 2016 07:20:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 678E321C0A9; Wed, 20 Jan 2016 07:20:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F33C121C0A9 for ; Wed, 20 Jan 2016 07:20:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14890340756 for ; Wed, 20 Jan 2016 07:20:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02DDF1069 for ; Wed, 20 Jan 2016 07:19:59 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1453219191.272c55f203cbdc60a6d4b8004422ec606585ee0f.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vagrant/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/vagrant/vagrant-1.8.1.ebuild X-VCS-Directories: app-emulation/vagrant/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 272c55f203cbdc60a6d4b8004422ec606585ee0f X-VCS-Branch: master Date: Wed, 20 Jan 2016 07:19:59 +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: ce3c8a51-ffa8-452a-acdf-765d0546f65b X-Archives-Hash: 484ec392199c4a5dc0b20a4e3e632a6d commit: 272c55f203cbdc60a6d4b8004422ec606585ee0f Author: Tomas Mozes gmail com> AuthorDate: Tue Jan 19 15:59:51 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Tue Jan 19 15:59:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272c55f2 app-emulation/vagrant: remove rb-kqueue, loosen net-scp Package-Manager: portage-2.2.26 app-emulation/vagrant/vagrant-1.8.1.ebuild | 55 ++++++++++++++++-------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/app-emulation/vagrant/vagrant-1.8.1.ebuild b/app-emulation/vagrant/vagrant-1.8.1.ebuild index 7989b4d..50fcdce 100644 --- a/app-emulation/vagrant/vagrant-1.8.1.ebuild +++ b/app-emulation/vagrant/vagrant-1.8.1.ebuild @@ -36,49 +36,52 @@ ruby_add_rdepend " >=dev-ruby/log4r-1.1.9 =dev-ruby/net-ssh-3.0.1 >=dev-ruby/net-sftp-2.1 - >=dev-ruby/net-scp-1.1.0 =dev-ruby/rb-kqueue-0.2.0 + >=dev-ruby/net-scp-1.1.0 >=dev-ruby/rest-client-1.6.0 =dev-ruby/nokogiri-1.6.3.1 >=dev-ruby/mime-types-2.6.2 />=/' \ - -e '/nokogiri/s/=/>=/' \ - -i ${PN}.gemspec || die - - # remove windows-specific gems - sed -e '/wdm\|winrm/d' \ - -i ${PN}.gemspec || die - - # see https://github.com/mitchellh/vagrant/pull/5877 - epatch "${FILESDIR}"/${P}-install-plugins-in-isolation.patch - + # remove bundler support + sed -i '/[Bb]undler/d' Rakefile || die + rm Gemfile || die + + # loosen dependencies + sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp/s/~>/>=/' \ + -e '/nokogiri/s/=/>=/' \ + -i ${PN}.gemspec || die + + # remove windows-specific gems + sed -e '/wdm\|winrm/d' \ + -i ${PN}.gemspec || die + + # remove bsd-specific gems + sed -e '/rb-kqueue/d' \ + -i ${PN}.gemspec || die + + # see https://github.com/mitchellh/vagrant/pull/5877 + epatch "${FILESDIR}"/${P}-install-plugins-in-isolation.patch + # disable embedded CA certs and use system ones - epatch "${FILESDIR}"/${P}-disable-embedded-cacert.patch + epatch "${FILESDIR}"/${P}-disable-embedded-cacert.patch # fix rvm issue (bug #474476) - epatch "${FILESDIR}"/${P}-rvm.patch + epatch "${FILESDIR}"/${P}-rvm.patch } all_ruby_install() { - newbashcomp contrib/bash/completion.sh ${PN} - all_fakegem_install + newbashcomp contrib/bash/completion.sh ${PN} + all_fakegem_install # provide executable similar to upstream: # https://github.com/mitchellh/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb - newbin "${FILESDIR}/${P}" "${PN}" + newbin "${FILESDIR}/${P}" "${PN}" - # directory for plugins.json - dodir /var/lib/vagrant + # directory for plugins.json + dodir /var/lib/vagrant }