diff --git a/app-exploits/pwntools/Manifest b/app-exploits/pwntools/Manifest
index 1c2a05a01..0437a7842 100644
--- a/app-exploits/pwntools/Manifest
+++ b/app-exploits/pwntools/Manifest
@@ -1,2 +1 @@
-DIST pwntools-3.13.0.tar.gz 1141340 BLAKE2B 9c137834076dc31f5879f92927a9e9ff2242f1a2ee14b3499f1bdb3c54632f38f6ac62e8b6736c8a12e8a7a7f2c13889a464696c9913f8387c8455d7dfe039ad SHA512 6480fef7a2ed2b9dcee15fb8cddbbb4f33fbb9e61648faad2e6736e15218022187d22bb41d832148c76ebae07f512e46784c08994a040fd330856dfb810a033d
 DIST pwntools-4.0.0.tar.gz 3986846 BLAKE2B 117fc85c22976dbac41f326b9545c9f4141af61b6408118b74defd0bd0aa4a084b00dd64f723ad79fe0e1a1aecdcf4995bff4c6cbd3ed3d2c72c94d104666013 SHA512 23c566ff5682bea2e0bb0b6b39ff2d211e4cba5a47a6b7d1d9870eef5ffaaf8d37f2826106d7821ef3969de76b6e0e994bd3d27314c837d4be2e5702d0925852
diff --git a/app-exploits/pwntools/files/pwntools-3.13.0_do_not_mess_with_docs.patch b/app-exploits/pwntools/files/pwntools-3.13.0_do_not_mess_with_docs.patch
deleted file mode 100644
index 1b82391e3..000000000
--- a/app-exploits/pwntools/files/pwntools-3.13.0_do_not_mess_with_docs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur a/setup.py b/setup.py
---- a/setup.py	2019-11-05 20:39:55.000000000 +0300
-+++ b/setup.py	2019-11-17 00:49:24.625637908 +0300
-@@ -68,14 +68,6 @@
-     print >> sys.stderr, "$ apt-get install python-dev"
-     sys.exit(-1)
- 
--# Convert README.md to reStructuredText for PyPI
--long_description = ''
--try:
--    long_description = subprocess.check_output(['pandoc', 'README.md', '--to=rst'])
--except Exception as e:
--    print >>sys.stderr, "Failed to convert README.md through pandoc, proceeding anyway"
--    traceback.print_exc()
--
- setup(
-     name                 = 'pwntools',
-     python_requires      = '~=2.7',
-@@ -97,7 +89,6 @@
-     entry_points = {'console_scripts': console_scripts},
-     scripts              = glob.glob("bin/*"),
-     description          = "Pwntools CTF framework and exploit development library.",
--    long_description     = long_description,
-     author               = "Gallopsled et al.",
-     author_email         = "pwntools-users@googlegroups.com",
-     url                  = 'https://pwntools.com',
diff --git a/app-exploits/pwntools/pwntools-3.13.0-r1.ebuild b/app-exploits/pwntools/pwntools-3.13.0-r1.ebuild
deleted file mode 100644
index 8565d9a86..000000000
--- a/app-exploits/pwntools/pwntools-3.13.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="CTF framework and exploit development library"
-HOMEPAGE="https://github.com/Gallopsled/pwntools"
-SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-#WTF? Most is under an MIT license, but a few pieces are under GPL or a BSD 2-clause licence
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/pyelftools[${PYTHON_USEDEP}]
-	dev-libs/capstone[python,${PYTHON_USEDEP}]
-	!!dev-libs/capstone-bindings
-	app-exploits/ROPgadget[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	<dev-python/intervaltree-3.0[${PYTHON_USEDEP}]
-	<dev-python/sortedcontainers-2.0[${PYTHON_USEDEP}]
-	dev-util/unicorn[python,unicorn_targets_x86(+),${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}_do_not_mess_with_docs.patch"
-	"${FILESDIR}/${P}_update_deps.patch"
-)
diff --git a/app-exploits/pwntools/pwntools-4.0.0.ebuild b/app-exploits/pwntools/pwntools-4.0.0.ebuild
index bd2906598..4591ef662 100644
--- a/app-exploits/pwntools/pwntools-4.0.0.ebuild
+++ b/app-exploits/pwntools/pwntools-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -15,10 +15,9 @@ SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-#REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-#${PYTHON_DEPS}
 RDEPEND="
+	${PYTHON_DEPS}
 	>=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}]
 	>=dev-python/mako-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyelftools-0.2.4[${PYTHON_USEDEP}]
diff --git a/dev-python/intervaltree/intervaltree-3.0.2.ebuild b/dev-python/intervaltree/intervaltree-3.0.2.ebuild
index 609acf10a..59ad7331d 100644
--- a/dev-python/intervaltree/intervaltree-3.0.2.ebuild
+++ b/dev-python/intervaltree/intervaltree-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -15,6 +15,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+#forked due to Gentoo bug:
+#https://bugs.gentoo.org/705382
 RDEPEND=">=dev-python/sortedcontainers-2.0[${PYTHON_USEDEP}]"
 #sortedcontainers >= 2.0, < 3.0']