diff --git a/net-libs/nodejs/nodejs-0.12.18.ebuild b/net-libs/nodejs/nodejs-0.12.18.ebuild
index 4bfc66c6f8cf5..2b8a1d2034541 100644
--- a/net-libs/nodejs/nodejs-0.12.18.ebuild
+++ b/net-libs/nodejs/nodejs-0.12.18.ebuild
@@ -52,13 +52,13 @@ src_prepare() {
 	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
 	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
 
-	default
-
 	# debug builds. change install path, remove optimisations and override buildtype
 	if use debug; then
 		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
 		BUILDTYPE=Debug
 	fi
+
+	default
 }
 
 src_configure() {
diff --git a/net-libs/nodejs/nodejs-4.8.7.ebuild b/net-libs/nodejs/nodejs-4.8.7.ebuild
index 44227b1490ce3..2d8146e4c393c 100644
--- a/net-libs/nodejs/nodejs-4.8.7.ebuild
+++ b/net-libs/nodejs/nodejs-4.8.7.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
@@ -73,7 +73,7 @@ src_prepare() {
 		BUILDTYPE=Debug
 	fi
 
-	epatch_user
+	default
 }
 
 src_configure() {