dev-ruby/packetfu: slot and add bundler to ensure deps are right

diff --git a/dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild b/dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild
index f1d5b3a21e2b94212e3e8b89431474a2629cad28..4ee6d7fb58b114f6897228a65f84c06279df90b6 100644 (file)
--- 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 71525b2e5deea91b9f1fea703ad7b83f7c901e3a..de0753ad378adc30e486659d3a6261e1d77c64b1 100644 (file)
--- 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 a63e4f3b241b983c543af05eb0d1e8a480b990ec..42465296921f8dde76f7bc7fa4d5efe416175fe8 100644 (file)
--- 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 )"