Apply (retabbed) patch that makes ruby2.x tests succeed. Add ruby20, ruby21 target.

Package-Manager: portage-2.2.15/cvs/Linux x86_64

diff --git a/dev-ruby/packetfu/ChangeLog b/dev-ruby/packetfu/ChangeLog
index d65d023f36a2035e3944ae135d833a4991519cba..a6c09784b6a0d4fe8a0eb34789c0e49d8a27a0c6 100644 (file)
--- a/dev-ruby/packetfu/ChangeLog
+++ b/dev-ruby/packetfu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/packetfu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/packetfu/ChangeLog,v 1.2 2014/01/15 07:39:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/packetfu/ChangeLog,v 1.3 2014/12/09 15:56:43 mrueg Exp $
+
+*packetfu-1.1.10-r1 (09 Dec 2014)
+
+  09 Dec 2014; Manuel Rüger <mrueg@gentoo.org>
+  +files/packetfu-1.1.10-ruby2x-encoding.patch, +packetfu-1.1.10-r1.ebuild:
+  Apply (retabbed) patch that makes ruby2.x tests succeed. Add ruby20, ruby21
+  target.
 
 *packetfu-1.1.10 (15 Jan 2014)
 

diff --git a/dev-ruby/packetfu/Manifest b/dev-ruby/packetfu/Manifest
index 0ce6c969cd6f2392012f67fc35cc41cbcff40e0c..09b9eff0df16dd1d7088ea65d0759bd8434b5734 100644 (file)
--- a/dev-ruby/packetfu/Manifest
+++ b/dev-ruby/packetfu/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX packetfu-1.1.10-ruby2x-encoding.patch 1424 SHA256 f0a1903f1d889a27cc44c6ac192eaec03fbe4b5821a1aa1fdf47b253cbba053b SHA512 ebb27b8a4d41ec4d8d9393a1d8457fb2bbe3978003b1b295dbff45d592431372313416f569efafe23fa26dd8585cefb31f44ae54beacaab46069ac8ccf736c5d WHIRLPOOL 757b8208cd9af28eecd3b4225103cd1cbf548f820b9c601dfe14f565b903e2cce2bc9fda7a4c341a89e2eb308194ef6837acef751d50b7ce1b38f41bf4567587
 DIST packetfu-1.1.10.gem 750080 SHA256 7c929b03255b4320598a9bed7c86076435cedb9b7292cb1acab05c4d085c5b22 SHA512 6912d8923eaf596fccb5881025259f8df2494c5ff424a9fe2d4fc28b135c26a89afa8e663dcca97f42ead0c0da14f659611f12472dabe29b26e202c4f79737f9 WHIRLPOOL ccbe1aace3a954972b1e4ff55fcf37e6b686c6074df08f853aa02693b35627a44d01be6e43f0d8ee85a1585b230fde62ba265dade7aabd197430f15a9940d648
 DIST packetfu-1.1.9.gem 750592 SHA256 dc035e2be9312bc6e78ac75951c7af8358304a7b4efa6f82fc07821bf30bd409 SHA512 c032ee9f90d03b5cc588d712f3c1dfe9f797c7c7799fae22c565915cf3ff90962927cb9986cc10b4901549a39a6515a4b2d33f67e7eb23b6a7e0ae3cce750442 WHIRLPOOL 1b58159d54c7df134509065012a4fbf6350d6d3c6c35f1ee44c0fedf7d98925bdb289e07ae44c32e1e9cd5257faff6906c59cc0af31f46cf919fe39900c9b490
+EBUILD packetfu-1.1.10-r1.ebuild 816 SHA256 3ececca21f8fd326bc07c49ae908c35801981ec3053582c959bcf2fc45d34609 SHA512 99b3ad3f239cbe1e410997583541a52e9ecd4dfc8bd1ca036db33eb4a4977db55434d1ad8456536a36a6b2b89c845e83f275f568ecedea7e5c3603a7eb4937cd WHIRLPOOL 753a0ebc13eb674e5f0f8219c4ce9d4afa19f5f1adb536eed7fbf57894abcf92806b720e2419a346f22997b267c8f92dc37dcaf8bca89a39bbb9f91159447963
 EBUILD packetfu-1.1.10.ebuild 762 SHA256 6fb37d577ac80b6badfd35c73006ecb147ffd5857ab13d4a9b814e92b5c79f13 SHA512 24f470a78f6f042e3b6c1196ba5ce255e0ae971e5c944f0417562eeebf314e681b31c28e286beefab9545dd95e288e6e8b8ea927861f9ee7195947b6cd83dc89 WHIRLPOOL 2a10223ab16b4d7ab62c6fbc2fa6096e1b5709efb18f325a0a0a62dc37af7ed9722e10de8f411efeb1b14f086348e0d1d5855e723184ce9c007d46eb9a52567e
 EBUILD packetfu-1.1.9.ebuild 564 SHA256 7ade369d8acd2aa22a68a1fd017c5b65c6709fc761635d57081732ab88855e9d SHA512 fb40f6c9619f5f772c7b4833736389fdd29305d82a38b627a47ee416de9ffda65df1f2e1a01d659ddb668ade46bcb645b8b00d75c0d4d5ef0f337f2768e206ea WHIRLPOOL 3fd759179f8dff87bb77cf33e482c663e47a6497a81089769443dba8de1faec41b77d3afe8fd0458484c2b2ca741a82c1ee8cc217ad1c2e2ad74ae0a17ab8346
-MISC ChangeLog 589 SHA256 925691d4fbee341597fb34a61df80fb006f3744d0a5669487f65f8a83926d7ef SHA512 9df6db243cbdfdbb2abee5342a2e734b92b624be1d1ce17771688de835bc2f900129a17d379aa6a4a844614c851fa23fd7bbefed894bed7883dbc7aacde79471 WHIRLPOOL 13ed7c43b2035c2e08d97e1f67e8035968ec7180d0d79ead1d4b938076a13a198d57bc9aa030824bafaec0549751dd20c3182f4157b5177272dc6dbca3ac665f
+MISC ChangeLog 836 SHA256 63b9a299caddfe59f2894da7716cba112223bdd7bbe297bc0a3f928fa18b2980 SHA512 ed20880eb6fdbed32897d800ede977c019b6cdd4ae098f4af7622532fba1b5b1acb97f8a5f4c9e22b8bb584ea66e6c644a96837c7a402e92a03106a0eb0290c8 WHIRLPOOL 47d1930b990108add1c05023c868d7384d81b69eb56b2c4254d68bc8bff5023a098485f7eb7cc828af9aed05720651c4536a35baf715a4190185d7d917c40304
 MISC metadata.xml 292 SHA256 cb7bc08e56161cfd708e9e743a5792b5d7793847c2e8b94506cc372281fd6dc6 SHA512 b1f870f4f237affb1473f6d4bfcb870143365e564d8be3ed8ca39a72cc16896f545ef7b97e606b2a39e0fc4161e5ff4512cc0c27186cc12e017d65aebf3edb3c WHIRLPOOL 2d526ce30fb6f82eff831ae6effcec383371d14c57be74b529577123475864e370e7d4b0541c4e88dfc5a2a4cdac58fee3fe8d947b564da84925d12a265ca318
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iF4EAREIAAYFAlLWOyIACgkQiIP6VqMIqNeurAD/cX4VqkgzgcVZCd5IOn7eb+DO
-0OKWHb9XfL/KUaHhQrcA/3UZDjjGzE9jXAZ1WTtoiAgGXh/SF/TmCzeOmyLaBlHB
-=cwWX
------END PGP SIGNATURE-----

diff --git a/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch b/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch
new file mode 100644 (file)
index 0000000..7d21833
--- /dev/null
+++ b/dev-ruby/packetfu/files/packetfu-1.1.10-ruby2x-encoding.patch
@@ -0,0 +1,49 @@
+From ba3ef1af81b494248db230b4f7fdcc155fe256d5 Mon Sep 17 00:00:00 2001
+From: Jonathan Claudius <jclaudius@trustwave.com>
+Date: Sat, 5 Apr 2014 22:15:00 -0400
+Subject: [PATCH] Fix encoding issues in specs for Ruby 2.x
+
+---
+ spec/structfu_spec.rb | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/spec/structfu_spec.rb b/spec/structfu_spec.rb
+index c48c856..84b7e22 100644
+--- a/spec/structfu_spec.rb
++++ b/spec/structfu_spec.rb
+@@ -78,7 +78,7 @@ class StructClass
+               @int.to_s.should == "\x02"
+               @int.read(254)
+               @int.to_i.should == 254
+-              @int.to_s.should == "\xfe"
++              @int.to_s.should == "\xfe".force_encoding("binary")
+       end
+ 
+ end
+@@ -98,7 +98,7 @@ class StructClass
+       end
+ 
+       it "should print a two character packed string" do
+-              @int.to_s.should == "\x00\x0b"
++              @int.to_s.should == "\x00\x0b".force_encoding("binary")
+       end
+ 
+       it "should have a value of 11" do
+@@ -113,7 +113,7 @@ class StructClass
+               @int.to_s.should == "\x00\x02"
+               @int.read(254)
+               @int.to_i.should == 254
+-              @int.to_s.should == "\x00\xfe"
++              @int.to_s.should == "\x00\xfe".force_encoding("binary")
+       end
+ 
+       it "should be able to set endianness" do
+@@ -198,7 +198,7 @@ class StructClass
+               @int.to_s.should == "\x00\x00\x00\x02"
+               @int.read(254)
+               @int.to_i.should == 254
+-              @int.to_s.should == "\x00\x00\x00\xfe"
++              @int.to_s.should == "\x00\x00\x00\xfe".force_encoding("binary")
+       end
+ 
+       it "should be able to set endianness" do

diff --git a/dev-ruby/packetfu/packetfu-1.1.10-r1.ebuild b/dev-ruby/packetfu/packetfu-1.1.10-r1.ebuild
new file mode 100644 (file)
index 0000000..3700b19
--- /dev/null
+++ b/dev-ruby/packetfu/packetfu-1.1.10-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/packetfu/packetfu-1.1.10-r1.ebuild,v 1.1 2014/12/09 15:56:43 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A mid-level packet manipulation library"
+HOMEPAGE="https://rubygems.org/gems/packetfu"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_rdepend " >=dev-ruby/pcaprub-0.9.2"
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-ruby2x-encoding.patch )
+
+all_ruby_prepare() {
+       # Broken for version numbers with multiple digits...
+       sed -i -e '/reports a version number/,/end/ s:^:#:' spec/packetfu_spec.rb || die
+}