[gentoo-commits] repo/gentoo:master commit in: net-proxy/pingtunnel/files/, net-proxy/pingtunnel/

[gentoo-commits] repo/gentoo:master commit in: net-proxy/pingtunnel/files/, net-proxy/pingtunnel/

[David Seifert]

commit:     b9c18b4845d32fd64aa8d155bd37587790ec8fb4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 14:26:47 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 14:26:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c18b48

net-proxy/pingtunnel: Port to EAPI 7

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/pingtunnel-0.72_makefile.patch           |  4 ++--
 net-proxy/pingtunnel/pingtunnel-0.72.ebuild        | 26 +++++++++-------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch b/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch
index 9dce0992cbd..27576bfd434 100644
--- a/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch
+++ b/net-proxy/pingtunnel/files/pingtunnel-0.72_makefile.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,11 +2,26 @@
  # (c) 2004-2009 Daniel Stoedle, daniels@cs.uit.no
  # ptunnel.exe target added by Mike Miller, mike@mikeage.net

diff --git a/net-proxy/pingtunnel/pingtunnel-0.72.ebuild b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild
index 9f41ef3c315..cc137990d13 100644
--- a/net-proxy/pingtunnel/pingtunnel-0.72.ebuild
+++ b/net-proxy/pingtunnel/pingtunnel-0.72.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Tunnel TCP over ICMP"
 HOMEPAGE="https://www.cs.uit.no/~daniels/PingTunnel"
@@ -12,26 +12,22 @@ SRC_URI="https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
-IUSE="doc selinux"
+IUSE="selinux"
 
-DEPEND="
+RDEPEND="
 	net-libs/libpcap
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${DEPEND}"
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/PingTunnel
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}_makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${P}_makefile.patch )
+HTML_DOCS=( web/. )
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake $(usex selinux "SELINUX=1" "SELINUX=0")
 }
 
-src_install() {
-	default
-	use doc && dohtml web/*
+src_compile() {
+	emake SELINUX=$(usex selinux 1 0)
 }