diff --git a/net-wireless/wifitap/Manifest b/net-wireless/wifitap/Manifest
index 3864df3d5..1edcbf51b 100644
--- a/net-wireless/wifitap/Manifest
+++ b/net-wireless/wifitap/Manifest
@@ -1,2 +1 @@
-DIST wifitap-0.4.1.tar.gz 13696 BLAKE2B b1e23aec4860780306e5869e6587f6e80ec472d43e3aa8445fb60c88701e3d878bb1ee43bdc2de0d8d9dd03cb6c324a3cf6e6d3e7c7207fc0e7641adfbc20e4e SHA512 7092116ca2823295b93ad6757f6c8cdf1c9a3614c2f00037ed7ab2516211580da748f766800e7460957251a464473640f1df128048e3951977486b15b744fec5
 DIST wifitap-0.4.2.tar.gz 14139 BLAKE2B 6c947215c4b09b2fe19a45c5e7d08a6e3d121c86c02eb7f61a0c893a4c3f974c381ee23261768ee8e513b7ffd272272ca1781f009663d3f82b1a0a198f07f3ef SHA512 e8a110bdc8eef91313923d4fc9032cef13be78699bc65aacd56e76b09a923d988a62f69d1f9d7767d7189c5d05737cde3c2250da0bc815c75df6a0fa5c4e10ff
diff --git a/net-wireless/wifitap/metadata.xml b/net-wireless/wifitap/metadata.xml
new file mode 100644
index 000000000..4fa8ff351
--- /dev/null
+++ b/net-wireless/wifitap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-wireless/wifitap/wifitap-0.4.1.ebuild b/net-wireless/wifitap/wifitap-0.4.1.ebuild
deleted file mode 100644
index 1207b4efd..000000000
--- a/net-wireless/wifitap/wifitap-0.4.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-r1 multilib
-
-DESCRIPTION="A wireless tool to do direct connection to client without passing through an AP"
-HOMEPAGE="http://sid.rstack.org/index.php/Wifitap_EN"
-SHA="2b160883628456e64ee6663fa9d06da3715691fd"
-SRC_URI="https://github.com/GDSSecurity/wifitap/archive/${SHA}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/"${PN}-${SHA}"
-
-DEPEND="net-analyzer/scapy
-	dev-python/gnuplot-py
-	dev-python/pyx"
-
-src_install() {
-	exeinto /usr/bin
-	newexe wifitap.py wifitap
-	newexe wifidns.py wifidns
-	newexe wifiping.py wifiping
-
-	# also install scapy as a importable python module
-	insinto /usr/$(get_libdir)/python2.7/site-packages
-	rm scapy.py
-	doins *.py
-
-	dodoc AUTHORS README Changelog BUGS TODO
-}
diff --git a/net-wireless/wifitap/wifitap-0.4.2.ebuild b/net-wireless/wifitap/wifitap-0.4.2-r1.ebuild
similarity index 81%
rename from net-wireless/wifitap/wifitap-0.4.2.ebuild
rename to net-wireless/wifitap/wifitap-0.4.2-r1.ebuild
index 2e4efb2a6..04272b2f2 100644
--- a/net-wireless/wifitap/wifitap-0.4.2.ebuild
+++ b/net-wireless/wifitap/wifitap-0.4.2-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 multilib
+
+inherit python-single-r1
 
 DESCRIPTION="A wireless tool to do direct connection to client without passing through an AP"
 HOMEPAGE="http://sid.rstack.org/index.php/Wifitap_EN"
@@ -14,12 +15,20 @@ SRC_URI="https://github.com/s0lst1c3/wifitap/archive/${SHA}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 S="${WORKDIR}"/"${PN}-${SHA}"
 
 DEPEND="net-analyzer/scapy"
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang "${S}"
+	default
+}
+
 src_install() {
 	python_newscript wifiarp.py wifiarp
 	python_newscript wifidns.py wifidns