--- johntheripper-1.7.9-r6.ebuild.save	2013-11-19 10:03:06.070976336 +0100
+++ johntheripper-1.7.9-r6.ebuild	2013-11-19 10:31:07.113842765 +0100
@@ -21,16 +21,18 @@
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 #Remove AltiVec USE flag. Appears to be an upstream issue.
-IUSE="cuda custom-cflags -minimal mmx mpi opencl openmp sse2"
+IUSE="cuda custom-cflags -minimal mmx mpi opencl openmp sse2 moz"
 REQUIRED_USE="openmp? ( !minimal )
 	mpi? ( !minimal )
 	cuda? ( !minimal )
-	opencl? ( !minimal )"
+	opencl? ( !minimal )
+	moz? ( !minimal )"
 
 RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7:0 )
 	mpi? ( virtual/mpi )
 	cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
-	opencl? ( virtual/opencl )"
+	opencl? ( virtual/opencl )
+	moz? ( dev-libs/nss dev-libs/nspr )"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
@@ -155,6 +157,9 @@
 			-i Makefile || die "sed Makefile failed"
 		sed -i 's#/usr/local#/opt#g' Makefile || die
 	fi
+	if use moz; then
+		sed -i -e '/HAVE_NSS =/s/^#*//' -e 's/NSS_override//' Makefile || die
+	fi
 	sed -i 's#JOHN_OBJS = \\#JOHN_COMMON_OBJS = \\#g' Makefile || die
 }
 
@@ -226,6 +231,7 @@
 			; do
 			dosym john /usr/sbin/$s
 		done
+		use moz && dosym john /usr/sbin/mozilla2john
 		dosbin run/calc_stat
 		dosbin run/genmkvpwd
 		dosbin run/mkvcalcproba