diff --git a/dev-python/pypy-bin/pypy-bin-2.6.0-r2.ebuild b/dev-python/pypy-bin/pypy-bin-2.6.0-r2.ebuild
index 24c009e40f5de..30b1707a0ee2d 100644
--- a/dev-python/pypy-bin/pypy-bin-2.6.0-r2.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-2.6.0-r2.ebuild
@@ -51,7 +51,7 @@ REQUIRED_USE="!jit? ( !shadowstack )
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
+IUSE="doc gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 # yep, world would be easier if people started filling subslots...
 RDEPEND="
diff --git a/dev-python/pypy-bin/pypy-bin-4.0.0-r1.ebuild b/dev-python/pypy-bin/pypy-bin-4.0.0-r1.ebuild
index d5081ddd40366..0ac20cca6426b 100644
--- a/dev-python/pypy-bin/pypy-bin-4.0.0-r1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-4.0.0-r1.ebuild
@@ -51,7 +51,7 @@ REQUIRED_USE="!jit? ( !shadowstack )
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
+IUSE="doc gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 # yep, world would be easier if people started filling subslots...
 RDEPEND="
diff --git a/dev-python/pypy-bin/pypy-bin-4.0.1.ebuild b/dev-python/pypy-bin/pypy-bin-4.0.1.ebuild
index c2c94e8968197..a549a9bf021a1 100644
--- a/dev-python/pypy-bin/pypy-bin-4.0.1.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-4.0.1.ebuild
@@ -51,7 +51,7 @@ REQUIRED_USE="!jit? ( !shadowstack )
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
+IUSE="doc gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 # yep, world would be easier if people started filling subslots...
 RDEPEND="
diff --git a/dev-python/pypy/pypy-2.6.0-r1.ebuild b/dev-python/pypy/pypy-2.6.0-r1.ebuild
index 4058bf05a68b8..720c79d986c12 100644
--- a/dev-python/pypy/pypy-2.6.0-r1.ebuild
+++ b/dev-python/pypy/pypy-2.6.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
diff --git a/dev-python/pypy/pypy-4.0.0-r1.ebuild b/dev-python/pypy/pypy-4.0.0-r1.ebuild
index 19988bfe2df60..9a64dcbae0d08 100644
--- a/dev-python/pypy/pypy-4.0.0-r1.ebuild
+++ b/dev-python/pypy/pypy-4.0.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
diff --git a/dev-python/pypy/pypy-4.0.1.ebuild b/dev-python/pypy/pypy-4.0.1.ebuild
index 19988bfe2df60..9a64dcbae0d08 100644
--- a/dev-python/pypy/pypy-4.0.1.ebuild
+++ b/dev-python/pypy/pypy-4.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 302e84393a752..331ea557e59e9 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS=""
-IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
diff --git a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild
index 45e75f7e5a1c7..21b40bb3b8c08 100644
--- a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r1.ebuild
@@ -50,7 +50,7 @@ REQUIRED_USE="!jit? ( !shadowstack )
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit shadowstack sqlite cpu_flags_x86_sse2 test tk"
+IUSE="gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 # yep, world would be easier if people started filling subslots...
 RDEPEND="
diff --git a/dev-python/pypy3/pypy3-2.4.0.ebuild b/dev-python/pypy3/pypy3-2.4.0.ebuild
index 9c15e466801f3..fdff56aa4786a 100644
--- a/dev-python/pypy3/pypy3-2.4.0.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 tk"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 73bd1594c24e2..80507799ecbb4 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -18,7 +18,7 @@ SRC_URI=""
 LICENSE="MIT"
 SLOT="0/$(get_version_component_range 1-2 ${PV})"
 KEYWORDS=""
-IUSE="bzip2 gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+IUSE="bzip2 gdbm +jit low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 test tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=