--- polkit-0.112-r2.ebuild
+++ polkit-0.112-r2.ebuild
@@ -11,12 +11,12 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE="examples gtk +introspection kde nls pam selinux systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples gtk +introspection jit kde nls pam selinux systemd"
 
 RDEPEND="ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
 	mips? ( =dev-lang/spidermonkey-1.8.5*[-debug] )
-	!ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug] ) )
+	!ia64? ( !mips? ( dev-lang/spidermonkey:17[-debug,jit=] ) )
 	>=dev-libs/glib-2.32
 	>=dev-libs/expat-2:=
 	introspection? ( >=dev-libs/gobject-introspection-1 )
@@ -80,7 +80,9 @@
 
 	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
 	local f='src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest'
-	local m='m'
+	local m
+	# Only used when USE="jit" is enabled for 'dev-lang/spidermonkey:17' wrt #485910
+	has_version 'dev-lang/spidermonkey:17[jit]' && m='m'
 	# ia64 and mips uses spidermonkey-1.8.5 which requires different pax-mark flags
 	use ia64 && m='mr'
 	use mips && m='mr'