diff --git a/dev-python/nassl/Manifest b/dev-python/nassl/Manifest
index 27e2750a1..297f81bd3 100644
--- a/dev-python/nassl/Manifest
+++ b/dev-python/nassl/Manifest
@@ -1,4 +1,3 @@
-DIST nassl-2.2.0.tar.gz 204247 BLAKE2B 6efd2b621c5e86c2b139140b56731e34e6d0c235a7b924e5f718d14b81e748ace0fd2eb9735906e591a78ffb452f8986112be19ca6a7bb719889840b4a64a5ca SHA512 75dc81adb2c01663dbb9b8f4e7d457e206c53ea988e55024c09bcfae16a9f13915b718721624377a8e0330e1fcc6019dbc3a8925a53a791d7f2582c0a6f9202f
 DIST nassl-3.0.0.tar.gz 221298 BLAKE2B 682476eda51adfde9b42a9b6b9e97449e702be9257bc281fb2e60fc091f8aa3a43016128b56538c0adbe84e5d4c80508a3d02281fb8f5750629d7f03b0659f13 SHA512 bbaaee5564931901576f353944a00177bf09bd4d25a8c8bc1d2ea8877922848454987acf93f91ca3018cb5366a5967cb2865995a314f036696c7eeb5a2634bdb
 DIST openssl-OpenSSL_1_0_2e.zip 7242974 BLAKE2B c3e2a67d60067416627d0b61e4ee465488f329e1e9730ffe9980cc075caf583021ed3439d4fc1a504e039504f4b828b144a6673155171cb088ccc80fb8b8f222 SHA512 96ec9e8eff65387238ca523b7e5b3d330098a446af86ec1772e24eda99e63ef28364b5fa32e89f4dad2a38f07da9dd2a53f93eacf8040f94e93f03297f4a0508
 DIST openssl-OpenSSL_1_1_1.zip 17160238 BLAKE2B 9ff0510c112e9054a683896ec493e5fb76a88d281a28c0ef577ec722f8ba05129e00e62ca82e72d750785c2bd2ebf0365d977b417f6cecf9d3de12e75631f2d6 SHA512 9db4bf391739f4e835bcfda10533d49a7231508faf25d88d880dfadc98ffd3b503d58879368ff17bed33d7775c1f0eb6991aa71d6888f50c5ad65b2d221be18e
diff --git a/dev-python/nassl/nassl-2.2.0.ebuild b/dev-python/nassl/nassl-2.2.0.ebuild
deleted file mode 100644
index cb5b35934..000000000
--- a/dev-python/nassl/nassl-2.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit eutils distutils-r1 flag-o-matic
-
-#openssl system can be used optionally
-#something to investigate in https://github.com/nabla-c0d3/sslyze/issues/101
-#see tags in "build_tasks.py" file
-MY_OPENSSL_MODERN="OpenSSL_1_1_1"
-MY_OPENSSL_LEGACY="OpenSSL_1_0_2e"
-MY_ZLIB="zlib-1.2.11"
-
-DESCRIPTION="Experimental OpenSSL wrapper for Python 3.6+ and SSLyze"
-HOMEPAGE="https://github.com/nabla-c0d3/nassl"
-SRC_URI="https://github.com/nabla-c0d3/nassl/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/openssl/openssl/archive/${MY_OPENSSL_LEGACY}.zip -> openssl-${MY_OPENSSL_LEGACY}.zip
-	https://github.com/openssl/openssl/archive/${MY_OPENSSL_MODERN}.zip -> openssl-${MY_OPENSSL_MODERN}.zip
-	http://zlib.net/${MY_ZLIB}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/invoke[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare(){
-	mkdir deps
-	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_LEGACY}" "${S}/deps"
-	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_MODERN}" "${S}/deps"
-	ln -s "${WORKDIR}/${MY_ZLIB}" "${S}/deps"
-
-	#https://github.com/nabla-c0d3/nassl/issues/42
-	python3 /usr/bin/invoke build.zlib --do-not-clean
-	python3 /usr/bin/invoke build.legacy-openssl --do-not-clean
-	python3 /usr/bin/invoke build.modern-openssl --do-not-clean
-
-	eapply_user
-}
diff --git a/dev-python/nassl/nassl-3.0.0.ebuild b/dev-python/nassl/nassl-3.0.0-r1.ebuild
similarity index 84%
rename from dev-python/nassl/nassl-3.0.0.ebuild
rename to dev-python/nassl/nassl-3.0.0-r1.ebuild
index 65c78d3f3..c6eeb5794 100644
--- a/dev-python/nassl/nassl-3.0.0.ebuild
+++ b/dev-python/nassl/nassl-3.0.0-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit eutils distutils-r1 flag-o-matic
+
+inherit distutils-r1
 
 #openssl system can be used optionally
 #something to investigate in https://github.com/nabla-c0d3/sslyze/issues/101
@@ -26,11 +27,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/invoke[${PYTHON_USEDEP}]"
-
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-src_prepare(){
+src_prepare() {
 	rm -r tests
 
 	mkdir deps
@@ -38,10 +38,20 @@ src_prepare(){
 	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_MODERN}" "${S}/deps"
 	ln -s "${WORKDIR}/${MY_ZLIB}" "${S}/deps"
 
+	eapply_user
+}
+
+src_compile() {
 	#https://github.com/nabla-c0d3/nassl/issues/42
 	python3 /usr/bin/invoke build.zlib --do-not-clean
 	python3 /usr/bin/invoke build.legacy-openssl --do-not-clean
 	python3 /usr/bin/invoke build.modern-openssl --do-not-clean
 
-	eapply_user
+	compile_python() {
+		${EPYTHON} setup.py build_ext
+		#https://github.com/nabla-c0d3/nassl/issues/63
+		MAKEOPTS="${MAKEOPTS} -j1"
+		distutils-r1_python_compile
+	}
+	python_foreach_impl compile_python
 }