From 887b35ccae3a066132915e6e89ff3a1078943693 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Wed, 11 Jul 2018 22:28:49 +0800
Subject: [PATCH] pentoo-voip: mask and remove abandoned voiphopper

---
 net-analyzer/voiphopper/Manifest              |  2 +-
 .../voiphopper/files/fix-include.patch        | 11 ++++++++
 ...04-r1.ebuild => voiphopper-2.04-r2.ebuild} | 16 +++++++----
 .../voiphopper/voiphopper-2.04.ebuild         | 28 -------------------
 ...014.3.ebuild => pentoo-voip-2018.1.ebuild} |  1 -
 5 files changed, 22 insertions(+), 36 deletions(-)
 create mode 100644 net-analyzer/voiphopper/files/fix-include.patch
 rename net-analyzer/voiphopper/{voiphopper-2.04-r1.ebuild => voiphopper-2.04-r2.ebuild} (74%)
 delete mode 100644 net-analyzer/voiphopper/voiphopper-2.04.ebuild
 rename pentoo/pentoo-voip/{pentoo-voip-2014.3.ebuild => pentoo-voip-2018.1.ebuild} (96%)

diff --git a/net-analyzer/voiphopper/Manifest b/net-analyzer/voiphopper/Manifest
index e32e17a0b..6b774be74 100644
--- a/net-analyzer/voiphopper/Manifest
+++ b/net-analyzer/voiphopper/Manifest
@@ -1 +1 @@
-DIST voiphopper-2.04.tar.gz 352311 SHA256 ff26b67507b084ec7b53b1690c540a87505cb9bd428a0f78cf535f9707aab109 SHA512 6b8afcd5600c719e6470a64d84083269405b5548477c9221636b48aad295634839c621ebb7b736680acb64c987a3311d95929ab5d041419aa5375471ef773e29 WHIRLPOOL 85bd699888e578042ccd29c9ead77817d9865d61382a99f5eda55315ebcd4ebcb998557902bc07624da14f6010e0171d4adfe33fd09f9c5c3794b8dfa13999d8
+DIST voiphopper-2.04.tar.gz 352311 BLAKE2B 7e20f36b81f8d9e3fdbafd8dc3fdd87b3e25553d9ba42c7a8c6882eed855f1592ce9c9e9d81cfe295ccc7171c6ed4c877ea2c985041e53b4a928e85d303b3c78 SHA512 6b8afcd5600c719e6470a64d84083269405b5548477c9221636b48aad295634839c621ebb7b736680acb64c987a3311d95929ab5d041419aa5375471ef773e29
diff --git a/net-analyzer/voiphopper/files/fix-include.patch b/net-analyzer/voiphopper/files/fix-include.patch
new file mode 100644
index 000000000..8536c459e
--- /dev/null
+++ b/net-analyzer/voiphopper/files/fix-include.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c.orig	2012-04-24 22:31:23.000000000 +0800
++++ b/src/main.c	2018-07-11 22:21:09.771277204 +0800
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ #include <netinet/in.h>
+ #include <netinet/ether.h>
+-#include <rpc/types.h>
++#include <tirpc/rpc/types.h>
+ #include <netdb.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
diff --git a/net-analyzer/voiphopper/voiphopper-2.04-r1.ebuild b/net-analyzer/voiphopper/voiphopper-2.04-r2.ebuild
similarity index 74%
rename from net-analyzer/voiphopper/voiphopper-2.04-r1.ebuild
rename to net-analyzer/voiphopper/voiphopper-2.04-r2.ebuild
index 5ac3b5657..af717d4e4 100644
--- a/net-analyzer/voiphopper/voiphopper-2.04-r1.ebuild
+++ b/net-analyzer/voiphopper/voiphopper-2.04-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=4
-inherit linux-info
+EAPI=6
+
+inherit linux-info eutils
 
 DESCRIPTION="VoIP Hopper is a tool that rapidly runs a VLAN Hop into the Voice VLAN"
 HOMEPAGE="http://voiphopper.sourceforge.net/"
@@ -11,10 +11,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+#fails to compile
+#KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="net-libs/libpcap"
+DEPEND="net-libs/libpcap
+	net-libs/libtirpc"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
@@ -24,8 +26,10 @@ pkg_setup() {
 
 src_prepare() {
 	#patch for the linux-headers 3.6
+	epatch ${FILESDIR}/fix-include.patch
 	sed -i "s%<linux/if_ether.h>%<netinet/if_ether.h>%" src/dhcpclient.h
 	sed -i "s%<linux/if_tr.h>%<netinet/if_tr.h>%" src/dhcpclient.h
+	eapply_user
 }
 
 src_install() {
diff --git a/net-analyzer/voiphopper/voiphopper-2.04.ebuild b/net-analyzer/voiphopper/voiphopper-2.04.ebuild
deleted file mode 100644
index 65636c8fd..000000000
--- a/net-analyzer/voiphopper/voiphopper-2.04.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit linux-info
-
-DESCRIPTION="VoIP Hopper is a tool that rapidly runs a VLAN Hop into the Voice VLAN"
-HOMEPAGE="http://voiphopper.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	CONFIG_CHECK="~VLAN_8021Q"
-	linux-info_pkg_setup
-}
-
-src_install() {
-	dobin src/voiphopper
-	dodoc README USAGE
-}
diff --git a/pentoo/pentoo-voip/pentoo-voip-2014.3.ebuild b/pentoo/pentoo-voip/pentoo-voip-2018.1.ebuild
similarity index 96%
rename from pentoo/pentoo-voip/pentoo-voip-2014.3.ebuild
rename to pentoo/pentoo-voip/pentoo-voip-2018.1.ebuild
index 09ca4bd1f..3241599f0 100644
--- a/pentoo/pentoo-voip/pentoo-voip-2014.3.ebuild
+++ b/pentoo/pentoo-voip/pentoo-voip-2018.1.ebuild
@@ -18,7 +18,6 @@ RDEPEND="${DEPEND}
 	net-misc/sipp
 
 	!minipentoo? (
-		net-analyzer/voiphopper
 		net-misc/sipsak
 		net-misc/voipong
 	)"