dev-lang/spidermonkey: fix includedir install path on 52.4.0

Restored upstream config/baseconfig.mk to undo something that was
applied agaist firefox-52.4.0esr.

Closes: http://bugs.gentoo.org/630506

Package-Manager: Portage-2.3.8, Repoman-2.3.1

dev-lang/spidermonkey/files/spidermonkey-52-baseconfig.patch

@@ -0,0 +1,22 @@
+Fix various paths to include MOZ_APP_VERSION
+
+This has been committed upstream but was not included in
+the 52.4.0 sources that spidermonkey was rolled from.
+
+--- a/config/baseconfig.mk	2017-10-03 14:00:45.000000000 -0400
++++ b/config/baseconfig.mk	2017-10-03 16:36:10.857663794 -0400
+@@ -2,10 +2,10 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
+ # whether a normal build is happening or whether the check is running.
+-includedir := $(includedir)/$(MOZ_APP_NAME)
+-idldir = $(includedir)/idl/$(MOZ_APP_NAME)
+-installdir = $(libdir)/$(MOZ_APP_NAME)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)
++includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = $(includedir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ ifeq (.,$(DEPTH))
+ DIST = dist
+ else

dev-lang/spidermonkey/spidermonkey-52.4.0_pre20171003-r1.ebuild

@@ -44,6 +44,7 @@ src_prepare() {
 		|| die
 
 	eapply "${WORKDIR}/${PN}"
+	eapply "${FILESDIR}"/${PN}-52-baseconfig.patch
 
 	eapply_user
 
@@ -130,9 +131,6 @@ src_install() {
 	cd "${BUILDDIR}" || die
 	emake DESTDIR="${D}" install
 
-	#work around bad header installation
-	mv "${ED}"usr/include/mozjs{,-52} || die
-
 	if ! use minimal; then
 		if use jit; then
 			pax-mark m "${ED}"usr/bin/js${SLOT}