diff --git a/net-wireless/killerbee/killerbee-2.6.1_pre20180626.ebuild b/net-wireless/killerbee/killerbee-2.6.1_pre20180626.ebuild
deleted file mode 100644
index 87d34ef95..000000000
--- a/net-wireless/killerbee/killerbee-2.6.1_pre20180626.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-#DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/riverloopsec/killerbee.git"
-	KEYWORDS=""
-else
-	COMMIT_HASH="b803708ff0c63612cfb0092e7714c2ae7d257f4b"
-	SRC_URI="https://github.com/riverloopsec/killerbee/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}/${PN}-${COMMIT_HASH}"
-fi
-
-DESCRIPTION="Framework and Tools for Attacking ZigBee and IEEE 802.15.4 networks"
-HOMEPAGE="https://github.com/riverloopsec/killerbee"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/rangeparser[${PYTHON_USEDEP}]
-	dev-libs/libgcrypt:=
-	>=net-analyzer/scapy-2.4.0_p20180626"
-#DEPEND="doc? ( dev-python/epydoc )
-DEPEND="${RDEPEND}"
-#FIXME: https://bitbucket.org/secdev/scapy-com
-
-#FIXME: doc fails to comiple
-#python_compile_all() {
-#	ewarn "running compile_all"
-#	distutils-r1_python_compile
-#	if use doc; then
-#		mkdir pdf
-#		epydoc --pdf -o pdf killerbee/
-#	fi
-#}
-
-#python_install_all() {
-#	distutils-r1_src_install
-#	if use doc; then
-#		 dodoc "${S}/pdf/*.tex"
-#	fi
-#}
diff --git a/net-wireless/killerbee/killerbee-9999.ebuild b/net-wireless/killerbee/killerbee-9999.ebuild
index 7afd98aeb..4f217349a 100644
--- a/net-wireless/killerbee/killerbee-9999.ebuild
+++ b/net-wireless/killerbee/killerbee-9999.ebuild
@@ -28,12 +28,12 @@ IUSE="doc"
 
 #FIXME: https://bitbucket.org/secdev/scapy-com
 DEPEND=""
-RDEPEND="dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/rangeparser[${PYTHON_USEDEP}]
+RDEPEND="dev-python/pyserial[${PYTHON_SINGLE_USEDEP}]
+	dev-python/pyusb[${PYTHON_SINGLE_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_SINGLE_USEDEP}]
+	dev-python/pygtk[${PYTHON_SINGLE_USEDEP}]
+	dev-python/pycairo[${PYTHON_SINGLE_USEDEP}]
+	dev-python/rangeparser[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/libgcrypt:=
 	>=net-analyzer/scapy-2.4.0_p20180626"
 
diff --git a/net-wireless/killerzee/killerzee-9999.ebuild b/net-wireless/killerzee/killerzee-9999.ebuild
index a046cb723..f50d744d6 100644
--- a/net-wireless/killerzee/killerzee-9999.ebuild
+++ b/net-wireless/killerzee/killerzee-9999.ebuild
@@ -26,6 +26,6 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-DEPEND="net-wireless/rfcat[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]"
+DEPEND="net-wireless/rfcat[${PYTHON_SINGLE_USEDEP}]
+	dev-python/pyusb[${PYTHON_SINGLE_USEDEP}]"
 RDEPEND="${DEPEND}"