Revert to bundled spidermonkey (bug #408813).

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

3 files changed, 21 insertions, 20 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 12f4ecfa05a8..d41a8042aa48 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.191 2012/03/18 20:21:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.192 2012/03/19 22:18:08 pesa Exp $
+
+  19 Mar 2012; Davide Pesavento <pesa@gentoo.org> avidemux-2.5.6-r1.ebuild:
+  Revert to bundled spidermonkey (bug #408813).
 
 *avidemux-2.5.6-r1 (18 Mar 2012)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index abd63c3bc41e..1945ab69a723 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -13,24 +13,24 @@ DIST avidemux_2.5.5.tar.gz 15738941 RMD160 0303642d97dcbc165f27273d451b92804227a
 DIST avidemux_2.5.6.tar.gz 14914123 RMD160 c09f1018ed4ded7f7a89ba0cc2a7a056314cc785 SHA1 47205c236bf6a4435b9d4dd944493c7b7e2752f5 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b
 EBUILD avidemux-2.5.4-r2.ebuild 4532 RMD160 efaeec4be4b3cc1ecadab5ad5e51cddf3e3d4bc6 SHA1 895d62ed9ab262182d787fae1f7c311cd6cdd51b SHA256 9e773c7da913026d287cc4332c0ba6eabb63fa85f99ba4b58cff255f3c13ae46
 EBUILD avidemux-2.5.5.ebuild 4219 RMD160 615a0c58362e51ada0116932db9074cccc8a277d SHA1 7bf9aba9391b1c980bb0538395b92c7a7306ac20 SHA256 f02d72559ac47f50392353e653dd0380589452367634e79ce3da537a0517b083
-EBUILD avidemux-2.5.6-r1.ebuild 4322 RMD160 947eab7e6572096eae403c17ce6e0d8fc8ed946c SHA1 f8f6729209ef631b2ab7194adefad91ce2d53892 SHA256 6d226ebdab647f7ce76e45c292605394dd6adf67fdb9c50030d96c58489e7983
+EBUILD avidemux-2.5.6-r1.ebuild 4267 RMD160 5fc5cd61c9f8ee73956382b84324060ff104dd1c SHA1 2b1889788d1de1ce67f8d93920f2fdd656d5456b SHA256 d405bc43ffc005ed179c712d15e6bc3e0bebeac583c21de7327dfa6b2e8e8137
 EBUILD avidemux-2.5.6.ebuild 4238 RMD160 4f470e9ce5fb1c000ccf5e5f9102c53c8462a6ac SHA1 5ca08ea8d3e39ef88fe7e2c224735be495cbe016 SHA256 c5fa484829336a300bab90226e7272099fd743d6b6f5bd24ef69a1b2b416eec9
-MISC ChangeLog 35165 RMD160 1f6bc2f30e1af138c1246e29bbdcb3a84414a068 SHA1 93880f628187bb2d7375cd68765812bc0b8f5061 SHA256 26641379658f099b6e4913a6286a34513c86ec1a309846df120548ba85cd7e81
+MISC ChangeLog 35290 RMD160 2ef446dd0bab4d68093a3bbbcc7d558f1db206fa SHA1 6fa02183935d34d5d092027237ecb873bc4e2dc8 SHA256 14a7ba63b34f2ba53437f9c03a063e69fa46276759b24930c7da7ebdc22b0693
 MISC metadata.xml 452 RMD160 567fb317409c3b108dccb9f2032a1f193ca3f657 SHA1 d8a0fd2b10e36b4ab96287337ef3581493fd635e SHA256 613bf330b25bac0a6aa31dfa863e99c8456cc088638f90e72e6e6a6cfaae45e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPZkPmAAoJENXLsxwXqFxy2r4P/iJYrKXpboP0thRzzXOdOrYh
-4P7bBQEGelz57snVvgHUIEvIGL/qVIbUEu75/RxwAc//Z6dFSIahzJlw/rJryOvr
-biiHB9/tlRMa7a7B5e8HYssCUPaq0C3g4+B/lV1e7GgUggQlpkASPB+FOZsyvwBe
-nYaYJWwp4krYPFk9P2MIwoT9dc8ACiPoN+VyxNVlchIvd/MAZ7pfeyztusssjJ2D
-I9cfyN7gONORVcR61I01R1OyOtgG1OUBoiD9UWLi1YkZ0EVo1KgUlVoRYEGgt+qp
-ZlOaa3mVBVVDolEtntTvNkLX3nRSYxX3P1C2cJ2qfDFRn1KHEMPFvizjosFE2UcU
-cL7wraWHzJNq2FORNTlGWRdbbb29/ysdvWYS88FphvDZAL4+Y9IpC+3fr4we5EOJ
-Abg8ZiNUywjd+oPVoTkOJtIS0wkYOkgL0S8dB8bgfWZZXlpjXOBTDtynp+a7ErP5
-/QQhqv8Ts6PEz/lqj5AN4hlZ4TnfpIg40LvlkWmLXmvw7x9HfmcheTeEBPUdEQw6
-YmyNXtTVMATv8kZkgjYWULkTtTCWeteDz27oBJyPCcfB4fP2PI52fofB/7j+JgH7
-5G+GyqzjrgCZOYbFyN0sMyQ0DravoRaLyQb6m2P0fNVgbm+dFsNYq6x8oyfuCGKl
-4hBOr/C13/X4NACZ0gpQ
-=ah9d
+iQIcBAEBCgAGBQJPZ7CmAAoJENXLsxwXqFxyjeoP/RvAsGwKWRRUc820W85BaUgw
+4hY5N0fLV/oT5T/5kHlzJfPiVnfHY+m65gkKLOsruZ1cptHkL6vcwhRxuaLMGHbp
+bwyL5RXvYK9ZzyJyIJp6/ZyJ2+H7v/oHI4N9lyngdhvQNoOggKAgO24H6TisyMFj
+1wH85c/Cz1IH+j56Arm2IpBfJvOOCHydlEAL4A8lAPcXJATHl26B4PVakPr3HLw5
+9czZKNrXh3jEtKUhyby9uX2K3Su2fH1/3+O3b2NaMIJZbE8eOdipZpALt9ngRaqH
+7pwqdvVNnWHOZbNLeYZ+/0+iOTLYXefQvYmNeO6eIy5qHK/63eQpCFEdNqIW1M6s
+GmaAmuk0my8kU67GlaRAMaVQkmKncZNvCbIxwrhFKtcUg6F8VuTTLsgKi/7ES7XT
+2N7/xLBXp9Tr4oAsJHNo/jTnz28MMjGADhVHARrygLRmjGLuAz1ZToLsRS2KUZtm
+8lmf7BVvS1Xaaxp2EjBqEX8lHGrqUeM6v2eZ7HSSvU1lp+xWRD4RQKHjapuIzglS
+x7qVmTLWC2Ahn+6PCCSG28/8Hc3Nv8jQrYoSV4V14jdZHa19cJzmVNmmQzzzXXpw
+wueCF/wbXf4/yveBNcDX6vHc8u3n2Z4a/MahRs6XsPAzQea3T5gaQIld4pNlm2B7
+WZMa7OedbuvWtSutUg48
+=BVwU
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.5.6-r1.ebuild b/media-video/avidemux/avidemux-2.5.6-r1.ebuild
index 7f4e2d12d31f..dd0ba2254775 100644
--- a/media-video/avidemux/avidemux-2.5.6-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.5.6-r1.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/media-video/avidemux/avidemux-2.5.6-r1.ebuild,v 1.1 2012/03/18 20:21:36 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.6-r1.ebuild,v 1.2 2012/03/19 22:18:08 pesa Exp $
 
 EAPI=4
 
@@ -16,10 +16,9 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="aac aften alsa amr gtk jack +mp3 nls opengl oss pulseaudio
-	+qt4 sdl +truetype vorbis vpx +x264 +xv +xvid"
+	qt4 sdl +truetype vorbis vpx +x264 +xv +xvid"
 
 RDEPEND="
-	dev-lang/spidermonkey
 	dev-libs/libxml2
 	sys-libs/zlib
 	aac? (
@@ -121,7 +120,6 @@ src_configure() {
 		-DAVIDEMUX_CORECONFIG_DIR="${BUILD_S}/config"
 		-DARTS=OFF
 		-DESD=OFF
-		-DUSE_SYSTEM_SPIDERMONKEY=ON
 		$(cmake-utils_use aac FAAC)
 		$(cmake-utils_use aac FAAD)
 		$(cmake-utils_use aften)