--- trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/04/30 11:45:02	30862
+++ trunk/extras/spidermonkey/spidermonkey-52.7.3-r1.smage2	2018/04/30 15:00:16	30867
@@ -17,15 +17,14 @@
 
 # direct mecurial export
 SRCFILE="FIREFOX_${PVER//./_}esr_RELEASE.tar.bz2"
-PATCHDIR="${BUILDDIR}/mozilla-unified-FIREFOX_${PVER//./_}esr_RELEASE"
-SRCDIR="${PATCHDIR}/js/src"
+SRCDIR="${BUILDDIR}/mozilla-unified-FIREFOX_${PVER//./_}esr_RELEASE"
 
 EMUL_LINUX_32=true
-sminclude multilib mbuild
+sminclude multilib
 msetfeature "!check"
 
 SRC_URI=(
-	https://hg.mozilla.org/mozilla-unified/archive/${SRCFILE}
+	#https://hg.mozilla.org/mozilla-unified/archive/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 	mirror://${PNAME}/${PNAME}-${PVER}-fix-soname.patch
 	mirror://${PNAME}/${PNAME}-${PVER}-copy-headers.patch
@@ -38,10 +37,27 @@
 src_prepare()
 {
 	munpack ${SRCFILE} || die
-	SRCDIR="${PATCHDIR}" mpatch ${PNAME}-${PVER}-fix-soname.patch || die
-	SRCDIR="${PATCHDIR}" mpatch ${PNAME}-${PVER}-copy-headers.patch || die
-	SRCDIR="${PATCHDIR}" mpatch ${PNAME}-${PVER}-disable-mozglue.patch || die
-	SRCDIR="${PATCHDIR}" mpatch ${PNAME}-${PVER}-include-configure-script.patch || die
+	mpatch ${PNAME}-${PVER}-fix-soname.patch || die
+	mpatch ${PNAME}-${PVER}-copy-headers.patch || die
+	mpatch ${PNAME}-${PVER}-disable-mozglue.patch || die
+	mpatch ${PNAME}-${PVER}-include-configure-script.patch || die
+
+	# create missing python execs on multilib systems
+	if [[ ${ARCH} = x86_64 ]] && [[ $(mlibdir) != lib ]]
+	then
+		for abi in ${MULTILIB_ABIS}
+		do
+			cd ${SRCDIR}-${abi}
+			sed -i '/^rm -rf _virtualenv/d' configure.in || die
+			sed -i '/^mkdir -p _virtualenv/d' configure.in || die
+
+			install -d _virtualenv/bin || die
+			cp -a /usr/bin/python-m32 _virtualenv/bin || die
+			cp -a /usr/bin/python-m64 _virtualenv/bin || die
+			cp -a /usr/bin/python$(mget-python-version)-m32 _virtualenv/bin || die
+			cp -a /usr/bin/python$(mget-python-version)-m64 _virtualenv/bin || die
+		done
+	fi
 }
 
 src_compile()
@@ -52,6 +68,7 @@
 	export CXX=g++
 	export PYTHON=/usr/bin/python2
  
+	SRCSUBDIR="js/src" \
 	mconfigure \
 		--disable-debug \
 		--disable-debug-symbols \
@@ -69,5 +86,10 @@
 		--without-system-icu \
 		|| die
 
-	mmake || die
+	SRCSUBDIR="js/src" mmake || die
+}
+
+src_install()
+{
+	SRCSUBDIR="js/src" mmake DESTDIR=${BINDIR} install || die
 }