diff --git a/net-wireless/sniffair/Manifest b/net-wireless/sniffair/Manifest
index c87a82a48..d7ea2405e 100644
--- a/net-wireless/sniffair/Manifest
+++ b/net-wireless/sniffair/Manifest
@@ -1,2 +1 @@
-DIST SniffAir-1.1.tar.gz 273734 BLAKE2B c92480b041d6580d9e8775df7afdef53aa98ab1459d428a00365d3b8094efcbc7f3e02400a4bbdcf64a071ec0f372da0ba4177f16c2da0d2d1e3e3b0ae003bef SHA512 9c9efe8f062a04642333132cf3d70d28f2478534e258a9130529e94c214ec9ad135a61e296cfaaa60ed90c508f95494db7eb5967993fa932dc2dfa0e5b745838
 DIST SniffAir-3.0.tar.gz 300010 BLAKE2B c5fd9dcf60426cf650f4098e8b29881d7054d4d1c1367625abec8da0e5bb674dcb3bcb31e9d73bc72f43098ef6b46fc43b85790f907ba69221e813f7c86e0939 SHA512 e78cf3ce34f9a350d6af4cd52aeddb52250606f2ec4226bfadc7696d97c5a599b4aa662e596161a005af8ca427e37be022c275c697ca93211cb3976cfd6d356b
diff --git a/net-wireless/sniffair/metadata.xml b/net-wireless/sniffair/metadata.xml
new file mode 100644
index 000000000..4fa8ff351
--- /dev/null
+++ b/net-wireless/sniffair/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/sniffair/sniffair-1.1.ebuild b/net-wireless/sniffair/sniffair-1.1.ebuild
deleted file mode 100644
index 41aedddac..000000000
--- a/net-wireless/sniffair/sniffair-1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit eutils python-single-r1 distutils-r1
-
-DESCRIPTION="SniffAir framework for wireless pentesting"
-HOMEPAGE="https://github.com/Tylous/SniffAir"
-MY_PN="SniffAir"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://github.com/Tylous/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-wireless/hostapd[wpe]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/tabulate[${PYTHON_USEDEP}]
-	dev-python/tabulate[${PYTHON_USEDEP}]
-	net-analyzer/scapy[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	pushd module/Auto_EAP/lib
-	distutils-r1_src_compile
-	popd
-}
-
-src_install() {
-	pushd module/Auto_EAP/lib
-	distutils-r1_src_install
-	popd
-
-	# install the rest of the files
-	dodir /usr/share/${PN}/
-
-	cp -R * "${ED}"/usr/share/${PN}/
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	make_wrapper "${PN}" /usr/share/"${PN}"/SniffAir.py /usr/share/"${PN}"
-}
diff --git a/net-wireless/sniffair/sniffair-3.0.ebuild b/net-wireless/sniffair/sniffair-3.0.ebuild
index c8e65b85f..6a0f80a91 100644
--- a/net-wireless/sniffair/sniffair-3.0.ebuild
+++ b/net-wireless/sniffair/sniffair-3.0.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
+
 DISTUTILS_SINGLE_IMPL=1
-inherit eutils python-single-r1 distutils-r1
+inherit eutils distutils-r1
 
 DESCRIPTION="SniffAir framework for wireless pentesting"
 HOMEPAGE="https://github.com/Tylous/SniffAir"
@@ -15,16 +16,19 @@ SRC_URI="https://github.com/Tylous/${MY_PN}/archive/V${PV}.tar.gz -> ${MY_P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="
+# dev-python/tabulate and dev-python/pandas — py3 only
+#KEYWORDS="~amd64 ~x86"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
 	net-wireless/hostapd[wpe]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/tabulate[${PYTHON_USEDEP}]
-	net-analyzer/scapy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pandas[${PYTHON_MULTI_USEDEP}]
+		dev-python/prettytable[${PYTHON_MULTI_USEDEP}]
+		dev-python/tabulate[${PYTHON_MULTI_USEDEP}]
+		net-analyzer/scapy[${PYTHON_MULTI_USEDEP}]
+	')
 	app-crypt/hashcat-utils
 "
 
@@ -56,4 +60,6 @@ src_install() {
 	#unbundle hashcat-utils
 	rm "${ED}/usr/share/${PN}/module/Handshaker/cap2hccapx.bin" || die
 	ln -s /usr/bin/cap2hccapx "${ED}/usr/share/${PN}/module/Handshaker/cap2hccapx.bin"
+
+	python_optimize "${ED}/usr/share/${PN}"
 }