Support spidermonkey-1.8.7 #423991 by Ian Stakenvicius.

Package-Manager: portage-2.2.0_alpha131/cvs/Linux x86_64

4 files changed, 283 insertions, 18 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index c5f3b0732d80..9b87a641b630 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.36 2012/10/02 06:35:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.37 2012/10/02 07:48:56 vapier Exp $
+
+  02 Oct 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/mediatomb-0.12.1-mozjs187.patch, mediatomb-0.12.1-r3.ebuild:
+  Support spidermonkey-1.8.7 #423991 by Ian Stakenvicius.
 
   02 Oct 2012; Mike Frysinger <vapier@gentoo.org>
   +files/mediatomb-0.12.1-libextractor.patch, mediatomb-0.12.1-r3.ebuild:
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index e381ea77cb4e..2cbcc6c5a8c2 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -10,29 +10,30 @@ AUX mediatomb-0.12.1-libav7.patch 1983 SHA256 c6523e8bf5e2da89b7475d6777ef9bffe7
 AUX mediatomb-0.12.1-libextractor.patch 21074 SHA256 19f71fc190683056bb5f920a012bb06f10ea8c8680702fa1e5f166293aaf14bd SHA512 c71f872b98f8928baf5c53e5dad59efea622429f8b9e8b257afef53f263b7090fc986dc29e68a2d6164f60c1b74080804b4550b99f5613533001246a5336a77f WHIRLPOOL fb6c4331215d1cf13542627f0b961515e0c6aee4e7d10fb8228b06a4db71f75dd0a7276678b74a175c313d081a58e74734d11dd4620e3234da2054e450332be7
 AUX mediatomb-0.12.1-libmp4v2.patch 5893 SHA256 d39c2f9aab051c5447461718fd0ec72cf5982f6c920a4a985a50831f34babe84 SHA512 8e712c13de6e129a9a0b0805fc00c3af92bc3cedb583fa3e068c27d57ed52ad3b4c777bd92a6b073e2fee88376a28ce4d2467e97ab8ae2f9ea3ed7a64a0e45d3 WHIRLPOOL 6d8c1c06db3aed67f920f40176cd389ac84d7294b78ec5ca3f61920977fde8cbe49dac6bffe1050f97aca15af5fa4a743d947e3cba8f6a3ef9b0370bff7dac67
 AUX mediatomb-0.12.1-mozjs185.patch 22839 SHA256 3960961f1fbe46baff3956ea2fa94b4dc193c0d278b8646cda1f4cee26812f59 SHA512 df66b6818ec28aae494b12c50981cc9b2762796a4af6f2c9d1dc813148f2fd97c8816851a3fb871213e88dcd1a331a06fae9f20a23df9302c9b41f2446fbd28c WHIRLPOOL 5191c0a823e2b9b054c9a5ec9b8d1f92dc5038bee9e0043e13d10b92740f3f69c05cffcb1dcb67273ad1d8443149f2e6a36d70638e37fd28346ec0ddf642cc9f
+AUX mediatomb-0.12.1-mozjs187.patch 8019 SHA256 4f502ead6b2620d188b2e8eeb01e353960d0527ffa46edb7dd73793d2e1343e2 SHA512 dc647eb34e508ac3ccdfc578b30e181da5aad60677a912e7a02967226a22e9f61f3123d84422c9ccd27cbba451b928b939cab3550286342bb662a319b097c66b WHIRLPOOL c09ccd53ca0d619e71e7a1fe3fb223896c8176f212b489012bdc6f5e894ac375622168448225b6cf0527ce527e426a26360ea22a520a4c66bc1a804ed0eb616a
 AUX mediatomb-0.12.1-system-uuid.patch 954 SHA256 ec6ad3d71a7ea9ed3adb284aaa6bf57f435f05738f4e20d1f49eefa7e8051780 SHA512 68ac4bca71ac5f2e52daffb58d54199ddc87a7cfd02b89e93bc0c1b4496b95f6c82c0d362d36f37d3a9076c3bfb5d018df809fb485ca687923e5e1b78e6bf4bf WHIRLPOOL 88adbe3f19493314609dea727c6b57b272095396358a14921e966cf3cfab86a3754fe5321d855b3980f7c22a38bf7c18d774b58a60f8a82abed945dc047b24f9
 AUX mediatomb-0.12.1.initd 954 SHA256 7a12a5e4aac11e1e3abae9522ecea10527c813b12b51258f47518868c23c94c4 SHA512 6d8e3f95a8342e5a8097f17f1b44a52afad6c89cff59b8cbe8ccc947bdc41e4c20ecfc0f40fee3b64617b240b7f5d3d8e9c1c129eeb9cf5a7686982cdfddafe9 WHIRLPOOL 7d019d5f13278b3bf8755b79bb191beeaed7daf5843a24aa0bbe67dda6aa029b71171a0276322836c0ffaa5f43f0c39b0af1f0cb8f242667748b01e097ba4de0
 DIST mediatomb-0.12.1.tar.gz 1240612 SHA256 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd SHA512 36e7269a532a79c91b4ea7be36f92cbefa913a1f856e422e46fe2b97ee7a569dd20c38b0cbe651a8e7faacde892ea18f3cac66c3c0737480c44f9b9bc3a45438 WHIRLPOOL 6a9e294aa9f8f40850863a86bae4fd6a81d198d7f4cf34d67a6a0cd568c387ef0f0bd5a3524c7bc05cb304f4e86dd0c12dc773bd1034c1924af6919cc740177b
 DIST mediatomb_0.12.1-4.debian.tar.gz 34161 SHA256 b1e48d01f4f99362ef554c9220df21c48f6b76ad716e29427948a524e5c84d90 SHA512 21f876de3ec0b24bfcb37d387b5337d574f2e62e12944547f0a2e69e34532e296097fd04cce9941e994c3823a7bb863172db4fc3024d490f2a2359b7f0adb079 WHIRLPOOL ad38bc64411f1aac25672c522b862401897f0e4225ea21bab317a1c3311ef87a3e688f6ea1abb5a30eeb4cb3165dabbbff158eb5d4267dba901a54f15017078d
 EBUILD mediatomb-0.12.1-r1.ebuild 3792 SHA256 f2e6e0aca325d095d92f6f6bba51b398461151ebbb6495fff5da1719bd0a3c48 SHA512 07fd3cf9d22e5f28525dceae5889b60e5846e14bfd4abd0b5ea893b7c6e99caad7f67285bab147f3dc9b7b0e6ce48c2185dd99dc134c8b7016bdebd27164441d WHIRLPOOL aad1ca88de7d922d25dbc7dd1278c337dd7e4e90ac1e891cf7d60986f110b524400835c03bdd10493d99b216680c3be3a78bc527baad994ba591f1276ef74866
 EBUILD mediatomb-0.12.1-r2.ebuild 3889 SHA256 923070cbdadb4f1b04e604371734a28f3a6db7ae3270e27c880dddd432e5cb06 SHA512 33217cf659c746244293bbcfdcec90e6499cba612cbbfe8d12f425be383cd28ee24a928ebfafb239bb47eebade6fc75821295ac0bc3972c8f720f12b0cf00d95 WHIRLPOOL 6ba2c8038eb3213ed552a6772d9782b45f5cfa69a46912d55dd273fcb2df8927edcb94523077d1aa45d8fbe14dc07686aec45f76de648df181d5691702c62488
-EBUILD mediatomb-0.12.1-r3.ebuild 4115 SHA256 255ca49f07f9470cde89b0eedfe8950216bc4ab8ee8e9d09339f9bbe77d34a90 SHA512 f09f4700cf457fe7cc7287abe4f5472be5ccf52f4c75ae1e2e0ec1389c89d78cd0a70f1ada7865197ec019ece3b712f22b7f364915040cfb92c4471793095e58 WHIRLPOOL 026265c72eaccf9d42b29d09a24eb84c5b7cb0f69999f5a87cb23fc1f9fa7f3b7395f5c8d7b0edb04e0493aa871ec58feaca1baf6546eaf08256eeb4b8a26e46
-MISC ChangeLog 6637 SHA256 d6a3cb995a1a10d35ebccd1197659dfbca45385bc31685a269390970727e6f9f SHA512 b3661607c0dfdc852764688502cd216c6e8bf9f2e42e0f3ba2dc9f31cc8446281c2c79c5255d9b68722a3874a48877b545fe73da114a87f36c8508cfd328fbf6 WHIRLPOOL 63c0f92f57c635efe48f6d3900ffdb45c23b80e1eb2eb475abcd316574c039c5565adcae0e3e835302192ddf18f225c528f7a506c129f522652454cff13f86a6
+EBUILD mediatomb-0.12.1-r3.ebuild 4105 SHA256 978d94cfed93c47638bc4e403464dd333b4d6418734282e83bde88fafd141cf2 SHA512 75499fd11f00d1e0cb0ff18dfad3c0d10605aa6ed2cf74cbea6d3f84db95a7c5167f792145a6f064d8451d68a03ed15ccc50365e35ffb920cdecd5ebdee430cf WHIRLPOOL ce2628f2fb23f07ee0f318a91567bf3dab022b33f134050d5f1b1704e223644ce43b9de2a02c1fa475c9343aa9d891ddc2dfb193ce7198bd87f230cd1aac4abb
+MISC ChangeLog 6816 SHA256 35f40a10f4a1b5765f60135d3eac9dc88e50d9c207427a7f9805558d1f9f11de SHA512 dfc3be925553ed58a6ab339a26affce13eedd99a75e9d4b15703d503d821e91586a29b98be977a143ef54e7e3acc5ea9bb7470f392f8d1566b6b1fae78848b58 WHIRLPOOL f0fdcb24fc5e05e64e9eb0eacfad15f71b781bfed73b3910520f1210d2cd007e7e8721c86fcd2d079c9eb09fc279f6e8f17c7a1c29d6be00b72e499ce6294651
 MISC metadata.xml 868 SHA256 1d1c5d3778c67556255786a5082e7c45b598a2edf20159b6e337ed04ebe15bd4 SHA512 a20d44b05d6a4ebf31deed0289a4d7f0d96a8a1ff370a4bbec1d1f8b5b12823a047e846a95e24fd0e47c0020478d3ff0402642309a8fb8554db841db2fa89e05 WHIRLPOOL c68c00fe9cf9902c4c3a4edef9d223b6a68627c1c26aede016aaed4b7d8f7bcae6e280a9ddf8dea435e53c017a56eec303b3aab0d72bae0ca2c59e063d8f1720
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQaos6AAoJELEHsLL7fEFWUGkP/1eXqlV9/Br4p0pexHVGLpNh
-SMg4Jf0JFzuNvUR4E7mxB2Bwgz4WZEjxYd7HRHFJwZ4upA361JkM55pAJFwtZs2+
-rTGJ/LIDs5nbZc5SGJ9P5JTt0ny7MoSU+WPkW3PO3waQr9kDJrXGDs2s+eU0vW+4
-dUuC0Ad9VuWH3xRIsqcrtv/O4FCpAx6L1EhLRk+CR45yFoN/qVN7Bhy1TzK6ZKit
-uugozbyQIzu6TDLRWEnbOpIt1oq+F+TEq9UvEkQBKEGWk1cAMfZ4cdzq9nn2qY1A
-wzdo6AVfnjcSmOLrgfYBhAf49/OCL1g+D8TNiHlohpNnWiMBVqIvhHfnMjOa+g4H
-161+28Gdi3duxdjSpT0izAZbyephcsupqCArSlJdtdl1RIsJe7yXOt+jMZSpfatl
-jbp6N1eyMWsNuZPjjiqNV1E+aWZqqhhuJzQiRJveOGy/6VUA1PnovyJJ/OS7lYLY
-9Y34ClXiMWwXMg2d9sqKdBA7U11aYSo1yc6Wz2YE8qk+8HD7VBX/7nDcvfEXRcnX
-T09OPn135mmxHOpZDXan8FG49EzvwQxlcR3+NkVsWFORaDvlqZ61zgp29nNJWGs7
-F7m6SjgEQRucsCCBy1NN8TTxdf157MxAwvx1p/NsJZEZK/Oga3XQ8nc6YZM0hCL6
-qbaeJVObjl0ZGECXHcwX
-=YVZO
+iQIcBAEBCAAGBQJQapxuAAoJELEHsLL7fEFW/j8P/3GvpT6euJMO5bvx1uwm+F/S
+rjhhQJai3JgLjPxI3uuTDdo9MUpV2PYQcHyp67DDol1bfTHTqlg68enSDHFOSSom
+ZWv7FqySKdDkNDPn2nOsCksvx7BSkv3rTvze+BycNV7iv823ir6v5h1HqJyVDzqT
+ErD33bGn87MukIr8NI8vyBPfV9aV/4F8GkDO/YfEcM48BPQJsmcRlqJ/evFoFDUU
+urTqXSGIw4+EZkFn9gZjHLtLTDutjwi5TNpzKseqoJqsYt4J2UFTWNXwMUnz5UOR
+DJO4Pb+0UVtbVz4JzHioZ2wtXMHN+S2EOhtkiWRUovtexkEZiQZ2IDdRvwF3nJO8
+Q6vBF33/LM2VeAtBfwq2i8DcLUBFZmLd9fgKU+71lHj8zWGq+heORJvyMHftkukH
+yCIrl/9yJH6SCJRyAlng2pr7n6/T47FOaaDuolZa9mL3jOBbE4aQMlCzavlhCH/y
+xA1B7TQ8qyCZSJx+FqnDzdixlyEoCDhMSAUCzKEiOD4Zg36ulUIjYjl8MQysDbLF
+ZukPU+ivJnfuB0ICkKNn1lITqKQGIIWK9v9Vczr4NzAR0dEatj5sQ1s8qwpaDLnH
+nX+qab4+fg7MNFqDaUYYTn6yc4jWT8RuC3U/0BRhOqOOcmQR7IcPHUzXXMgP7zur
+I4OmbztsRPLwr7ZUCgGd
+=tuD2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1-mozjs187.patch b/net-misc/mediatomb/files/mediatomb-0.12.1-mozjs187.patch
new file mode 100644
index 000000000000..c4b080a3656b
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1-mozjs187.patch
@@ -0,0 +1,260 @@
+maybe this is correct, maybe it's not.  spidermonkey's documentation blows, so
+who is to say!
+
+https://bugs.gentoo.org/423991
+
+--- a/src/scripting/dvd_image_import_script.cc
++++ b/src/scripting/dvd_image_import_script.cc
+@@ -232,8 +232,6 @@ DVDImportScript::DVDImportScript(Ref<Runtime> runtime) : Script(runtime)
+ 
+         String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_DVD_SCRIPT); 
+         load(scriptPath);
+-        root = JS_NewScriptObject(cx, script);
+-        JS_AddNamedRoot(cx, &root, "DVDImportScript");
+         log_info("Loaded %s\n", scriptPath.c_str());
+ 
+          Ref<Dictionary> mappings =
+@@ -296,21 +294,4 @@ void DVDImportScript::processDVDObject(Ref<CdsObject> obj)
+ #endif
+ }
+ 
+-DVDImportScript::~DVDImportScript()
+-{
+-#ifdef JS_THREADSAFE
+-    JS_SetContextThread(cx);
+-    JS_BeginRequest(cx);
+-#endif
+-    
+-    if (root)
+-        JS_RemoveRoot(cx, &root);
+-
+-#ifdef JS_THREADSAFE
+-    JS_EndRequest(cx);
+-    JS_ClearContextThread(cx);
+-#endif
+-
+-}
+-
+ #endif // HAVE_JS
+--- a/src/scripting/dvd_image_import_script.h
++++ b/src/scripting/dvd_image_import_script.h
+@@ -41,7 +41,6 @@ class DVDImportScript : public Script
+ {
+ public:
+     DVDImportScript(zmm::Ref<Runtime> runtime);
+-    ~DVDImportScript();
+     /// \brief Adds a DVD object to the database
+     /// 
+     /// \param title DVD title number
+--- a/src/scripting/import_script.cc
++++ b/src/scripting/import_script.cc
+@@ -53,8 +53,6 @@ ImportScript::ImportScript(Ref<Runtime> runtime) : Script(runtime)
+     try 
+     {
+         load(scriptPath);
+-        root = JS_NewObject(cx, NULL, script, NULL);
+-        JS_AddNamedObjectRoot(cx, &root, "ImportScript");
+     }
+     catch (Exception ex)
+     {
+@@ -109,21 +107,4 @@ void ImportScript::processCdsObject(Ref<CdsObject> obj, String rootpath)
+ #endif
+ }
+ 
+-ImportScript::~ImportScript()
+-{
+-#ifdef JS_THREADSAFE
+-    JS_SetContextThread(cx);
+-    JS_BeginRequest(cx);
+-#endif
+-    
+-    if (root)
+-        JS_RemoveObjectRoot(cx, &root);
+-
+-#ifdef JS_THREADSAFE
+-    JS_EndRequest(cx);
+-    JS_ClearContextThread(cx);
+-#endif
+-
+-}
+-
+ #endif // HAVE_JS
+--- a/src/scripting/import_script.h
++++ b/src/scripting/import_script.h
+@@ -41,11 +41,8 @@ class ImportScript : public Script
+ {
+ public:
+     ImportScript(zmm::Ref<Runtime> runtime);
+-    ~ImportScript();
+     void processCdsObject(zmm::Ref<CdsObject> obj, zmm::String rootpath);
+     virtual script_class_t whoami() { return S_IMPORT; }
+-private:
+-    JSObject *root;
+ };
+ 
+ #endif // __SCRIPTING_IMPORT_SCRIPT_H__
+--- a/src/scripting/playlist_parser_script.cc
++++ b/src/scripting/playlist_parser_script.cc
+@@ -93,8 +93,6 @@ PlaylistParserScript::PlaylistParserScript(Ref<Runtime> runtime) : Script(runtim
+ 
+         String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); 
+         load(scriptPath);
+-        root = JS_NewObject(cx, NULL, script, NULL);
+-        JS_AddNamedObjectRoot(cx, &root, "PlaylistScript");
+     }
+     catch (Exception ex)
+     {
+@@ -236,21 +234,4 @@ void PlaylistParserScript::processPlaylistObject(zmm::Ref<CdsObject> obj, Ref<Ge
+ 
+ }
+ 
+-
+-PlaylistParserScript::~PlaylistParserScript()
+-{
+-#ifdef JS_THREADSAFE
+-    JS_SetContextThread(cx);
+-    JS_BeginRequest(cx);
+-#endif
+-
+-    if (root)
+-        JS_RemoveObjectRoot(cx, &root);
+-
+-#ifdef JS_THREADSAFE
+-    JS_EndRequest(cx);
+-    JS_ClearContextThread(cx);
+-#endif
+-
+-}
+ #endif // HAVE_JS
+--- a/src/scripting/playlist_parser_script.h
++++ b/src/scripting/playlist_parser_script.h
+@@ -42,7 +42,6 @@ class PlaylistParserScript : public Script
+ {
+ public:
+     PlaylistParserScript(zmm::Ref<Runtime> runtime);
+-    ~PlaylistParserScript();
+     zmm::String readln();
+     void processPlaylistObject(zmm::Ref<CdsObject> obj, zmm::Ref<GenericTask> task);
+     virtual script_class_t whoami() { return S_PLAYLIST; }
+@@ -52,7 +51,6 @@ private:
+     int currentObjectID;
+     char *currentLine;
+     zmm::Ref<GenericTask> currentTask;
+-    JSObject *root;
+ };
+ 
+ #endif // __SCRIPTING_PLAYLIST_PARSER_SCRIPT_H__
+--- a/src/scripting/script.cc
++++ b/src/scripting/script.cc
+@@ -427,15 +427,10 @@ static JSFunctionSpec js_global_functions[] = {
+         try
+         {
+             common_script = _load(common_scr_path);
+-            common_root = JS_NewObject(cx, NULL, common_script, NULL);
+-            JS_AddNamedObjectRoot(cx, &common_root, "common-script");
+             _execute(common_script);
+         }
+         catch (Exception e)
+         {
+-            if (common_root)
+-                JS_RemoveObjectRoot(cx, &common_root);
+-
+             log_js("Unable to load %s: %s\n", common_scr_path.c_str(), 
+                     e.getMessage().c_str());
+         }
+@@ -459,8 +454,6 @@ Script::~Script()
+     JS_SetContextThread(cx);
+     JS_BeginRequest(cx);
+ #endif
+-    if (common_root)
+-        JS_RemoveObjectRoot(cx, &common_root);
+ 
+ /*
+  * scripts are unrooted and will be cleaned up by GC
+@@ -532,12 +532,12 @@ void Script::defineFunctions(JSFunctionSpec *functions)
+         throw _Exception(_("Scripting: JS_DefineFunctions failed"));
+ }
+ 
+-JSObject *Script::_load(zmm::String scriptPath)
++JSScript *Script::_load(zmm::String scriptPath)
+ {
+     if (glob == NULL)
+         initGlobalObject();
+ 
+-    JSObject *scr;
++    JSScript *scr;
+ 
+     String scriptText = read_text_file(scriptPath);
+ 
+@@ -568,7 +568,7 @@ void Script::load(zmm::String scriptPath)
+ }
+ 
+ 
+-void Script::_execute(JSObject *scr)
++void Script::_execute(JSScript *scr)
+ {
+     jsval ret_val;
+ 
+--- a/src/scripting/script.h
++++ b/src/scripting/script.h
+@@ -66,8 +66,8 @@ public:
+     JSRuntime *rt;
+     JSContext *cx;
+     JSObject  *glob;
+-    JSObject  *script;
+-    JSObject  *common_script;
++    JSScript  *script;
++    JSScript  *common_script;
+     
+ public:
+     Script(zmm::Ref<Runtime> runtime);
+@@ -112,11 +112,9 @@ protected:
+     zmm::Ref<CdsObject> processed;
+     
+ private:
+-    JSObject *common_root;
+-
+     void initGlobalObject();
+-    JSObject *_load(zmm::String scriptPath);
+-    void _execute(JSObject *scr);
++    JSScript *_load(zmm::String scriptPath);
++    void _execute(JSScript *scr);
+     zmm::Ref<StringConverter> _p2i;
+     zmm::Ref<StringConverter> _j2i;
+     zmm::Ref<StringConverter> _f2i;
+--- a/configure.ac
++++ b/configure.ac
+@@ -1036,13 +1036,13 @@
+                 ],
+                 [
+                     unset ac_cv_lib_smjs_JS_NewObject
+-                    AC_CHECK_LIB(mozjs185, JS_NewObject,
++                    AC_CHECK_LIB(mozjs187, JS_NewObject,
+                         [
+-                            MOZLIB=mozjs185
+-                            JS_LIBS="-lmozjs185"
++                            MOZLIB=mozjs187
++                            JS_LIBS="-lmozjs187"
+                         ],
+                         [
+-                    unset ac_cv_lib_mozjs185_JS_NewObject
++                    unset ac_cv_lib_mozjs187_JS_NewObject
+                     AC_CHECK_LIB(mozjs, JS_NewObject,
+                         [
+                             MOZLIB=mozjs
+@@ -1064,11 +1064,11 @@
+                                             MOZLIB=smjs
+                                         ],
+                                         [
+-                                    unset ac_cv_lib_mozjs185_JS_NewObject
+-                                    AC_CHECK_LIB(mozjs185, JS_NewObject,
++                                    unset ac_cv_lib_mozjs187_JS_NewObject
++                                    AC_CHECK_LIB(mozjs187, JS_NewObject,
+                                         [
+-                                            JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185"
+-                                            MOZLIB=mozjs185
++                                            JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs187"
++                                            MOZLIB=mozjs187
+                                         ],
+                                         [
+                                             LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
diff --git a/net-misc/mediatomb/mediatomb-0.12.1-r3.ebuild b/net-misc/mediatomb/mediatomb-0.12.1-r3.ebuild
index fd58c6a81115..167bd3adea36 100644
--- a/net-misc/mediatomb/mediatomb-0.12.1-r3.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.12.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r3.ebuild,v 1.2 2012/10/02 06:35:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.12.1-r3.ebuild,v 1.3 2012/10/02 07:48:56 vapier Exp $
 
 EAPI="4"
 inherit autotools eutils linux-info user
@@ -60,7 +60,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-libmp4v2.patch
 	epatch "${FILESDIR}"/${P}-system-uuid.patch #270830
 	if has_version ">=dev-lang/spidermonkey-1.8.7" ; then
-		sed -i 's:mozjs185:mozjs187:g' configure.ac || die #423991
+		epatch "${FILESDIR}"/${P}-mozjs187.patch #435394
 	fi
 	epatch "${FILESDIR}"/${P}-libextractor.patch #435394
 	eautoreconf