net-wireless/kismet: backport the ruby fixes from master that were no…

…t put in the release branch

Package-Manager: Portage-2.3.3, Repoman-2.3.1

net-wireless/kismet/Manifest

@@ -1,3 +1,2 @@
 DIST kismet-2013-03-R1.tar.gz 899372 SHA256 1c1e9f6b550de1f248363d4c9ce1d24fdc20d041ead5a53cec88eb1b07353082 SHA512 7e992f5ef3db4c5fa298bd4aabfe216668baade948b83996850c010c6c92bfa2fea37d7006a532eb6bace015624f536cc45ed8b3b3ed4a6a1cac7a137ac86d36 WHIRLPOOL 694796f7dd0f4ffd70e64d67eba30bf7b206189dadb8e773a302af9f417a8219b45e547bfcaf59db3f502e0f5ab18af6d642e66dbe8277d8af48daeb35b40843
-DIST kismet-2016-01-R1.tar.xz 703308 SHA256 162f1796996836b2d44126ccbe877a88a7f4a0e50f6729da897fc5a8ec4776b9 SHA512 cfbfb2cefd8df4a4fd09333eb6b0becd56cd7c3a1804d555d28b1d55379186e51804334560531d05e760d31e446c4b89d32ce2bd2c0705473f67f04611c0434e WHIRLPOOL 7ba136a9a138a43768c07668f92b6836d4345bb382935527e0576d5d4aedceb6135bc5b2a38fdfe5b7c488fadc17d759b0960c8cc8a461338adb3417024cb491
 DIST kismet-2016-07-R1.tar.xz 709364 SHA256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416 WHIRLPOOL 33bbe6e3353c87907e2a58326ccd84ff973e474a884c29f01c29439de673d2050c50348bf001799da25f0b156c3527d3c5f93cdcdccfd830c9e2eb40cce9aa8b

net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch

@@ -0,0 +1,78 @@
+diff --git a/ruby/kismet.rb b/ruby/kismet.rb
+index 5b18b23..7eab708 100755
+--- a/ruby/kismet.rb
++++ b/ruby/kismet.rb
+@@ -61,8 +61,6 @@ class Kismet
+ 		rescue Exception => e
+ 			pp e
+
+-			break if @die
+-
+ 			puts "write error: #{$!}"
+ 		end
+ 	end
+diff --git a/ruby/kismet_addsource.rb b/ruby/kismet_addsource.rb
+index 057a514..d3ae968 100755
+--- a/ruby/kismet_addsource.rb
++++ b/ruby/kismet_addsource.rb
+@@ -20,7 +20,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require 'optparse'
+
+diff --git a/ruby/kismet_alert_syslog.rb b/ruby/kismet_alert_syslog.rb
+index 6969247..27373a9 100755
+--- a/ruby/kismet_alert_syslog.rb
++++ b/ruby/kismet_alert_syslog.rb
+@@ -20,7 +20,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require "getopt/long"
+ require 'syslog'
+diff --git a/ruby/kismet_list.rb b/ruby/kismet_list.rb
+index ec8f0f9..7adffe6 100755
+--- a/ruby/kismet_list.rb
++++ b/ruby/kismet_list.rb
+@@ -20,7 +20,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+
+ def bssidcb(proto, fields)
+ 	puts "Kismet saw network #{fields['bssid']} manuf #{fields['manuf']} on channel #{fields['channel']}"
+diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb
+index 25021b9..61f70b0 100755
+--- a/ruby/kismet_shootout.rb
++++ b/ruby/kismet_shootout.rb
+@@ -21,7 +21,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require 'optparse'
+
+diff --git a/ruby/kismet_sql.rb b/ruby/kismet_sql.rb
+index 9fe581d..b878979 100755
+--- a/ruby/kismet_sql.rb
++++ b/ruby/kismet_sql.rb
+@@ -22,7 +22,7 @@
+
+ require 'socket'
+ require 'time'
+-require 'kismet'
++require_relative 'kismet'
+ require 'pp'
+ require "getopt/long"
+ require "sqlite3"

net-wireless/kismet/kismet-2016.01.1.ebuild → net-wireless/kismet/kismet-2016.07.1-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -51,15 +51,14 @@ RDEPEND="${CDEPEND}
 "
 
 src_prepare() {
-	epatch -p1 "${FILESDIR}"/${P}-tinfo.patch
-
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
 		conf/kismet.conf.in
 
 	# Don't strip and set correct mangrp
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
+	epatch "${FILESDIR}/${P}-ruby-fixes.patch"
 	epatch_user
 	eautoreconf
 }