From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-832999-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id E40391384C3
for <garchives@archives.gentoo.org>; Sun, 6 Sep 2015 20:39:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0EB7F14145;
Sun, 6 Sep 2015 20:39:25 +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 1C16D14145
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Sep 2015 20:39:23 +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 E0221340AC9
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Sep 2015 20:39:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D95E187
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Sep 2015 20:39:21 +0000 (UTC)
From: "Richard Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" <zerochaos@gentoo.org>
Message-ID: <1441571948.2d30ed840f6fb77f6f41d32c47314e96bc73edc3.zerochaos@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/packetfu/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-ruby/packetfu/packetfu-1.1.10-r2.ebuild dev-ruby/packetfu/packetfu-1.1.11-r1.ebuild dev-ruby/packetfu/packetfu-1.1.9-r1.ebuild
X-VCS-Directories: dev-ruby/packetfu/
X-VCS-Committer: zerochaos
X-VCS-Committer-Name: Richard Farina
X-VCS-Revision: 2d30ed840f6fb77f6f41d32c47314e96bc73edc3
X-VCS-Branch: master
Date: Sun, 6 Sep 2015 20:39:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3fae6055-4862-45d0-90cf-623cd5b58d22
X-Archives-Hash: 4186b08a5bb1da66a308b46c3d6cb7a2
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 )"