Added missing dev-lang/yasm[nls=] DEPEND to media-libs/avidemux-core-2.6.3[-system-ffmpeg], reported by Nikoli. Fixes bug #466318.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 16 insertions, 11 deletions

diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog
index bb6fc31fd64b..766aaec63fe8 100644
--- a/media-libs/avidemux-core/ChangeLog
+++ b/media-libs/avidemux-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/avidemux-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.5 2013/03/29 15:21:30 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.6 2013/04/19 18:54:14 tomwij Exp $
+
+  19 Apr 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-core-2.6.3.ebuild:
+  Added missing dev-lang/yasm[nls=] DEPEND to media-libs/avidemux-core-2.6.3
+  [-system-ffmpeg], reported by Nikoli. Fixes bug #466318.
 
 *avidemux-core-2.6.3 (29 Mar 2013)
 
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index f18dde6bad88..27ac8fd2ff7a 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -4,17 +4,17 @@ Hash: SHA256
 DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 EBUILD avidemux-core-2.6.2-r1.ebuild 3836 SHA256 4f368961e548a1a918c3ad2a8e618bf44940d4e1e1ee292c5e979ed1b9fea0e5 SHA512 a0e47c7d2d313343ab81f85f4d89c30a659ed9a4d0d6df04848a110a8fb72da0a7ebb87230b9d012702fddc88fae0ae02b58df640d23b60846011192f50f2dcf WHIRLPOOL f8388de0b478f6381f4ce2b523c10e1a87f58da90f00b497034179d684286efc0de97f845716a45364701e7b32635ab5975b47ab6ac54104ac85432e6c327312
-EBUILD avidemux-core-2.6.3.ebuild 3201 SHA256 5016d72dfb9eab198e3ef0c41b8686d06181e24d6ac8d7faf51fbb3cd613108f SHA512 211113578e11ca28205671e12ca4b11db25207b335a27873b0b84aa002cfadc9f0a2a3c604294595e462baa3cbe8814d4d982dab0836579e352a9e7418e5ba5a WHIRLPOOL e150c4f387ccb01ac074cff313a4e6429d9e6d55739395be96c4cb990c8ccd3a53e10f15f127408c1bff6279b4f68506d56e5c7919e0480287ee63de9482a616
-MISC ChangeLog 935 SHA256 477518c5069984d3679ae4805c623df504fede3848ba2b60739e80d290328ef7 SHA512 37a2ce028df625b3fd7978e6fee6ca6980d29d752a1492c8e82267c89d095d65a650f2ab90b6f0ea5c0fde26f1f7fbb7ebf964325e2cc6aef2f3387189716d60 WHIRLPOOL 5504ec8b8e02df664d161b9267603ad57a9462d8252e342473751d27bc690b052aefca4dc26fd119d2e0d01263d2adef19ea457716fa06634e2d6833affb4e40
+EBUILD avidemux-core-2.6.3.ebuild 3242 SHA256 47bb6f9c8fa246bad9821281582547395dcf5b8f37fbbaf1b442bbe6dee0a1a9 SHA512 921824ca02fcd0e2a8fdeb4a0953c8ab149ef113c02ec22f074f451283a2aff0d4bd188b1a93f6e7f0b7fcf7eb18ec9e29ad8b736a347e701c37471fa56b23aa WHIRLPOOL 55182d0b27bb4e0c2138dbd2e684496276e28afd84f87575d09375d6e491b062143306b320d555f2d8559ca4500a389f1c83d90975c132089b45abfc5fb35301
+MISC ChangeLog 1147 SHA256 2b21fa18177222266bd098d7b80cc38104bce16437eb60501c93095f722fb14f SHA512 81ea465d630ab5b753b1e0bfb15ef455862928d65ee5579e539bbd6b574ea140a2fa9f15ac769eca9a0f8e9e23e264e76b55854be274ed4ec3507f48fc25b2cd WHIRLPOOL 3483b79bd36a5ac3377ebb0451e372dbc549acd3d0ec228e1c499ec5c8930b30485f8ea686c13c4d8b4396f0fea66978fd618b01a1f6f3a3b0efb519dc8022df
 MISC metadata.xml 533 SHA256 e699a1cc65faf166948081bae861e86850ca561fcbb5e3ea392b51bd91e472a7 SHA512 87b8f1b0ceb54f05ce4e50652709e2b4634763e954f6978fad3e3155ac1a04c0ce42b42bdd5e7045fe1a5dbde116411c08a6f9a56a5b9401bca20f661c061abb WHIRLPOOL 8c210345b5f4d2f8dd6d8d4b0e5b7192f3a9a7bbc1dd7f8f040ee73f0eaf5ac6aff9a41f1e644d5e63913a8bcb5e0486ff949a76d6e24b4902c3ddc0dcf0ad89
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRVbFXAAoJEJWyH81tNOV9Yj4H/ileiCngzoYbaMwcu8bTo25s
-8jco0BC2rJo2OSOIYVIiYxpcrHXNc5Fu19KeY85hRH3KKuBTlHH5AWk5iXIAIFjV
-Z56zJwGNvclOmiblS2a/27vZo1DIXb6+3ba+1tWrv0Y+A3C0pakoLz4yORQjwsj+
-EsmC1W/4B+jRoPnLD97nhd0qWB8D7YfGVzh6DPFLS7hlCuxp9NEECpVv6Hd9LNWM
-39omsHuK2mmYIp2kzHqJTzhuqOL2+B8/IVkOO6YVgr5H+fX1qeBH9SCTGGdsr+yd
-TnRPqHPKc91CX9xCxMtGXbcDOCXm0vR0u7bCIM3zurRtsYJeoW3zCGE5v/btOVo=
-=rxO5
+iQEcBAEBCAAGBQJRcZKZAAoJEJWyH81tNOV9XZQH+QEyCTpu5T4acrHNVB0rMYKq
+KJKqdWDfHPDuGgDaNLqqABQV68XH+/8v2WPUKMhZx0npSCF1HgOaG1ZNzeJ9bvx9
+lsmpSqphMOorDSyLEZdVm7pkHYODXtsxK5DvLguEBNI+JVg99X+BzPJBIcMdDM+b
+mNjrD6OonOhXmdI+Ob6cfOKbiWNgrXnrVlNFf7x7K6VvLuqcLq2J9iorOtky/vsh
+GrxtVxBrcJJxpUwrMcPkP7SzvNtM87SzRmZ2KBIt1LoCZWNX4P/8vE7i98cuNqBT
+nykORIdkB+dRWZZCS6rc3Ey57e8mizgmm6c2HzbW078cTutpgA0VaD1cyUPLLsk=
+=Sw6m
 -----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
index e24f20cb6de3..04fd261ccf0e 100644
--- a/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild,v 1.1 2013/03/29 15:10:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.3.ebuild,v 1.2 2013/04/19 18:54:14 tomwij Exp $
 
 EAPI="5"
 
@@ -35,6 +35,7 @@ RDEPEND="
 DEPEND="
 	$DEPEND
 	virtual/pkgconfig
+	!system-ffmpeg? ( dev-lang/yasm[nls=] )
 "
 
 S="${WORKDIR}/${MY_P}"