--- webkit-gtk-1.11.4-r300.ebuild	2013-01-15 15:17:08.227072220 +0000
+++ webkit-gtk-1.11.4-r300.ebuild	2013-01-29 19:14:41.845527081 +0000
@@ -54,6 +54,7 @@ RDEPEND="
 		x11-libs/libXdamage )
 "
 # paxctl needed for bug #407085
+PAX_DEPEND="|| ( sys-apps/elfix sys-apps/paxctl )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	=dev-lang/python-2*
@@ -68,10 +69,10 @@ DEPEND="${RDEPEND}
 	>=sys-devel/make-3.82-r4
 	virtual/pkgconfig
 
-	introspection? ( jit? ( sys-apps/paxctl ) )
+	introspection? ( jit? ( ${PAX_DEPEND} ) )
 	test? (
 		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
+		jit? ( ${PAX_DEPEND} ) )
 "
 # Need real bison, not yacc
 
@@ -123,7 +124,7 @@ src_prepare() {
 	# Build-time segfaults under PaX with USE="introspection jit", bug #404215
 	if use introspection && use jit; then
 		epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch"
-		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
+		cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die
 	fi
 
 	# We need to reset some variables to prevent permissions problems and failures