commit: 2d30ed840f6fb77f6f41d32c47314e96bc73edc3 Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org> AuthorDate: Sun Sep 6 20:33:05 2015 +0000 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Sun Sep 6 20:39:08 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d30ed84
dev-ruby/packetfu: slot and add bundler to ensure deps are right dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild | 4 ++-- dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild | 31 ++++++++++++++++++++++++++--- dev-ruby/packetfu/packetfu-1.1.9-r1.ebuild | 6 +++--- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild b/dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild index f1d5b3a..4ee6d7f 100644 --- a/dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild +++ b/dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild @@ -17,10 +17,10 @@ DESCRIPTION="A mid-level packet manipulation library" HOMEPAGE="https://rubygems.org/gems/packetfu"; LICENSE="BSD" -SLOT="0" +SLOT="${PV}" KEYWORDS="~amd64 ~arm ~x86" -ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2" +ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2:*" RUBY_PATCHES=( "${FILESDIR}"/${P}-ruby2x-encoding.patch ) diff --git a/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild b/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild index 71525b2..de0753a 100644 --- a/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild +++ b/dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild @@ -17,12 +17,37 @@ DESCRIPTION="A mid-level packet manipulation library" HOMEPAGE="https://rubygems.org/gems/packetfu"; LICENSE="BSD" -SLOT="0" +SLOT="${PV}" KEYWORDS="~amd64 ~arm ~x86" ruby_add_rdepend " dev-ruby/network_interface:0 - >=dev-ruby/pcaprub-0.9.2 + dev-ruby/pcaprub:0.12 " -ruby_add_bdepend "test? ( >=dev-ruby/rspec-its-1.2.0:1 )" +ruby_add_bdepend "test? ( >=dev-ruby/rspec-its-1.2.0:1 ) + dev-ruby/bundler" + +all_ruby_prepare() { + [ -f Gemfile.lock ] && rm Gemfile.lock + #For now, we don't support development or testing at all + #if ! use development; then + sed -i -e "/^group :development do/,/^end$/d" Gemfile || die + sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die + sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die + #fi + #if ! use test; then + sed -i -e "/^group :test do/,/^end$/d" Gemfile || die + #fi + #if ! use test && ! use development; then + sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die + #fi +} + +each_ruby_prepare() { + if [ -f Gemfile ] + then + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die + fi +} diff --git a/dev-ruby/packetfu/packetfu-1.1.9-r1.ebuild b/dev-ruby/packetfu/packetfu-1.1.9-r1.ebuild index a63e4f3..4246529 100644 --- a/dev-ruby/packetfu/packetfu-1.1.9-r1.ebuild +++ b/dev-ruby/packetfu/packetfu-1.1.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,9 +11,9 @@ DESCRIPTION="A mid-level packet manipulation library" HOMEPAGE="https://rubygems.org/gems/packetfu"; LICENSE="BSD" -SLOT="0" +SLOT="${PV}" KEYWORDS="~amd64 ~arm ~x86" -ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2" +ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2:*" ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.6.2 ) doc? ( >=dev-ruby/sdoc-0.2.0 )"
