diff --git a/dev-util/edb/Manifest b/dev-util/edb/Manifest
index 4fb0e2c73..1226fd749 100644
--- a/dev-util/edb/Manifest
+++ b/dev-util/edb/Manifest
@@ -1,3 +1 @@
-DIST debugger-0.9.20.tgz 791820 SHA256 fd4ebdf8a30ace88395b7b61407fd264cb3919d97368d4932201f0fed6b7ef4d SHA512 c65c023c351ee7aee47dbb743a6e84e9b9c680e9eef39caa1a873903c53aa48b451ea92b5363720d55277d81ca8a95741c0777a2748da9fb6d09957ff000ecb1 WHIRLPOOL 50da20b6f0b153697baba5ce1b91402863fa4c2b243c6416d48eb8854f5abc982915f1c19931f66f20dd6bfd5697dec2cab4c8f43e6cdb5c6fd4e31b9b86ba7f
-DIST edb-0.9.20_p20160928.zip 1295515 SHA256 4f1258a226dac138edd32032ebdecce556beacfcf43f96d36ed92e7443f58394 SHA512 5c3967b72a5638b7b6ee942fc613f41075d6ff6c77a243e389e7e4badc996afad97d415360e06bb42558a006ad9bad20a579cf9c31c017ddb018796618496391 WHIRLPOOL 2386745e287c2a63b570e87d68f24cab565245b843de7650cb1d7b627d09012314f259aa797499a00cd0d4b2f791f15153d12481582106483c6d2a499a56ed01
 DIST edb-debugger-0.9.21.tgz 1042641 SHA256 2686619e1288152033d4c9c9a2568cb12841d3854bba8815c37ce77d3bd11706 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7 WHIRLPOOL 00c77e770c7fdc68644fcef732dc1c93ca6327f6543e80f9b628630ee6059a70bb51f4a290f73ae7502cfabad8f7eefca9a3e8762c778059e5eabeb439baed8b
diff --git a/dev-util/edb/edb-0.9.20.ebuild b/dev-util/edb/edb-0.9.20.ebuild
deleted file mode 100644
index 58b7e527f..000000000
--- a/dev-util/edb/edb-0.9.20.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit eutils multilib
-
-DESCRIPTION="EDB \"Evan's Debugger\" (OllyDbg workalike for Linux)"
-HOMEPAGE="http://www.codef00.com/projects.php#debugger"
-SRC_URI="http://www.codef00.com/projects/debugger-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="
-	>=dev-qt/qtcore-4.6.0:4
-	>=dev-qt/qtgui-4.6.0:4
-	>=dev-libs/boost-1.35.0"
-
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/debugger"
-
-src_configure() {
-	qmake -makefile DEFAULT_PLUGIN_PATH="/usr/$(get_libdir)/edb/" || die "qmake failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}/usr/" install
-	dodoc CHANGELOG README README.plugins
-}
-
-pkg_postinst() {
-	einfo "Note: EBD's plugins are installed by default into /usr/$(get_libdir)/edb."
-	einfo "If you have previously used EDB and have it set to look in a"
-	einfo "different directory, then you will need to adjust this. Also"
-	einfo "EDB looks for plugins in the current working directory as well"
-	einfo "as the directory specified in the options, so that unpriviledged"
-	einfo "users can use plugins not installed system wide."
-}
diff --git a/dev-util/edb/edb-0.9.20_p20160928.ebuild b/dev-util/edb/edb-0.9.20_p20160928.ebuild
deleted file mode 100644
index 7fb20df2c..000000000
--- a/dev-util/edb/edb-0.9.20_p20160928.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
-HOMEPAGE="https://github.com/eteran/edb-debugger"
-
-LICENSE="GPL-2"
-IUSE="graphviz legacy-mem-write"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
-	KEYWORDS=""
-else
-	MY_GIT_COMMIT="f0f587f3d0e64c8be0c0db6c593011c3cfcf8e34"
-	SRC_URI="https://github.com/eteran/edb-debugger/archive/${MY_GIT_COMMIT}.zip -> ${P}.zip"
-	#KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/"${PN}"-debugger-"${MY_GIT_COMMIT}"
-fi
-
-RDEPEND="
-	>=dev-libs/capstone-3.0
-	graphviz? ( >=media-gfx/graphviz-2.38.0 )
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	"
-DEPEND="
-	>=dev-libs/boost-1.35.0
-	${RDEPEND}"
-
-src_prepare(){
-	if ! use graphviz; then
-		sed -i '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt
-	fi
-	eapply_user
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DASSUME_PROC_PID_MEM_WRITE_BROKEN=$(usex legacy-mem-write Yes No)
-		-DQT_VERSION=Qt5
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install(){
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use legacy-mem-write; then
-		ewarn "You really do not want to turn on legacy-mem-write unless you need it."
-		ewarn "Be sure to test wihtout legacy-mem-write first and only enable if you actually need it."
-	else
-		ewarn
-		ewarn "If you notice that EDB doesn't work correctly, enable legacy-mem-write USE Flag"
-		ewarn "Please Report Bugs & Requests At: https://github.com/eteran/edb-debugger/issues"
-		ewarn
-	fi
-}
diff --git a/dev-util/edb/edb-0.9.21.ebuild b/dev-util/edb/edb-0.9.21.ebuild
index 9bfead26a..691e987c0 100644
--- a/dev-util/edb/edb-0.9.21.ebuild
+++ b/dev-util/edb/edb-0.9.21.ebuild
@@ -2,40 +2,71 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils multilib cmake-utils
+EAPI=6
 
-DESCRIPTION="EDB \"Evan's Debugger\" (OllyDbg workalike for Linux)"
-HOMEPAGE="http://www.codef00.com/projects.php#debugger"
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+inherit cmake-utils
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
 
 LICENSE="GPL-2"
+IUSE="graphviz legacy-mem-write pax_kernel"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt4 qt5"
-RESTRICT="strip"
 
-REQUIRED_USE="|| ( qt4 qt5 )"
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/edb-debugger-${PV}
+fi
 
-DEPEND="qt4? ( >=dev-qt/qtcore-4.6.0:4 >=dev-qt/qtgui-4.6.0:4 )
-	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
-	>=dev-libs/boost-1.35.0"
+RDEPEND="
+	>=dev-libs/capstone-3.0
+	graphviz? ( >=media-gfx/graphviz-2.38.0 )
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	"
+DEPEND="
+	>=dev-libs/boost-1.35.0
+	${RDEPEND}"
 
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/edb-debugger-${PV}"
+src_prepare(){
+	if ! use graphviz; then
+		sed -i '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt
+	fi
+	eapply_user
+}
 
 src_configure() {
-	local mycmakeargs=( "-DASSUME_PROC_PID_MEM_WRITE_BROKEN:STRING=No" )
-#		"-DDEFAULT_PLUGIN_PATH=/usr/$(get_libdir)/edb/" )
+	mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DQT_VERSION=Qt5
+	)
+	if use pax_kernel || use legacy-mem-wrie; then
+		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=Yes )
+	else
+		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=No )
+	fi
+
 	cmake-utils_src_configure
 }
 
 pkg_postinst() {
-	einfo "Note: EBD's plugins are installed by default into /usr/$(get_libdir)/edb."
-	einfo "If you have previously used EDB and have it set to look in a"
-	einfo "different directory, then you will need to adjust this. Also"
-	einfo "EDB looks for plugins in the current working directory as well"
-	einfo "as the directory specified in the options, so that unpriviledged"
-	einfo "users can use plugins not installed system wide."
+	if use legacy-mem-write; then
+		ewarn "You really do not want to turn on legacy-mem-write unless you need it."
+		ewarn "Be sure to test without legacy-mem-write first and only enable if you actually need it."
+	else
+		ewarn
+		ewarn "If you notice that EDB doesn't work correctly, enable legacy-mem-write USE Flag"
+		ewarn "Please Report Bugs & Requests At: https://github.com/eteran/edb-debugger/issues"
+		ewarn
+	fi
 }
diff --git a/dev-util/edb/edb-9999.ebuild b/dev-util/edb/edb-9999.ebuild
index 395ae8761..691e987c0 100644
--- a/dev-util/edb/edb-9999.ebuild
+++ b/dev-util/edb/edb-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
 
 LICENSE="GPL-2"
-IUSE="graphviz legacy-mem-write"
+IUSE="graphviz legacy-mem-write pax_kernel"
 SLOT="0"
 
 if [[ ${PV} == "9999" ]] ; then
@@ -18,10 +18,9 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
 	KEYWORDS=""
 else
-	MY_GIT_COMMIT="2a9d49f79ce225e7bb487e22315af192480d7130"
-	SRC_URI="https://github.com/eteran/edb-debugger/archive/${MY_GIT_COMMIT}.zip -> ${P}.zip"
+	SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/"${PN}"-debugger-"${MY_GIT_COMMIT}"
+	S="${WORKDIR}"/edb-debugger-${PV}
 fi
 
 RDEPEND="
@@ -49,24 +48,21 @@ src_prepare(){
 src_configure() {
 	mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX=/usr
-		-DASSUME_PROC_PID_MEM_WRITE_BROKEN=$(usex legacy-mem-write Yes No)
 		-DQT_VERSION=Qt5
 	)
+	if use pax_kernel || use legacy-mem-wrie; then
+		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=Yes )
+	else
+		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=No )
+	fi
+
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install(){
-	cmake-utils_src_install
-}
-
 pkg_postinst() {
 	if use legacy-mem-write; then
 		ewarn "You really do not want to turn on legacy-mem-write unless you need it."
-		ewarn "Be sure to test wihtout legacy-mem-write first and only enable if you actually need it."
+		ewarn "Be sure to test without legacy-mem-write first and only enable if you actually need it."
 	else
 		ewarn
 		ewarn "If you notice that EDB doesn't work correctly, enable legacy-mem-write USE Flag"