Update faac and a52 patching in live ebuild; fixes bug #503122, reported by sven.a.jonsson.

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

4 files changed, 108 insertions, 183 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index f4de76f0b306..6af0e1c3e2bd 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.18 2014/02/06 21:35:41 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.19 2014/03/19 15:19:44 tomwij Exp $
+
+  19 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+  files/handbrake-9999-remove-faac-dependency.patch, handbrake-9999.ebuild:
+  Update faac and a52 patching in live ebuild; fixes bug #503122, reported by
+  sven.a.jonsson.
 
   06 Feb 2014; Ian Whyman <thev00d00@gentoo.org> handbrake-0.9.9.ebuild,
   handbrake-9999.ebuild:
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 4153f0ac3e00..c477a12f4df6 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,14 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX handbrake-0.9.9-add-gmodule-to-gtk-configure.patch 414 SHA256 264ed74e5359c6199ef31e91328c39939637abf22d0aab2611d09547a02ae694 SHA512 ae6b1235e432d5990ef2815bee22b674044f7701c9a5db79caedd0dd47d4b08a16bc1c13afb1720f7758e8fb4187cb8f42334816761256c643e04bd00dcc5752 WHIRLPOOL 17cdaa96619f69b54851738a079113ae6855a165889b06aafd5edb5b72aaf49c2a574a83357f82730347cf64035189ce13928d6824263390f39779f5ccf25809
 AUX handbrake-0.9.9-fix-compilation-with-mp4v2-v1.9.1.patch 2213 SHA256 99e9cbc302a8ab0bf3714894de293267875af5373917ce9a1cfa6ce304acfbbf SHA512 f316cd54468dd960913aed7cbf79fe57df4c3e07112149ee3591886e0c03be55a999e94f9524d1415689f93da7c7f840fc78b25c7277c95c40153d5cc22b12f2 WHIRLPOOL debfb3e6bc7767898ab2ef4881dfe5997f6b92844079b6fb03eb4030b14effa47fe411e7b2683d6a39b3c66dea4cbe9862e89abf3563477a14b90f331c43658f
 AUX handbrake-0.9.9-remove-faac-dependency.patch 7478 SHA256 dd8b096ee47dfdc2bb3d3c3a9bff3596f0d88b6d5bb428f775aff597c229d83a SHA512 6815ae03b0688df3aa4c7091c7fe2461abed2e1c5f7c72324b3cc677f7bf00e38ce7c28d8525fe79febe8689ee67ebd05e7cbb5eb5ab7c328a8e8972372f7497 WHIRLPOOL 9fa277f7e0f5b2e4efe8ae415509fd3e574e270bb51a8a76e639284f50c3d3b05a929b01cbdb8ad0b008aabbe47780161d600eca3a0f6aa12bf442b4421a1cd5
 AUX handbrake-9999-expand-MK_SUBTITLE_PGS.patch 313 SHA256 f0773915acacdb7e88404895914ce497250d83cb5687923034cbbfcdb90b8bb2 SHA512 28948c231d05f8bf13758d079e73a83a9c2ab62c57e4b20053d84764e36e8946cd4191857a14ae926335152363897a95b0331093fdbb061c5afdbb1326fdbd7f WHIRLPOOL dd5e02f557e0d515c03291956a457ba7c5df9b467e15317510315b5c6ee51ba3f16eb3d23e4d4aa7eace048894bea8d115872eeb2b3faaf2bea917a3b0aceb34
 AUX handbrake-9999-fix-compilation-with-mp4v2-v1.9.1.patch 2229 SHA256 e83f7c022c54227d127b2a1fc858de3ad70362f0a75c40cd454ad163d8240b91 SHA512 883111668ce0714884241d72c17fbdd0d746223445f234836f37998a806583e982462166490c01f2dbcdf58903b22edab0a7e8d04007f68039b55ec800971f1c WHIRLPOOL a01a231a1725c43894d600d5a50f0a4865c4780946043dc6288b616abde4496a7f4d0fe26143c26034ccf8f1dadeb8b9a06c2034673f706639c84a88550ed54b
 AUX handbrake-9999-remove-dvdnav-dup.patch 879 SHA256 cdfa247f00ad5b75af115618b789cc4708342366d430b93f0859c337f2255bdf SHA512 8f00e52866f392c9a52016da01f9267d1a1d8723211931dc501eae639ca8250d3b839b2dd87db67a07448557ef9f905c46566233ae5d7bd687c2bf8a7ed31037 WHIRLPOOL a29c7a2392250b9bc14c098df45977e15b7430545cc25f13a7cfad86384252b7205c0bb2f40bdac04b722141deb1918e81fd316ce8b584a988ce624a7d620446
-AUX handbrake-9999-remove-faac-dependency.patch 5352 SHA256 9383825aa14252ed6d24a6a6ec3e2d63a2e679fb31d2efed7d7226434c67fe99 SHA512 ed56a972a6d9522f3bd3f22dd7c5d32842b37874c4a20516d3614dd5fd4fd6a8c7527286d0cf93ceaf849b8c63f831651186e2bd766df2066ab90793148ed425 WHIRLPOOL 54839770bacd2af87d9e6f62da5fd7d7d712814401e2fc1a6a863faff094a67e47b8767d3d3dab02c9dbd18b52520596f1d0d271c77d63683290a412a73618db
+AUX handbrake-9999-remove-faac-dependency.patch 3697 SHA256 05af966252b8b6e50d3c79c5dc258d8db95574335ca10d31b9f87af9a23b049b SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc WHIRLPOOL 64fe289dbe9128b108e5d00b50f15ca9770c52e7f0fd5a384bdce1d66903ec264222360ffa25038c622c2dfbcbb4676648445da9dc5c39e5c1bf600945da8446
 AUX handbrake-9999-use-older-libmkv.patch 583 SHA256 17e15eccc630bf5dfcd66609d19bdcf57c731fba6c314af3a5a6d083de80ba7c SHA512 6ebcf55ffaab20301da1ceb2d993580a6b875676b65ee2d61d3fcaedf9e5a3b7e52128dae30363923218ba2e6f4510232c0e7738343e35c4c95048d35ff3933b WHIRLPOOL 075f604ec3c48345f435b3b2cd39b7d175c7df69600e5ca9438cd6d6a380673ff8848a2bf111cfe8fb3dff21ad33e822fbf7b45a3e547da8a0d9170a933e78d3
 AUX handbrake-9999-use-unpatched-a52.patch 944 SHA256 b8ccdecb0a70650af162fa649a323dd1c31268efe7c9ace58a89d70eab984c80 SHA512 aff9da64a434946600d1683f101bea1024319a418c57b0dbe9a8c287c72edf91d18102d51b817d9cea6e825d3a945741893956c55df16bf8f61b415a50dbeab4 WHIRLPOOL 97cf18bb453b435f88a60ed6417811eb8ce5c7af68f4e3d12316a72ac1594637f288511b54aee2b50fc04c356a0dba23dcf71b5712e9520371ab112f99b4f90f
 DIST handbrake-0.9.9.tar.bz2 9315199 SHA256 a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 SHA512 c891e78f5fbc62fd46055bf6cd62e631bc181a2a21167dcf3fe18cbc4b57bb36c11d52dcf39b3c923b807160e79fb2b1f3c36d60f3024149206a86e7bd6d5b68 WHIRLPOOL edcb7758ba68e35b70700bbf484ac7794739a14302d205c080ad4fdf3151b460ee54b0c8dfffd68bca2ccb1a7d4379c9bbb7c3a9939c6bd6a06e1be95f09169e
 EBUILD handbrake-0.9.9.ebuild 4315 SHA256 8d895170e47cae830533452eb1e6107732ca52b08d26f4b53ab94383b1ac42db SHA512 ee576248c7df863ebe1414b5db37198b6f71a2593d5de98f4ad88a537e3f45afb7d90ebb4812d669966b04a5e00399ca58a3d40ba0b3da547842cbd2f75c44a3 WHIRLPOOL a266f83cdf47f610dcbd598a7620e250d7aa462665d75a27512e0bff89360be3a925b1f6b986bfe54fe8a4f5b6bdab6dd36e9e59f41df089d404434f3868385f
-EBUILD handbrake-9999.ebuild 5475 SHA256 a0cb987684ee82ae7b23263454764e9d266311baaf3664fe4c6d4a40b8dd9182 SHA512 0244befcdb650d43b26415aa228fe845f2f203a6547110a06aef0d905e99c530aa3acbfdcb729e60745c458a240ed23d61e20e37fee2138312110e62666e8111 WHIRLPOOL 68ee3cd1732c36e3b570915fce423c374618dca5355d5341d7f91f57f2456ee8a84e403246308d39b606e74fbad0f34a0321258cac9387e6b41b8ce4de7196ff
-MISC ChangeLog 5414 SHA256 b7c241c81e07df43317c5973a4d76efcd728b6b21400f67bf5284658e2f4f481 SHA512 5c6906ae16eed99a8a3f6937e9b3a550f3ed26ab9ff5d16736a937bc91d77b11cc52ccf43a43614dc3a6ee585048d5c1aeeae48a473d8dc5cfd32ce1da5c5923 WHIRLPOOL de23ba8d11f3b52d7e1a7aa7213f34c2a0c52a9c4dc84d8de08a68dfc1aa9d7de52385a2e40bce9e1ad118d18cd77e3c1f273366b3b528a05e2d8ecb062a79ab
+EBUILD handbrake-9999.ebuild 5159 SHA256 04f8fce2db005215caf884b85a5cfc1bb6a3a45a0ee381c8933617fc49947299 SHA512 b33d0ed1efc7995ec576b7fae9ab37011449b573cc31792c848452c32061b112acdf08387ec51dba071b311391dd6faf3d6b4c7a4e3c3e437b362badc358d7cd WHIRLPOOL ff507c6d65312ce99c431a36407360a6ae04873fa83c9cb4f118e390f5f9a0bd5fabd516416cad64a8b90be0fa15434a79030616ae0e12c321a9369142cead43
+MISC ChangeLog 5631 SHA256 2a7c8c941f28cf9d314d07bf2b2ed5524ee10e105b5d12b2d5972b6aadd0c1e3 SHA512 6e9b1e028e671e6eb89f789eded86c67cd97eba6ca6a9cd117b20e472572f8d3c201e0e6a5870570614509cbbe51c291c4d041c7594ea239b7ee5f170dbede77 WHIRLPOOL bfe3572b20d52ba42ab9f55dff8d2f5696904ee18d4869933a3ba4ea63d74f6e0d7c2dd96a947cf17fc9d14c3a407ba762b026e0d93b357c6a43d3225a82226f
 MISC metadata.xml 949 SHA256 0c2dea9a78292e142a185934a0dd7652f713b4ee68935de6e03a73e43074acfc SHA512 ed66b0375be0c9c07f06222a9de970e60446f543de10fe24e6430c687bae088858d926b2121095bc42fe2e9e6c940d459ad4936285a3291982e01e6e4e71c8b2 WHIRLPOOL 6942dd6c1cab7dfd58a65d2c7ad56e1372a6a7b03e525c027de015ef5ebf1d3a7823d202afa16f867f413ff0255bcd0e13f2d4a3ec19d362ee40db8262a2bfeb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTKbWTAAoJEJWyH81tNOV9NsQH/1ugdRNmLnLFLDnJku0/Y4+5
+2BN5SeuPQQGIgMAMsG2yC4eyC6i9PaTQR+37Oyt/qbrvzXY0vwz3/W0h2DLfVV1X
++IWO7hbvrLgT0uYJAgO+N6oFIABmkRa/4OzW+r0edeV+pxctaFrUBmN4gMWNa4Vl
+b5WCrWHjVaj6Lqfhl2BxRjRtMApriGXSSmSvHEVPNoUprRLyMzLw0JERidQGUHPn
+hqO5jEdRJSN3nkjcuy/IDjC+J8c2d6JTgo3EX597dgVr2c9FlsLtu5/mXodwJZOv
+EyQuNNfmnldta4AWQrXagRnPzjw6Kx8PKUVadpU6qHY6dqLDFTrerapPbg0K/c4=
+=GIsG
+-----END PGP SIGNATURE-----
diff --git a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
index 05c8e7962d4a..7e8ab99730a8 100644
--- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
+++ b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
@@ -1,172 +1,84 @@
---- a/gtk/src/audiohandler.c	
-+++ b/gtk/src/audiohandler.c	
-@@ -71,10 +71,7 @@
-         if (enc->codec == fallback &&
-             !(enc->muxers & mux))
-         {
--            if ( mux & HB_MUX_MASK_MKV )
--                fallback = HB_ACODEC_LAME;
--            else
--                fallback = HB_ACODEC_FAAC;
-+            fallback = HB_ACODEC_LAME;
-             break;
-         }
-     }
-@@ -132,7 +129,7 @@
-             return HB_ACODEC_LAME;
- 
-         case HB_ACODEC_AAC_PASS:
--            return HB_ACODEC_FAAC;
-+            return HB_ACODEC_FFAAC;
- 
-         case HB_ACODEC_AC3_PASS:
-             return HB_ACODEC_AC3;
---- a/gtk/src/hb-backend.c	
-+++ b/gtk/src/hb-backend.c	
-@@ -3843,7 +3843,7 @@
- gint
- ghb_get_default_acodec()
+--- a/libhb/common.c
++++ b/libhb/common.c
+@@ -243,7 +243,6 @@
  {
--    return HB_ACODEC_FAAC;
-+    return HB_ACODEC_LAME;
- }
- 
- static void
-@@ -4581,13 +4581,9 @@
-             {
-                 codec = HB_ACODEC_AC3;
-             }
--            else if (mux & HB_MUX_MASK_MKV)
--            {
--                codec = HB_ACODEC_LAME;
--            }
-             else
-             {
--                codec = HB_ACODEC_FAAC;
-+                codec = HB_ACODEC_LAME;
-             }
-             value = ghb_lookup_audio_encoder_value(codec);
-             ghb_settings_take_value(asettings, "AudioEncoder", value);
-@@ -4601,7 +4597,7 @@
-             if (codec == HB_ACODEC_VORBIS)
-             {
-                 a_unsup = "Vorbis";
--                codec = HB_ACODEC_FAAC;
-+                codec = HB_ACODEC_LAME;
-             }
-         }
-         if (a_unsup)
---- a/gtk/src/preset_xlat.c	
-+++ b/gtk/src/preset_xlat.c	
-@@ -260,7 +260,6 @@
- 
- static value_map_t acodec_xlat[] =
- {
--    {"AAC (faac)", "faac"},
-     {"AC3 Passthru", "ac3"},
-     {"MP3 (lame)", "lame"},
-     {"Vorbis (vorbis)", "vorbis"},
---- a/libhb/common.c	
-+++ b/libhb/common.c	
-@@ -227,7 +227,6 @@
-     // actual encoders
-     { { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC,        },
-     { { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_HE,     },
--    { { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC,        },
-     { { "AAC (avcodec)",      "av_aac",     HB_ACODEC_FFAAC,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC,        },
-     { { "AAC (FDK)",          "fdk_aac",    HB_ACODEC_FDK_AAC,      HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC,        },
-     { { "HE-AAC (FDK)",       "fdk_haac",   HB_ACODEC_FDK_HAAC,     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_HE,     },
---- a/libhb/common.h	
-+++ b/libhb/common.h	
-@@ -1005,7 +1005,6 @@
- extern hb_work_object_t hb_decavcodeca;
- extern hb_work_object_t hb_decavcodecv;
- extern hb_work_object_t hb_declpcm;
--extern hb_work_object_t hb_encfaac;
- extern hb_work_object_t hb_enclame;
- extern hb_work_object_t hb_encvorbis;
- extern hb_work_object_t hb_muxer;
---- a/libhb/encfaac.c	
-+++ b/libhb/encfaac.c	
-@@ -1,3 +1,4 @@
-+#if 0
- /* encfaac.c
- 
-    Copyright (c) 2003-2013 HandBrake Team
-@@ -289,3 +290,4 @@
-     return HB_WORK_OK;
- }
- #endif // USE_FAAC
-+#endif /* 0 */
-\ No newline at end of file
---- a/libhb/hb.c	
-+++ b/libhb/hb.c	
-@@ -1656,9 +1656,6 @@
-     hb_register(&hb_encca_aac);
-     hb_register(&hb_encca_haac);
- #endif
--#ifdef USE_FAAC
--    hb_register(&hb_encfaac);
--#endif
-     hb_register(&hb_enclame);
-     hb_register(&hb_enctheora);
-     hb_register(&hb_encvorbis);
---- a/libhb/internal.h	
-+++ b/libhb/internal.h	
-@@ -410,7 +410,6 @@
-     WORK_DECAVCODEC,
-     WORK_DECAVCODECV,
-     WORK_DECLPCM,
--    WORK_ENCFAAC,
-     WORK_ENCLAME,
-     WORK_ENCVORBIS,
-     WORK_ENC_CA_AAC,
---- a/libhb/module.defs	
-+++ b/libhb/module.defs	
-@@ -1,4 +1,4 @@
--__deps__ := A52DEC BZIP2 FAAC FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
-+__deps__ := A52DEC BZIP2 FFMPEG FONTCONFIG FREETYPE LAME LIBASS LIBDCA \
-     LIBDVDREAD LIBDVDNAV LIBICONV LIBMKV LIBOGG LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBXML2 \
-     MP4V2 MPEG2DEC PTHREADW32 X264 ZLIB LIBBLURAY FDKAAC
- 
-@@ -43,9 +43,6 @@
- ifeq (1,$(FEATURE.libav_aac))
- LIBHB.GCC.D += USE_LIBAV_AAC
- endif
--ifeq (1,$(FEATURE.faac))
--LIBHB.GCC.D += USE_FAAC
--endif
- ifeq (1,$(FEATURE.mp4v2))
- LIBHB.GCC.D += USE_MP4V2
- endif
-@@ -119,10 +116,6 @@
- LIBHB.dll.libs += $(CONTRIB.build/)lib/libfdk-aac.a
- endif
- 
--ifeq (1,$(FEATURE.faac))
--LIBHB.dll.libs += $(CONTRIB.build/)lib/libfaac.a
--endif
--
- ifeq (1,$(FEATURE.qsv))
- LIBHB.dll.libs += $(CONTRIB.build/)lib/libmfx.a
- endif
---- a/libhb/muxmkv.c	
-+++ b/libhb/muxmkv.c	
-@@ -263,7 +263,6 @@
-                 }
-                 track->codecID = MK_ACODEC_FLAC;
-                 break;
--            case HB_ACODEC_FAAC:
-             case HB_ACODEC_FFAAC:
-             case HB_ACODEC_CA_AAC:
-             case HB_ACODEC_CA_HAAC:
---- a/libhb/work.c	
-+++ b/libhb/work.c	
-@@ -135,7 +135,6 @@
-     switch (codec)
-     {
-         case HB_ACODEC_AC3:     return hb_get_work(WORK_ENCAVCODEC_AUDIO);
--        case HB_ACODEC_FAAC:    return hb_get_work(WORK_ENCFAAC);
-         case HB_ACODEC_LAME:    return hb_get_work(WORK_ENCLAME);
-         case HB_ACODEC_VORBIS:  return hb_get_work(WORK_ENCVORBIS);
-         case HB_ACODEC_CA_AAC:  return hb_get_work(WORK_ENC_CA_AAC);
+     // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
+     { { "",                   "dts",        NULL,                          HB_ACODEC_DCA_PASS,    HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS,   },
+-    { { "AAC (faac)",         "faac",       NULL,                          0,                     HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
+     { { "AAC (ffmpeg)",       "ffaac",      NULL,                          HB_ACODEC_FFAAC,       HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC,        },
+     { { "AC3 (ffmpeg)",       "ffac3",      NULL,                          HB_ACODEC_AC3,         HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3,        },
+     { { "MP3 (lame)",         "lame",       NULL,                          HB_ACODEC_LAME,        HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3,        },
+--- a/scripts/manicure.rb
++++ b/scripts/manicure.rb
+@@ -349,7 +349,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -466,7 +466,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -753,7 +753,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -870,7 +870,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -1163,7 +1163,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -1298,7 +1298,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
+@@ -1615,7 +1615,7 @@
+           audioEncoders << "copy:dtshd"
+         when /AAC Pass/
+           audioEncoders << "copy:aac"
+-        when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++        when "AAC (ffmpeg)", "AAC (avcodec)"
+           audioEncoders << "av_aac"
+         when "AAC (FDK)"
+           audioEncoders << "fdk_aac"
+@@ -1732,7 +1732,7 @@
+     case hash["AudioEncoderFallback"]
+       when /AC3/
+         audioEncoderFallback << "ac3"
+-      when "AAC (ffmpeg)", "AAC (avcodec)", "AAC (faac)"
++      when "AAC (ffmpeg)", "AAC (avcodec)"
+         audioEncoderFallback << "av_aac"
+       when "AAC (FDK)"
+         audioEncoderFallback << "fdk_aac"
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index b446de979fa7..6726b1629ad3 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.15 2014/02/06 21:35:41 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.16 2014/03/19 15:19:44 tomwij Exp $
 
 EAPI="5"
 
@@ -98,17 +98,12 @@ src_prepare() {
 	# It may work this way; if not, we should try to mimic the duplication.
 	epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
 
-	# Remove faac dependency until its compilation errors can be resolved.
-	# TODO: If --disable-faac works then this patch can be removed;
-	#       we also need to figure out if this is still needed, maybe things are patched.
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
 	epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
 
 	# Make use of an older version of libmkv.
 	epatch "${FILESDIR}"/${PN}-9999-use-older-libmkv.patch
 
-	# Make use of an unpatched version of a52 that does not make a private field public.
-	epatch "${FILESDIR}"/${PN}-9999-use-unpatched-a52.patch
-
 	# Fixup configure.ac with newer automake.
 	# TODO: Would like to see this shorten towards the future;
 	#       see which are still needed, put those in a patch instead of 6 lines here.
@@ -137,7 +132,6 @@ src_configure() {
 		--force \
 		--prefix="${EPREFIX}/usr" \
 		--disable-gtk-update-checks \
-		--disable-faac \
 		--enable-avformat \
 		--disable-libav-aac \
 		--enable-libmkv \