Fix faac dependency removal patch for handbrake-9999, currently it still fails to build due to a yasm based cpuid detection they introduced that doesn't appear to work; also heavily documented that ebuild with TODOs that would be nice to have for the upcoming release. Fixed up src_configure a bit. Removed old snapshot version 0.9.9_pre5441-r1.

(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

6 files changed, 340 insertions, 305 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index 61e8ef61a918..112d05f7dc42 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.11 2013/07/07 13:05:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.12 2013/07/15 15:03:54 tomwij Exp $
+
+  15 Jul 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/handbrake-0.9.9-remove-faac-dependency.patch,
+  -handbrake-0.9.9_pre5441-r1.ebuild,
+  files/handbrake-9999-remove-faac-dependency.patch, handbrake-0.9.9.ebuild,
+  handbrake-9999.ebuild:
+  Fix faac dependency removal patch for handbrake-9999, currently it still fails
+  to build due to a yasm based cpuid detection they introduced that doesn't
+  appear to work; also heavily documented that ebuild with TODOs that would be
+  nice to have for the upcoming release. Fixed up src_configure a bit. Removed
+  old snapshot version 0.9.9_pre5441-r1.
 
   07 Jul 2013; Tom Wijsman <TomWij@gentoo.org> handbrake-0.9.9.ebuild,
   handbrake-9999.ebuild:
diff --git a/media-video/handbrake/files/handbrake-0.9.9-remove-faac-dependency.patch b/media-video/handbrake/files/handbrake-0.9.9-remove-faac-dependency.patch
new file mode 100644
index 000000000000..e2726d28dda9
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-0.9.9-remove-faac-dependency.patch
@@ -0,0 +1,203 @@
+Forward ported version of https://github.com/rbrito/pkg-handbrake/blob/master/debian/patches/0010-Remove-FAAC-dependency.patch
+
+diff -ur a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
+--- a/gtk/src/audiohandler.c	2013-05-05 15:39:27.715401407 +0200
++++ b/gtk/src/audiohandler.c	2013-05-05 15:42:09.312067074 +0200
+@@ -70,10 +70,7 @@
+         if (hb_audio_encoders[ii].encoder == fallback &&
+             !(hb_audio_encoders[ii].muxers & mux))
+         {
+-            if ( mux == HB_MUX_MKV )
+-                fallback = HB_ACODEC_LAME;
+-            else
+-                fallback = HB_ACODEC_FAAC;
++            fallback = HB_ACODEC_LAME;
+             break;
+         }
+     }
+@@ -130,7 +127,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;
+diff -ur a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
+--- a/gtk/src/hb-backend.c	2013-05-05 15:39:27.738734740 +0200
++++ b/gtk/src/hb-backend.c	2013-05-05 15:43:13.702066676 +0200
+@@ -3767,7 +3767,7 @@
+ gint
+ ghb_get_default_acodec()
+ {
+-    return HB_ACODEC_FAAC;
++    return HB_ACODEC_LAME;
+ }
+ 
+ static void
+@@ -4505,13 +4505,9 @@
+             {
+                 codec = HB_ACODEC_AC3;
+             }
+-            else if (mux == HB_MUX_MKV)
+-            {
+-                codec = HB_ACODEC_LAME;
+-            }
+             else
+             {
+-                codec = HB_ACODEC_FAAC;
++                codec = HB_ACODEC_LAME;
+             }
+             value = ghb_lookup_acodec_value(codec);
+             ghb_settings_take_value(asettings, "AudioEncoder", value);
+@@ -4525,7 +4521,7 @@
+             if (codec == HB_ACODEC_VORBIS)
+             {
+                 a_unsup = "Vorbis";
+-                codec = HB_ACODEC_FAAC;
++                codec = HB_ACODEC_LAME;
+             }
+         }
+         if (a_unsup)
+diff -ur a/gtk/src/preset_xlat.c b/gtk/src/preset_xlat.c
+--- a/gtk/src/preset_xlat.c	2013-05-05 15:39:27.775401407 +0200
++++ b/gtk/src/preset_xlat.c	2013-05-05 15:43:34.888733211 +0200
+@@ -260,7 +260,6 @@
+ 
+ static value_map_t acodec_xlat[] =
+ {
+-    {"AAC (faac)", "faac"},
+     {"AC3 Passthru", "ac3"},
+     {"MP3 (lame)", "lame"},
+     {"Vorbis (vorbis)", "vorbis"},
+diff -ur a/gtk/src/presets.c b/gtk/src/presets.c
+--- a/gtk/src/presets.c	2013-05-05 15:39:27.778734740 +0200
++++ b/gtk/src/presets.c	2013-05-05 15:43:59.888733056 +0200
+@@ -2029,8 +2029,6 @@
+ 
+ static value_map_t acodec_xlat_compat[] =
+ {
+-    {"AAC (CoreAudio)", "faac"},
+-    {"HE-AAC (CoreAudio)", "faac"},
+     {"AC3 (ffmpeg)", "ac3"},
+     {"AC3", "ac3"},
+     {"MP3 Passthru", "mp3pass"},
+diff -ur a/libhb/common.c b/libhb/common.c
+--- a/libhb/common.c	2013-05-05 15:39:27.788734740 +0200
++++ b/libhb/common.c	2013-05-05 15:45:02.782066001 +0200
+@@ -126,7 +126,6 @@
+     { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MP4|HB_MUX_MKV },
+     { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MP4|HB_MUX_MKV },
+ #endif
+-    { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,         HB_MUX_MP4|HB_MUX_MKV },
+ #ifdef USE_FDK_AAC
+     { "AAC (FDK)",          "fdk_aac",    HB_ACODEC_FDK_AAC,      HB_MUX_MP4|HB_MUX_MKV },
+     { "HE-AAC (FDK)",       "fdk_haac",   HB_ACODEC_FDK_HAAC,     HB_MUX_MP4|HB_MUX_MKV },
+diff -ur a/libhb/common.h b/libhb/common.h
+--- a/libhb/common.h	2013-05-05 15:39:27.788734740 +0200
++++ b/libhb/common.h	2013-05-05 15:45:23.358732540 +0200
+@@ -945,7 +945,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;
+diff -ur a/libhb/encfaac.c b/libhb/encfaac.c
+--- a/libhb/encfaac.c	2013-05-05 15:39:27.802068073 +0200
++++ b/libhb/encfaac.c	2013-05-05 15:45:51.798732364 +0200
+@@ -1,3 +1,4 @@
++#if 0
+ /* encfaac.c
+ 
+    Copyright (c) 2003-2013 HandBrake Team
+@@ -287,3 +288,4 @@
+     return HB_WORK_OK;
+ }
+ 
++#endif /* 0 */
+\ No newline at end of file
+diff -ur a/libhb/hb.c b/libhb/hb.c
+--- a/libhb/hb.c	2013-05-05 15:39:27.805401407 +0200
++++ b/libhb/hb.c	2013-05-05 15:46:21.548732180 +0200
+@@ -487,7 +487,6 @@
+ 	hb_register( &hb_decavcodeca );
+ 	hb_register( &hb_decavcodecv );
+ 	hb_register( &hb_declpcm );
+-	hb_register( &hb_encfaac );
+ 	hb_register( &hb_enclame );
+ 	hb_register( &hb_encvorbis );
+ 	hb_register( &hb_muxer );
+@@ -588,7 +587,6 @@
+ 	hb_register( &hb_decavcodeca );
+ 	hb_register( &hb_decavcodecv );
+ 	hb_register( &hb_declpcm );
+-	hb_register( &hb_encfaac );
+ 	hb_register( &hb_enclame );
+ 	hb_register( &hb_encvorbis );
+ 	hb_register( &hb_muxer );
+diff -ur a/libhb/internal.h b/libhb/internal.h
+--- a/libhb/internal.h	2013-05-05 15:39:27.805401407 +0200
++++ b/libhb/internal.h	2013-05-05 15:46:28.215398806 +0200
+@@ -409,7 +409,6 @@
+     WORK_DECAVCODEC,
+     WORK_DECAVCODECV,
+     WORK_DECLPCM,
+-    WORK_ENCFAAC,
+     WORK_ENCLAME,
+     WORK_ENCVORBIS,
+     WORK_ENC_CA_AAC,
+diff -ur a/libhb/module.defs b/libhb/module.defs
+--- a/libhb/module.defs	2013-05-05 15:39:27.808734740 +0200
++++ b/libhb/module.defs	2013-05-05 15:46:41.458732057 +0200
+@@ -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
+ 
+@@ -95,7 +95,7 @@
+ LIBHB.lib = $(LIBHB.build/)hb.lib
+ 
+ LIBHB.dll.libs = $(foreach n, \
+-        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
++        a52 ass avcodec avformat avutil avresample dvdnav dvdread \
+         fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
+         ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
+         $(CONTRIB.build/)lib/lib$(n).a )
+diff -ur a/libhb/muxmkv.c b/libhb/muxmkv.c
+--- a/libhb/muxmkv.c	2013-05-05 15:39:27.808734740 +0200
++++ b/libhb/muxmkv.c	2013-05-05 15:47:03.052065256 +0200
+@@ -256,7 +256,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:
+diff -ur a/libhb/work.c b/libhb/work.c
+--- a/libhb/work.c	2013-05-05 15:39:27.818734740 +0200
++++ b/libhb/work.c	2013-05-05 15:47:14.658731851 +0200
+@@ -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);
+diff -ur a/test/module.defs b/test/module.defs
+--- a/test/module.defs	2013-05-05 15:39:27.975401406 +0200
++++ b/test/module.defs	2013-05-05 15:47:35.322065057 +0200
+@@ -14,7 +14,7 @@
+ TEST.libs = $(LIBHB.a)
+ 
+ TEST.GCC.l = \
+-        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
++        a52 ass avcodec avformat avutil avresample dvdnav dvdread \
+         fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \
+         samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
+         bluray xml2 bz2 z
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 e2726d28dda9..cf3fe45dc077 100644
--- a/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
+++ b/media-video/handbrake/files/handbrake-9999-remove-faac-dependency.patch
@@ -1,13 +1,10 @@
-Forward ported version of https://github.com/rbrito/pkg-handbrake/blob/master/debian/patches/0010-Remove-FAAC-dependency.patch
-
-diff -ur a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
---- a/gtk/src/audiohandler.c	2013-05-05 15:39:27.715401407 +0200
-+++ b/gtk/src/audiohandler.c	2013-05-05 15:42:09.312067074 +0200
-@@ -70,10 +70,7 @@
-         if (hb_audio_encoders[ii].encoder == fallback &&
-             !(hb_audio_encoders[ii].muxers & mux))
+--- 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_MKV )
+-            if ( mux & HB_MUX_MASK_MKV )
 -                fallback = HB_ACODEC_LAME;
 -            else
 -                fallback = HB_ACODEC_FAAC;
@@ -15,7 +12,7 @@ diff -ur a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
              break;
          }
      }
-@@ -130,7 +127,7 @@
+@@ -132,7 +129,7 @@
              return HB_ACODEC_LAME;
  
          case HB_ACODEC_AAC_PASS:
@@ -24,10 +21,9 @@ diff -ur a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
  
          case HB_ACODEC_AC3_PASS:
              return HB_ACODEC_AC3;
-diff -ur a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
---- a/gtk/src/hb-backend.c	2013-05-05 15:39:27.738734740 +0200
-+++ b/gtk/src/hb-backend.c	2013-05-05 15:43:13.702066676 +0200
-@@ -3767,7 +3767,7 @@
+--- a/gtk/src/hb-backend.c	
++++ b/gtk/src/hb-backend.c	
+@@ -3843,7 +3843,7 @@
  gint
  ghb_get_default_acodec()
  {
@@ -36,11 +32,11 @@ diff -ur a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
  }
  
  static void
-@@ -4505,13 +4505,9 @@
+@@ -4581,13 +4581,9 @@
              {
                  codec = HB_ACODEC_AC3;
              }
--            else if (mux == HB_MUX_MKV)
+-            else if (mux & HB_MUX_MASK_MKV)
 -            {
 -                codec = HB_ACODEC_LAME;
 -            }
@@ -49,9 +45,9 @@ diff -ur a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
 -                codec = HB_ACODEC_FAAC;
 +                codec = HB_ACODEC_LAME;
              }
-             value = ghb_lookup_acodec_value(codec);
+             value = ghb_lookup_audio_encoder_value(codec);
              ghb_settings_take_value(asettings, "AudioEncoder", value);
-@@ -4525,7 +4521,7 @@
+@@ -4601,7 +4597,7 @@
              if (codec == HB_ACODEC_VORBIS)
              {
                  a_unsup = "Vorbis";
@@ -60,9 +56,8 @@ diff -ur a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
              }
          }
          if (a_unsup)
-diff -ur a/gtk/src/preset_xlat.c b/gtk/src/preset_xlat.c
---- a/gtk/src/preset_xlat.c	2013-05-05 15:39:27.775401407 +0200
-+++ b/gtk/src/preset_xlat.c	2013-05-05 15:43:34.888733211 +0200
+--- a/gtk/src/preset_xlat.c	
++++ b/gtk/src/preset_xlat.c	
 @@ -260,7 +260,6 @@
  
  static value_map_t acodec_xlat[] =
@@ -71,33 +66,19 @@ diff -ur a/gtk/src/preset_xlat.c b/gtk/src/preset_xlat.c
      {"AC3 Passthru", "ac3"},
      {"MP3 (lame)", "lame"},
      {"Vorbis (vorbis)", "vorbis"},
-diff -ur a/gtk/src/presets.c b/gtk/src/presets.c
---- a/gtk/src/presets.c	2013-05-05 15:39:27.778734740 +0200
-+++ b/gtk/src/presets.c	2013-05-05 15:43:59.888733056 +0200
-@@ -2029,8 +2029,6 @@
- 
- static value_map_t acodec_xlat_compat[] =
- {
--    {"AAC (CoreAudio)", "faac"},
--    {"HE-AAC (CoreAudio)", "faac"},
-     {"AC3 (ffmpeg)", "ac3"},
-     {"AC3", "ac3"},
-     {"MP3 Passthru", "mp3pass"},
-diff -ur a/libhb/common.c b/libhb/common.c
---- a/libhb/common.c	2013-05-05 15:39:27.788734740 +0200
-+++ b/libhb/common.c	2013-05-05 15:45:02.782066001 +0200
-@@ -126,7 +126,6 @@
-     { "AAC (CoreAudio)",    "ca_aac",     HB_ACODEC_CA_AAC,       HB_MUX_MP4|HB_MUX_MKV },
-     { "HE-AAC (CoreAudio)", "ca_haac",    HB_ACODEC_CA_HAAC,      HB_MUX_MP4|HB_MUX_MKV },
- #endif
--    { "AAC (faac)",         "faac",       HB_ACODEC_FAAC,         HB_MUX_MP4|HB_MUX_MKV },
- #ifdef USE_FDK_AAC
-     { "AAC (FDK)",          "fdk_aac",    HB_ACODEC_FDK_AAC,      HB_MUX_MP4|HB_MUX_MKV },
-     { "HE-AAC (FDK)",       "fdk_haac",   HB_ACODEC_FDK_HAAC,     HB_MUX_MP4|HB_MUX_MKV },
-diff -ur a/libhb/common.h b/libhb/common.h
---- a/libhb/common.h	2013-05-05 15:39:27.788734740 +0200
-+++ b/libhb/common.h	2013-05-05 15:45:23.358732540 +0200
-@@ -945,7 +945,6 @@
+--- 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;
@@ -105,43 +86,34 @@ diff -ur a/libhb/common.h b/libhb/common.h
  extern hb_work_object_t hb_enclame;
  extern hb_work_object_t hb_encvorbis;
  extern hb_work_object_t hb_muxer;
-diff -ur a/libhb/encfaac.c b/libhb/encfaac.c
---- a/libhb/encfaac.c	2013-05-05 15:39:27.802068073 +0200
-+++ b/libhb/encfaac.c	2013-05-05 15:45:51.798732364 +0200
+--- a/libhb/encfaac.c	
++++ b/libhb/encfaac.c	
 @@ -1,3 +1,4 @@
 +#if 0
  /* encfaac.c
  
     Copyright (c) 2003-2013 HandBrake Team
-@@ -287,3 +288,4 @@
+@@ -289,3 +290,4 @@
      return HB_WORK_OK;
  }
- 
+ #endif // USE_FAAC
 +#endif /* 0 */
 \ No newline at end of file
-diff -ur a/libhb/hb.c b/libhb/hb.c
---- a/libhb/hb.c	2013-05-05 15:39:27.805401407 +0200
-+++ b/libhb/hb.c	2013-05-05 15:46:21.548732180 +0200
-@@ -487,7 +487,6 @@
- 	hb_register( &hb_decavcodeca );
- 	hb_register( &hb_decavcodecv );
- 	hb_register( &hb_declpcm );
--	hb_register( &hb_encfaac );
- 	hb_register( &hb_enclame );
- 	hb_register( &hb_encvorbis );
- 	hb_register( &hb_muxer );
-@@ -588,7 +587,6 @@
- 	hb_register( &hb_decavcodeca );
- 	hb_register( &hb_decavcodecv );
- 	hb_register( &hb_declpcm );
--	hb_register( &hb_encfaac );
- 	hb_register( &hb_enclame );
- 	hb_register( &hb_encvorbis );
- 	hb_register( &hb_muxer );
-diff -ur a/libhb/internal.h b/libhb/internal.h
---- a/libhb/internal.h	2013-05-05 15:39:27.805401407 +0200
-+++ b/libhb/internal.h	2013-05-05 15:46:28.215398806 +0200
-@@ -409,7 +409,6 @@
+--- 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,
@@ -149,28 +121,38 @@ diff -ur a/libhb/internal.h b/libhb/internal.h
      WORK_ENCLAME,
      WORK_ENCVORBIS,
      WORK_ENC_CA_AAC,
-diff -ur a/libhb/module.defs b/libhb/module.defs
---- a/libhb/module.defs	2013-05-05 15:39:27.808734740 +0200
-+++ b/libhb/module.defs	2013-05-05 15:46:41.458732057 +0200
+--- 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
  
-@@ -95,7 +95,7 @@
- LIBHB.lib = $(LIBHB.build/)hb.lib
+@@ -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
  
- LIBHB.dll.libs = $(foreach n, \
--        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
-+        a52 ass avcodec avformat avutil avresample dvdnav dvdread \
-         fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
-         ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
-         $(CONTRIB.build/)lib/lib$(n).a )
-diff -ur a/libhb/muxmkv.c b/libhb/muxmkv.c
---- a/libhb/muxmkv.c	2013-05-05 15:39:27.808734740 +0200
-+++ b/libhb/muxmkv.c	2013-05-05 15:47:03.052065256 +0200
-@@ -256,7 +256,6 @@
+-ifeq (1,$(FEATURE.faac))
+-LIBHB.dll.libs += $(CONTRIB.build/)lib/libfaac.a
+-endif
+-
+ ifeq (1,$(FEATURE.mp4v2))
+ LIBHB.dll.libs += $(CONTRIB.build/)lib/libmp4v2.a
+ endif
+--- a/libhb/muxmkv.c	
++++ b/libhb/muxmkv.c	
+@@ -263,7 +263,6 @@
                  }
                  track->codecID = MK_ACODEC_FLAC;
                  break;
@@ -178,9 +160,8 @@ diff -ur a/libhb/muxmkv.c b/libhb/muxmkv.c
              case HB_ACODEC_FFAAC:
              case HB_ACODEC_CA_AAC:
              case HB_ACODEC_CA_HAAC:
-diff -ur a/libhb/work.c b/libhb/work.c
---- a/libhb/work.c	2013-05-05 15:39:27.818734740 +0200
-+++ b/libhb/work.c	2013-05-05 15:47:14.658731851 +0200
+--- a/libhb/work.c	
++++ b/libhb/work.c	
 @@ -135,7 +135,6 @@
      switch (codec)
      {
@@ -189,15 +170,16 @@ diff -ur a/libhb/work.c b/libhb/work.c
          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);
-diff -ur a/test/module.defs b/test/module.defs
---- a/test/module.defs	2013-05-05 15:39:27.975401406 +0200
-+++ b/test/module.defs	2013-05-05 15:47:35.322065057 +0200
-@@ -14,7 +14,7 @@
- TEST.libs = $(LIBHB.a)
+--- a/test/module.defs	
++++ b/test/module.defs	
+@@ -23,10 +23,6 @@
+ TEST.GCC.l += fdk-aac
+ endif
  
- TEST.GCC.l = \
--        a52 ass avcodec avformat avutil avresample dvdnav dvdread faac \
-+        a52 ass avcodec avformat avutil avresample dvdnav dvdread \
-         fontconfig freetype fribidi mkv mpeg2 mp3lame mp4v2 ogg \
-         samplerate swscale theoraenc theoradec vorbis vorbisenc x264 \
-         bluray xml2 bz2 z
+-ifeq (1,$(FEATURE.faac))
+-TEST.GCC.l += faac
+-endif
+-
+ ifeq (1,$(FEATURE.mp4v2))
+ TEST.GCC.l += mp4v2
+ endif
diff --git a/media-video/handbrake/handbrake-0.9.9.ebuild b/media-video/handbrake/handbrake-0.9.9.ebuild
index 51584ab914a0..58c6aded062c 100644
--- a/media-video/handbrake/handbrake-0.9.9.ebuild
+++ b/media-video/handbrake/handbrake-0.9.9.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-video/handbrake/handbrake-0.9.9.ebuild,v 1.6 2013/07/07 13:05:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.7 2013/07/15 15:03:54 tomwij Exp $
 
 EAPI="5"
 
@@ -90,7 +90,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/handbrake-9999-remove-dvdnav-dup.patch
 
 	# Remove faac dependency until its compilation errors can be resolved.
-	epatch "${FILESDIR}"/handbrake-9999-remove-faac-dependency.patch
+	epatch "${FILESDIR}"/${P}-remove-faac-dependency.patch
 	sed -i 's/-lfaac//' gtk/configure.ac || die
 
 	# Make use of an older version of libmkv.
diff --git a/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild b/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild
deleted file mode 100644
index 7c4d3b1e4fb8..000000000000
--- a/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild,v 1.3 2013/06/29 20:35:06 tomwij Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_{5,6,7} )
-
-inherit autotools eutils gnome2-utils python-any-r1
-
-if [[ ${PV} = *9999* ]]; then
-	ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
-	inherit subversion
-	KEYWORDS=""
-else
-	SRC_URI="http://dev.gentoo.org/~tomwij/files/dist/${P}.tar.gz"
-	S="${WORKDIR}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder."
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="fdk ffmpeg gstreamer gtk"
-
-# Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
-REQUIRED_USE="!ffmpeg? ( gstreamer )"
-
-RDEPEND="
-	media-libs/a52dec
-	media-libs/libass
-	media-libs/libbluray
-	media-libs/libdvdnav
-	media-libs/libdvdread
-	media-libs/libmpeg2
-	media-libs/libmp4v2:0
-	media-libs/libmkv
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/x264
-	media-sound/lame
-	ffmpeg? ( =virtual/ffmpeg-9 !<media-video/ffmpeg-1.2.1 )
-	sys-libs/zlib
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		!ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
-	)
-	gtk? (
-		x11-libs/gtk+:3
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-		>=virtual/udev-171[gudev]
-	)
-	fdk? ( media-libs/fdk-aac )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Get rid of leftover bundled library build definitions,
-	# the version 0.9.9 supports the use of system libraries.
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	# Instead of adding a #define to libmkv, we expand it in place. 
-	epatch "${FILESDIR}"/handbrake-9999-expand-MK_SUBTITLE_PGS.patch
-
-	# Fix compilation against the released 1.9.1 version of mp4v2.
-	epatch "${FILESDIR}"/handbrake-9999-fix-compilation-with-mp4v2-v1.9.1.patch
-
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	epatch "${FILESDIR}"/handbrake-9999-remove-dvdnav-dup.patch
-
-	# Remove faac dependency until its compilation errors can be resolved.
-	epatch "${FILESDIR}"/handbrake-9999-remove-faac-dependency.patch
-
-	# Make use of an older version of libmkv.
-	epatch "${FILESDIR}"/handbrake-9999-use-older-libmkv.patch
-
-	# Make use of an unpatched version of a52 that does not make a private field public.
-	epatch "${FILESDIR}"/handbrake-9999-use-unpatched-a52.patch
-
-	# Fixup configure.ac with newer automake
-	cd "${S}/gtk"
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:g' \
-		-e 's:am_cv_prog_cc_stdc:ac_cv_prog_cc_stdc:g' \
-		configure.ac || die "Fixing up configure.ac failed"
-
-	# Don't run autogen.sh
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	if ! use gtk ; then
-		myconf+=" --disable-gtk"
-	fi
-
-	if ! use gstreamer ; then
-		myconf+=" --disable-gst"
-	fi
-
-	if use ffmpeg ; then
-		myconf+=" --enable-ff-mpeg2"
-	fi
-
-	if use fdk ; then
-		myconf+=" --enable-fdk-aac"
-	fi
-
-	./configure \
-		--force \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		${myconf} || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# Documentation building is currently broken.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc AUTHORS CREDITS NEWS THANKS TRANSLATIONS
-}
-
-pkg_postinst() {
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-
-	if use gtk ; then
-		einfo ""
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index b28bdd131cfc..7449585ca15b 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.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-video/handbrake/handbrake-9999.ebuild,v 1.8 2013/07/07 13:05:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.9 2013/07/15 15:03:54 tomwij Exp $
 
 EAPI="5"
 
@@ -8,6 +8,9 @@ PYTHON_COMPAT=( python2_{5,6,7} )
 
 inherit autotools eutils gnome2-utils python-any-r1
 
+# TODO: Are KEYWORDS like these stabilization script friendly?
+#       We can opt to move the KEYWORDS from the else before the if;
+#       that way, it is listed first and the 9999 version will set it to "".
 if [[ ${PV} = *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
 	inherit subversion
@@ -28,8 +31,13 @@ IUSE="fdk ffmpeg gstreamer gtk"
 # Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
 REQUIRED_USE="!ffmpeg? ( gstreamer )"
 
+# TODO: As we improve src_configure with more flags we can make more optional here.
+#       Besides that, we should list slots for all the dependencies as well as
+#       support sub slot rebuilds where they are still missing; lets avoid running
+#       into more problems while we can.
 RDEPEND="
 	media-libs/a52dec
+	media-libs/faac
 	media-libs/libass
 	media-libs/libbluray
 	media-libs/libdvdnav
@@ -75,6 +83,8 @@ pkg_setup() {
 src_prepare() {
 	# Get rid of leftover bundled library build definitions,
 	# the version 0.9.9 supports the use of system libraries.
+	# TODO: Is this still needed, does this sed still do something?
+	#       If it does; we should convert this into a patch, such that we know it fails.
 	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
 		"${S}"/make/include/main.defs \
 		|| die "Contrib removal failed."
@@ -90,6 +100,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/handbrake-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.
 	epatch "${FILESDIR}"/handbrake-9999-remove-faac-dependency.patch
 
 	# Make use of an older version of libmkv.
@@ -98,7 +110,9 @@ src_prepare() {
 	# Make use of an unpatched version of a52 that does not make a private field public.
 	epatch "${FILESDIR}"/handbrake-9999-use-unpatched-a52.patch
 
-	# Fixup configure.ac with newer automake
+	# 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.
 	cd "${S}/gtk"
 	sed -i \
 		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
@@ -106,41 +120,41 @@ src_prepare() {
 		-e 's:am_cv_prog_cc_stdc:ac_cv_prog_cc_stdc:g' \
 		configure.ac || die "Fixing up configure.ac failed"
 
-	# Don't run autogen.sh
+	# Don't run autogen.sh.
+	# TODO: Document why we're not running this.
 	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+
 	eautoreconf
 }
 
 src_configure() {
-	local myconf=""
-
-	if ! use gtk ; then
-		myconf+=" --disable-gtk"
-	fi
-
-	if ! use gstreamer ; then
-		myconf+=" --disable-gst"
-	fi
-
-	if use ffmpeg ; then
-		myconf+=" --enable-ff-mpeg2"
-	fi
-
-	if use fdk ; then
-		myconf+=" --enable-fdk-aac"
-	fi
-
+	# TODO: Try to make parameters avformat, libav-aac, libmkv, mp4v2 optional
+	#       as for making faac optional, see the above TODO first.
+	#
+	#       Just to be sure, check the ./configure --help before each release;
+	#       they are still in the progress of unbundling / making things optional.
+	#
+	#       Check if the Python-ish implementation supports econf style.
 	./configure \
 		--force \
 		--prefix="${EPREFIX}/usr" \
 		--disable-gtk-update-checks \
+		--disable-faac \
+		--enable-avformat \
+		--disable-libav-aac \
+		--enable-libmkv \
+		--enable-mp4v2 \
+		$(use_enable fdk fdk-aac) \
+		$(use_enable ffmpeg ff-mpeg2) \
+		$(use_enable gtk) \
+		$(use_enable gstreamer gst) \
 		${myconf} || die "Configure failed."
 }
 
 src_compile() {
 	emake -C build
 
-	# Documentation building is currently broken.
+	# TODO: Documentation building is currently broken, try to fix it.
 	#
 	# if use doc ; then
 	# 	emake -C build doc