remove unused versions

(Portage version: 2.1.4_rc14)

15 files changed, 13 insertions, 895 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index 041d43148143..5cdcd57d55ab 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.99 2008/01/02 13:59:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.100 2008/01/02 17:11:09 aballier Exp $
+
+  02 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/libquicktime-0.9.7-dv.patch,
+  -files/libquicktime-0.9.7-unrice.patch,
+  -files/libquicktime-0.9.10-automagic-deps.patch,
+  -files/libquicktime-0.9.10-cflags.patch,
+  -files/libquicktime-0.9.10-opengl-link.patch,
+  -files/libquicktime-0.9.10-x264.patch,
+  -files/libquicktime-1.0.0-cflags.patch,
+  -files/libquicktime-1.0.0-gtk212.patch, -libquicktime-0.9.7-r1.ebuild,
+  -libquicktime-0.9.10.ebuild, -libquicktime-1.0.0.ebuild:
+  remove unused versions
 
 *libquicktime-1.0.1-r1 (02 Jan 2008)
 
diff --git a/media-libs/libquicktime/files/digest-libquicktime-0.9.10 b/media-libs/libquicktime/files/digest-libquicktime-0.9.10
deleted file mode 100644
index 4e1a513e9117..000000000000
--- a/media-libs/libquicktime/files/digest-libquicktime-0.9.10
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 5ff99f1a7b22f9e1ed85240f736fd14c libquicktime-0.9.10.tar.gz 851578
-RMD160 b29e4fc28ef17406e14e042faa36f673e6a89ca7 libquicktime-0.9.10.tar.gz 851578
-SHA256 7b7335721957a2e37dbc427daa2753f1c16b7e7f8877e6e9b629b1dd011d1ecd libquicktime-0.9.10.tar.gz 851578
-MD5 80fb928062ba23e4833c0319ab60e678 libquicktime-m4-1.tar.bz2 3622
-RMD160 443f8d30c2022a9a3bc897f0c3e69c5964cc08dd libquicktime-m4-1.tar.bz2 3622
-SHA256 db15fd86bd78d5396b0e2c71e6f8e786e01526bb1fa4c09311c7997b15494137 libquicktime-m4-1.tar.bz2 3622
diff --git a/media-libs/libquicktime/files/digest-libquicktime-0.9.7-r1 b/media-libs/libquicktime/files/digest-libquicktime-0.9.7-r1
deleted file mode 100644
index ba4dcb26c365..000000000000
--- a/media-libs/libquicktime/files/digest-libquicktime-0.9.7-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e5c977567df59c876c50ac191bb1caf6 libquicktime-0.9.7.tar.gz 765719
-RMD160 a886cbc714306d94977616de7221a19298fa251d libquicktime-0.9.7.tar.gz 765719
-SHA256 43b3b1b3a4ca24c2017f1fa0470425e522b59346b74203b39f9991f6a7b6085e libquicktime-0.9.7.tar.gz 765719
-MD5 80fb928062ba23e4833c0319ab60e678 libquicktime-m4-1.tar.bz2 3622
-RMD160 443f8d30c2022a9a3bc897f0c3e69c5964cc08dd libquicktime-m4-1.tar.bz2 3622
-SHA256 db15fd86bd78d5396b0e2c71e6f8e786e01526bb1fa4c09311c7997b15494137 libquicktime-m4-1.tar.bz2 3622
diff --git a/media-libs/libquicktime/files/digest-libquicktime-1.0.0 b/media-libs/libquicktime/files/digest-libquicktime-1.0.0
deleted file mode 100644
index 1d05aa0bc046..000000000000
--- a/media-libs/libquicktime/files/digest-libquicktime-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2f609e3ef5e760f44022f6c4b66d6a01 libquicktime-1.0.0.tar.gz 998950
-RMD160 8f3b2dd22bdff8bc09d33b84164a684581ee8ece libquicktime-1.0.0.tar.gz 998950
-SHA256 60c478fd81450e18a1fcf1bcee672d5cd04c4ca5871ffb709ef6a635111141a4 libquicktime-1.0.0.tar.gz 998950
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch b/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch
deleted file mode 100644
index 882cbc6e2ace..000000000000
--- a/media-libs/libquicktime/files/libquicktime-0.9.10-automagic-deps.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-diff -ru libquicktime-0.9.10-orig/configure.ac libquicktime-0.9.10/configure.ac
---- libquicktime-0.9.10-orig/configure.ac	2006-12-13 17:27:44.000000000 +0100
-+++ libquicktime-0.9.10/configure.ac	2006-12-16 09:49:28.000000000 +0100
-@@ -170,6 +170,10 @@
- LAME_REQUIRED="3.93"
- have_lame="false"
- 
-+AC_ARG_WITH([lame], AS_HELP_STRING([--without-lame], [Build without lame library (default: test)]))
-+
-+if test "x$with_lame" != "xno"; then
-+
- OLD_CFLAGS=$CFLAGS
- OLD_LIBS=$LIBS
- 
-@@ -221,6 +225,8 @@
- AC_SUBST(LAME_LIBS)
- AC_SUBST(LAME_REQUIRED)
- 
-+fi
-+
- AM_CONDITIONAL(HAVE_LAME, test x$have_lame = xtrue)
- 
- dnl
-@@ -249,6 +255,10 @@
- 
- AH_TEMPLATE([HAVE_GL], [Do we have OpenGL?])
- 
-+AC_ARG_WITH([opengl], AS_HELP_STRING([--without-opengl], [Build without opengl library (default: test)]))
-+
-+if test "x$with_opengl" != "xno"; then
-+
- have_gl="yes"
- 
- AC_CHECK_HEADER([GL/gl.h],[],have_gl="no")
-@@ -265,6 +275,8 @@
- AC_DEFINE(HAVE_GL,1)
- fi
- 
-+fi
-+
- dnl
- dnl Check for Alsa
- dnl
-@@ -273,8 +285,15 @@
- 
- AH_TEMPLATE([HAVE_ALSA], [Do we have Alsa?])
- 
--ALSA_REQUIRED="0.9"
--PKG_CHECK_MODULES(ALSA, alsa >= $ALSA_REQUIRED, have_alsa="true", have_alsa="false")
-+AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
-+
-+if test "x$with_alsa" != "xno"; then
-+
-+  ALSA_REQUIRED="0.9"
-+  PKG_CHECK_MODULES(ALSA, alsa >= $ALSA_REQUIRED, have_alsa="true", have_alsa="false")
-+
-+fi
-+
- AM_CONDITIONAL(HAVE_ALSA, test x$have_alsa = xtrue)
- 
- if test x$have_alsa = xtrue; then
-@@ -298,7 +317,12 @@
- dnl This is neccesary for the utils/gtk subdirectory
- dnl
- GTK_REQUIRED="2.4.0"
--AM_PATH_GTK_2_0($GTK_REQUIRED, have_gtk=true, have_gtk=false)
-+AC_ARG_WITH([gtk], AS_HELP_STRING([--without-gtk], [Build without gtk library (default: test)]))
-+
-+if test "x$with_gtk" != "xno"; then
-+  AM_PATH_GTK_2_0($GTK_REQUIRED, have_gtk=true, have_gtk=false)
-+fi
-+
- AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xtrue)
- AC_SUBST(GTK_REQUIRED)
- 
-@@ -309,14 +333,20 @@
- dnl Check for libdv
- dnl
- 
-+AC_ARG_WITH([libdv], AS_HELP_STRING([--without-libdv], [Build without libdv support (default: test)]))
-+
- have_libdv="false"
- 
- LIBDV_REQUIRED="0.102"
- 
--PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false")
--AC_SUBST(LIBDV_REQUIRED)
--AC_SUBST(LIBDV_LIBS)
--AC_SUBST(LIBDV_CFLAGS)
-+if test "x$with_libdv" != "xno"; then
-+
-+  PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false")
-+  AC_SUBST(LIBDV_REQUIRED)
-+  AC_SUBST(LIBDV_LIBS)
-+  AC_SUBST(LIBDV_CFLAGS)
-+
-+fi
- 
- AM_CONDITIONAL(HAVE_LIBDV, test x$have_libdv = xtrue)
- 
-@@ -324,6 +354,10 @@
- dnl Check for libjpeg
- dnl
- 
-+AC_ARG_WITH([jpeg], AS_HELP_STRING([--without-jpeg], [Build without jpeg library (default: test)]))
-+
-+if test "x$with_jpeg" != "xno"; then
-+
- JPEG_REQUIRED="6b"
- AC_CHECK_LIB(jpeg, jpeg_start_compress,
- 	    [ JPEG_LIBS="-ljpeg"
-@@ -333,6 +367,7 @@
- AC_SUBST(JPEG_LIBS)
- AC_SUBST(JPEG_CFLAGS)
- AC_SUBST(JPEG_REQUIRED)
-+fi
- AM_CONDITIONAL(HAVE_LIBJPEG, test x$have_libjpeg = xtrue)
- 
- dnl
-@@ -344,6 +379,10 @@
- 
- have_libavcodec=false
- 
-+AC_ARG_WITH([ffmpeg], AS_HELP_STRING([--without-ffmpeg], [Build without ffmpeg library (default: test)]))
-+
-+if test "x$with_ffmpeg" != "xno"; then
-+
- AVCODEC_BUILD="3277056"
- 
- dnl PKG_CHECK_MODULES(AVCODEC, avcodec_acl = $AVCODEC_REQUIRED, have_libavcodec="true", have_libavcodec="false")
-@@ -351,6 +390,8 @@
- 
- AVCODEC_REQUIRED=$AVCODEC_VERSION
- 
-+fi
-+
- AM_CONDITIONAL(HAVE_LIBAVCODEC, test x$have_libavcodec = xtrue)
- 
- AC_SUBST(AVCODEC_REQUIRED)
-@@ -366,6 +407,10 @@
- have_libpng=false
- PNG_REQUIRED="1.0.8"
- 
-+AC_ARG_WITH([png], AS_HELP_STRING([--without-png], [Build without png library (default: test)]))
-+
-+if test "x$with_png" != "xno"; then
-+
- OLD_CFLAGS=$CFLAGS
- OLD_LIBS=$LIBS
- 
-@@ -395,6 +440,8 @@
- AC_SUBST(PNG_LIBS)
- AC_SUBST(PNG_REQUIRED)
- 
-+fi
-+
- AM_CONDITIONAL(HAVE_LIBPNG, test x$have_libpng = xtrue)
- 
- dnl
-@@ -407,6 +454,12 @@
- 
- if test $have_gpl = "true"; then
- 
-+AC_ARG_WITH([faac], AS_HELP_STRING([--without-faac], [Build without faac library (default: test)]))
-+
-+if test "x$with_faac" != "xno"; then
-+OLD_CFLAGS=$CFLAGS
-+OLD_LIBS=$LIBS
-+
- LIBS="$LIBS -lfaac -lm"
- CFLAGS="$CFLAGS"
- 
-@@ -448,6 +501,8 @@
- AC_SUBST(FAAC_LIBS)
- AC_SUBST(FAAC_REQUIRED)
- 
-+fi
-+
- AM_CONDITIONAL(HAVE_FAAC, test x$have_faac = xtrue)
- 
- if test x$have_faac = xtrue; then
-@@ -464,6 +519,11 @@
- 
- if test $have_gpl = "true"; then
- 
-+
-+AC_ARG_WITH([faad2], AS_HELP_STRING([--without-faad2], [Build without faad2 library (default: test)]))
-+
-+if test "x$with_faad2" != "xno"; then
-+
- AC_MSG_CHECKING(for faad2)
- 
- OLD_CFLAGS=$CFLAGS
-@@ -505,6 +565,8 @@
- 
- fi
- 
-+fi
-+
- AC_SUBST(FAAD2_CFLAGS)
- AC_SUBST(FAAD2_LIBS)
- AC_SUBST(FAAD2_REQUIRED)
-@@ -524,12 +586,17 @@
- if test $have_gpl = "true"; then
- X264_REQUIRED="0.48"
- 
-+AC_ARG_WITH([x264], AS_HELP_STRING([--without-x264], [Build without x264 library (default: test)]))
-+
-+if test "x$with_x264" != "xno"; then
-+
- PKG_CHECK_MODULES(X264, x264 >= $X264_REQUIRED, have_x264="true", have_x264="false")
- AC_SUBST(X264_REQUIRED)
- AC_SUBST(X264_LIBS)
- AC_SUBST(X264_CFLAGS)
- 
- fi
-+fi
- AM_CONDITIONAL(HAVE_X264, test x$have_x264 = xtrue)
- 
- if test "x$prefix" = xNONE; then
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.10-cflags.patch b/media-libs/libquicktime/files/libquicktime-0.9.10-cflags.patch
deleted file mode 100644
index 5592132ae78a..000000000000
--- a/media-libs/libquicktime/files/libquicktime-0.9.10-cflags.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- libquicktime-0.9.10/configure.ac	2006-12-22 14:37:15.446268575 +0100
-+++ libquicktime-0.9.10-patched/configure.ac	2006-12-22 14:39:06.560191379 +0100
-@@ -174,16 +174,20 @@
- 
- if test "x$with_lame" != "xno"; then
- 
--OLD_CFLAGS=$CFLAGS
--OLD_LIBS=$LIBS
-+
-+LAME_CFLAGS=""
- 
- if test x$have_vorbis = xtrue; then
--LIBS="$LIBS -lmp3lame -lvorbis -lm"
-+LAME_LIBS="-lmp3lame -lvorbis -lm"
- else
--LIBS="$LIBS -lmp3lame -lm"
-+LAME_LIBS="$LIBS -lmp3lame -lm"
- fi
- 
-+OLD_CFLAGS=$CFLAGS
-+OLD_LIBS=$LIBS
-+
- dnl CFLAGS="$CFLAGS"
-+LIBS="$LIBS $LAME_LIBS"
- 
- AC_MSG_CHECKING(for lame)
- have_lame="false"
-@@ -210,7 +214,6 @@
-     # program could be run
-     have_lame="true"
-     AC_MSG_RESULT(yes)
--    LAME_CFLAGS=$CFLAGS
-     LAME_LIBS=$LIBS
- 
-   ],
-@@ -417,8 +420,11 @@
- OLD_CFLAGS=$CFLAGS
- OLD_LIBS=$LIBS
- 
--LIBS="-lpng -lm -lz"
--CFLAGS=""
-+PNG_LIBS="-lpng -lm -lz"
-+PNG_CFLAGS=""
-+
-+LIBS="${PNG_LIBS}"
-+CFLAGS="${CFLAGS} ${PNG_CFLAGS}"
- 
- AC_MSG_CHECKING(for libpng)
- AC_TRY_LINK([#include <png.h>],
-@@ -430,9 +436,7 @@
- 
- case $have_libpng in
-   true) AC_DEFINE(HAVE_LIBPNG)
--        AC_MSG_RESULT(yes)
--	PNG_LIBS=$LIBS ;
--	PNG_CFLAGS=$CFLAGS ;;
-+        AC_MSG_RESULT(yes) ;;
-   false) AC_MSG_RESULT(no); PNG_LIBS=""; PNG_CFLAGS="";;
- esac
-   
-@@ -463,8 +467,11 @@
- OLD_CFLAGS=$CFLAGS
- OLD_LIBS=$LIBS
- 
--LIBS="$LIBS -lfaac -lm"
--CFLAGS="$CFLAGS"
-+FAAC_LIBS="$LIBS -lfaac -lm"
-+FAAC_CFLAGS=""
-+
-+LIBS="${LIBS} ${FAAC_LIBS}"
-+CFLAGS="$CFLAGS ${FAAC_CFLAGS}"
- 
- AC_MSG_CHECKING(for faac)
- AC_TRY_RUN([
-@@ -487,8 +494,6 @@
-     # program could be run
-     have_faac="true"
-     AC_MSG_RESULT(yes)
--    FAAC_CFLAGS=$CFLAGS
--    FAAC_LIBS=$LIBS
- 
-   ],
-     # program could not be run
-@@ -532,8 +537,11 @@
- OLD_CFLAGS=$CFLAGS
- OLD_LIBS=$LIBS
- 
--CFLAGS="$CFLAGS"
--LIBS="$LIBS -lfaad -lm"
-+FAAD2_LIBS="-lfaad -lm"
-+FAAD2_CFLAGS=""
-+
-+CFLAGS="$CFLAGS $FAAD2_CFLAGS"
-+LIBS="$LIBS ${FAAD2_LIBS}"
- 
-   AC_TRY_RUN([
-     #include "faad.h"
-@@ -556,8 +564,6 @@
-     # program could be run
-     have_faad2="true"
-     AC_MSG_RESULT(yes)
--    FAAD2_CFLAGS=$CFLAGS
--    FAAD2_LIBS=$LIBS
- 
-   ],
-     # program could not be run
-@@ -622,9 +628,17 @@
- 
- COMMON_CFLAGS="-finline-functions -Wall -Winline"
- 
--dnl Optimizing flags
-+if [[ ${CFLAGS} == "" ]]; then
-+
-+  dnl Optimizing flags
-+
-+  LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
-+
-+  CFLAGS="$OPT_CFLAGS"
-+
-+fi
- 
--LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
-+CFLAGS="${CFLAGS} ${COMMON_CFLAGS}"
- 
- AH_TEMPLATE([NDEBUG],
-             [Causes debug code to e removed])
-@@ -633,7 +647,6 @@
- AC_DEFINE(NDEBUG)
- fi
- 
--CFLAGS="$OPT_CFLAGS $COMMON_CFLAGS"
- 
- # -L is required so that linker can find libquicktime when DESTDIR is used.
- # libtool bug, documented at: http://www.geocrawler.com/mail/thread.php3?subject=install+phase+fails&list=404
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.10-opengl-link.patch b/media-libs/libquicktime/files/libquicktime-0.9.10-opengl-link.patch
deleted file mode 100644
index 0739b96a2dba..000000000000
--- a/media-libs/libquicktime/files/libquicktime-0.9.10-opengl-link.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru libquicktime-0.9.10/configure.ac libquicktime-0.9.10-opengl-link/configure.ac
---- libquicktime-0.9.10/configure.ac	2006-12-16 09:49:28.000000000 +0100
-+++ libquicktime-0.9.10-opengl-link/configure.ac	2006-12-16 11:43:13.000000000 +0100
-@@ -273,10 +273,13 @@
- 
- if test "x$have_gl" = "xyes"; then
- AC_DEFINE(HAVE_GL,1)
-+GL_LIBS="-lGLU -lGL"
- fi
- 
- fi
- 
-+AC_SUBST(GL_LIBS)
-+
- dnl
- dnl Check for Alsa
- dnl
-diff -ru libquicktime-0.9.10/utils/Makefile.am libquicktime-0.9.10-opengl-link/utils/Makefile.am
---- libquicktime-0.9.10/utils/Makefile.am	2005-10-10 19:05:25.000000000 +0200
-+++ libquicktime-0.9.10-opengl-link/utils/Makefile.am	2006-12-16 11:10:17.000000000 +0100
-@@ -55,7 +55,7 @@
- 
- lqtplay_SOURCES=lqtplay.c
- lqtplay_LDADD=@UTIL_LIBADD@ @X_LIBS@ -lXaw -lXt @X_PRE_LIBS@ -lXext \
--	-lXv -lGLU -lGL -lX11 @X_EXTRA_LIBS@ -lm @ALSA_LIBS@ @OSSAUDIO_LIBS@
-+	-lXv @GL_LIBS@ -lX11 @X_EXTRA_LIBS@ -lm @ALSA_LIBS@ @OSSAUDIO_LIBS@
- 
- INCLUDES = -I$(top_srcdir)/include \
- 	    -I$(top_builddir)/include/quicktime \
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.10-x264.patch b/media-libs/libquicktime/files/libquicktime-0.9.10-x264.patch
deleted file mode 100644
index 186f7d031540..000000000000
--- a/media-libs/libquicktime/files/libquicktime-0.9.10-x264.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- libquicktime-0.9.10/plugins/x264/x264.c.old	2006-10-15 01:14:30.000000000 +0200
-+++ libquicktime-0.9.10/plugins/x264/x264.c	2006-10-15 01:15:00.000000000 +0200
-@@ -91,7 +91,11 @@
-   fprintf(stderr, "    i_qp_step:          %d\n", params->rc.i_qp_step);
-   fprintf(stderr, "    b_cbr:              %d\n", params->rc.b_cbr);
-   fprintf(stderr, "    i_bitrate:          %d\n", params->rc.i_bitrate);
-+#if X264_BUILD < 54
-   fprintf(stderr, "    i_rf_constant:      %d\n", params->rc.i_rf_constant);
-+#else
-+  fprintf(stderr, "    f_rf_constant:      %f\n", params->rc.f_rf_constant);
-+#endif
-   fprintf(stderr, "    f_rate_tolerance:   %f\n", params->rc.f_rate_tolerance);
-   fprintf(stderr, "    i_vbv_max_bitrate:  %d\n", params->rc.i_vbv_max_bitrate);
-   fprintf(stderr, "    i_vbv_buffer_size:  %d\n", params->rc.i_vbv_buffer_size);
-@@ -493,7 +497,11 @@
-       {
-       /* Force ABR */
-       codec->params.rc.i_rc_method = X264_RC_ABR;
-+#if X264_BUILD < 54
-       codec->params.rc.i_rf_constant = 0;
-+#else
-+      codec->params.rc.f_rf_constant = 0.;
-+#endif
-       if(codec->pass == 1)
-         {
-         /* Strings will be made private by x264 */
-@@ -655,7 +663,11 @@
-   INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate);
-   
-   INTPARAM("x264_i_qp_constant", codec->params.rc.i_qp_constant);
-+#if X264_BUILD < 54
-   INTPARAM("x264_i_rf_constant", codec->params.rc.i_rf_constant);
-+#else
-+  FLOATPARAM("x264_f_rf_constant", codec->params.rc.f_rf_constant);
-+#endif
-   INTPARAM("x264_i_qp_min", codec->params.rc.i_qp_min);
-   INTPARAM("x264_i_qp_max", codec->params.rc.i_qp_max);
-   INTPARAM("x264_i_qp_step", codec->params.rc.i_qp_step);
---- libquicktime-0.9.10/plugins/x264/lqt_x264.c.old	2006-10-15 01:14:38.000000000 +0200
-+++ libquicktime-0.9.10/plugins/x264/lqt_x264.c	2006-10-15 01:15:00.000000000 +0200
-@@ -3,6 +3,9 @@
- #include <quicktime/lqt_codecapi.h>
- #include <quicktime/colormodels.h>
- 
-+/* To get X264_BUILD value */
-+#include <x264.h>
-+
- void quicktime_init_codec_x264(quicktime_video_map_t *vtrack);
- 
- static char * fourccs_x264[]  = { "avc1", (char*)0 };
-@@ -95,6 +98,7 @@
-       val_default: { val_int: 0 },
-       help_string: "Bitrate in kbit/s. 0 means VBR (recommended)"
-     },
-+#if X264_BUILD < 54
-     {
-       name:        "x264_i_rf_constant",
-       real_name:   "Nominal Quantizer parameter",
-@@ -105,6 +109,18 @@
-       help_string: "This selects the nominal quantizer to use (1 to 51). Lower values result in " \
-     "better fidelity, but higher bitrates. 26 is a good default value. 0 means lossless."
-     },
-+#else
-+    {
-+      name:        "x264_f_rf_constant",
-+      real_name:   "Nominal Quantizer parameter",
-+      type:        LQT_PARAMETER_FLOAT,
-+      val_default: { val_float: 26.0 },
-+      val_min:     { val_float: 0.0 },
-+      val_max:     { val_float: 51.0 },
-+      help_string: "This selects the nominal quantizer to use (1 to 51). Lower values result in " \
-+    "better fidelity, but higher bitrates. 26 is a good default value. 0 means lossless."
-+    },
-+#endif
-     {
-       name:        "x264_i_qp_constant",
-       real_name:   "Quantizer parameter",
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch b/media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch
deleted file mode 100644
index d248d5613d52..000000000000
--- a/media-libs/libquicktime/files/libquicktime-0.9.7-dv.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: libquicktime-0.9.7/configure.ac
-===================================================================
---- libquicktime-0.9.7.orig/configure.ac
-+++ libquicktime-0.9.7/configure.ac
-@@ -264,7 +264,11 @@ have_libdv="false"
- 
- LIBDV_REQUIRED="0.102"
- 
--PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false")
-+AC_ARG_WITH([libdv], AC_HELP_STRING([--with-libdv], [Build with libdv support (default: check)]))
-+
-+if test "x$with_libdv" != "xno"; then
-+	PKG_CHECK_MODULES(LIBDV, libdv >= $LIBDV_REQUIRED, have_libdv="true", have_libdv="false")
-+fi
- AC_SUBST(LIBDV_REQUIRED)
- AC_SUBST(LIBDV_LIBS)
- AC_SUBST(LIBDV_CFLAGS)
diff --git a/media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch b/media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch
deleted file mode 100644
index 825b98c96219..000000000000
--- a/media-libs/libquicktime/files/libquicktime-0.9.7-unrice.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: libquicktime-0.9.7/configure.ac
-===================================================================
---- libquicktime-0.9.7.orig/configure.ac
-+++ libquicktime-0.9.7/configure.ac
-@@ -581,11 +581,11 @@ dnl
- dnl Build CFLAGS
- dnl
- 
--COMMON_CFLAGS="-finline-functions -Wall -Winline"
-+COMMON_CFLAGS="-Wall -Winline"
- 
- dnl Optimizing flags
- 
--LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
-+LQT_OPT_CFLAGS($host_cpu)
- 
- AH_TEMPLATE([NDEBUG],
-             [Causes debug code to e removed])
-@@ -594,7 +594,7 @@ if test x$LQT_DEBUG != xtrue; then
- AC_DEFINE(NDEBUG)
- fi
- 
--CFLAGS="$OPT_CFLAGS $COMMON_CFLAGS"
-+CFLAGS="$CFLAGS $OPT_CFLAGS $COMMON_CFLAGS"
- 
- # -L is required so that linker can find libquicktime when DESTDIR is used.
- # libtool bug, documented at: http://www.geocrawler.com/mail/thread.php3?subject=install+phase+fails&list=404
diff --git a/media-libs/libquicktime/files/libquicktime-1.0.0-cflags.patch b/media-libs/libquicktime/files/libquicktime-1.0.0-cflags.patch
deleted file mode 100644
index 03da11e82be7..000000000000
--- a/media-libs/libquicktime/files/libquicktime-1.0.0-cflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: libquicktime-1.0.0/configure.ac
-===================================================================
---- libquicktime-1.0.0.orig/configure.ac
-+++ libquicktime-1.0.0/configure.ac
-@@ -7,6 +7,8 @@ LQT_VERSION_MAJOR=`echo $VERSION | cut -
- LQT_VERSION_MINOR=`echo $VERSION | cut -d . -f 2`
- LQT_VERSION_MICRO=`echo $VERSION | cut -d . -f 3 | cut -d p -f 1`
- 
-+USER_CFLAGS=$CFLAGS
-+
- AM_CONFIG_HEADER(config.h)
- 
- AC_CANONICAL_HOST
-@@ -693,10 +695,15 @@ for i in $lqt_test_cflags; do
-   LQT_TRY_CFLAGS($i, COMMON_CFLAGS="$COMMON_CFLAGS $i") ;
- done
- 
-+if test "x${USER_CFLAGS}" = "x"; then
-+
-+  dnl Optimizing flags
- 
--dnl Optimizing flags
-+  LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
- 
--LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
-+  CFLAGS="$OPT_CFLAGS"
-+
-+fi
- 
- AH_TEMPLATE([NDEBUG],
-             [Causes debug code to e removed])
-@@ -705,7 +712,7 @@ if test x$LQT_DEBUG != xtrue; then
- AC_DEFINE(NDEBUG)
- fi
- 
--CFLAGS="$OPT_CFLAGS $COMMON_CFLAGS"
-+CFLAGS="$CFLAGS $COMMON_CFLAGS"
- 
- # -L is required so that linker can find libquicktime when DESTDIR is used.
- # libtool bug, documented at: http://www.geocrawler.com/mail/thread.php3?subject=install+phase+fails&list=404
diff --git a/media-libs/libquicktime/files/libquicktime-1.0.0-gtk212.patch b/media-libs/libquicktime/files/libquicktime-1.0.0-gtk212.patch
deleted file mode 100644
index 8e53dd52aec1..000000000000
--- a/media-libs/libquicktime/files/libquicktime-1.0.0-gtk212.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libquicktime-1.0.0.orig/configure.ac libquicktime-1.0.0/configure.ac
---- libquicktime-1.0.0.orig/configure.ac	2007-04-17 20:43:19.000000000 +0300
-+++ libquicktime-1.0.0/configure.ac	2007-09-23 14:17:36.000000000 +0300
-@@ -365,7 +365,7 @@
- AC_SUBST(GTK_REQUIRED)
- 
- dnl Always be in sync with the newest gtk
--GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED"
-+GTK_CFLAGS="$GTK_CFLAGS"
- 
- dnl
- dnl Check for libdv
diff --git a/media-libs/libquicktime/libquicktime-0.9.10.ebuild b/media-libs/libquicktime/libquicktime-0.9.10.ebuild
deleted file mode 100644
index 358ddd0aee46..000000000000
--- a/media-libs/libquicktime/libquicktime-0.9.10.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.10.ebuild,v 1.18 2007/07/12 03:10:24 mr_bones_ Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-inherit libtool eutils autotools
-
-DESCRIPTION="A library based on quicktime4linux with extensions"
-HOMEPAGE="http://libquicktime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}-m4-1.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-
-IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg"
-
-RDEPEND="dv? ( media-libs/libdv )
-	gtk? ( >=x11-libs/gtk+-2.4.0 )
-	aac? (
-		media-libs/faad2
-		encode? ( media-libs/faac )
-	)
-	alsa? ( media-libs/alsa-lib )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	lame? ( media-sound/lame )
-	ffmpeg? ( media-video/ffmpeg )
-	x264? ( >=media-libs/x264-svn-20060810 )
-	X? ( x11-libs/libXaw
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libX11
-		opengl? ( media-libs/mesa )
-	)
-	!virtual/quicktime"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/videoproto
-		x11-proto/xextproto
-	)
-	dev-util/pkgconfig"
-
-PROVIDE="virtual/quicktime"
-
-pkg_setup() {
-	if has_version '=x11-base/xorg-x11-6*' && ! built_with_use x11-base/xorg-x11 xv; then
-		die "You need xv support to compile ${PN}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-x264.patch"
-	epatch "${FILESDIR}/${P}-automagic-deps.patch"
-	epatch "${FILESDIR}/${P}-opengl-link.patch"
-	epatch "${FILESDIR}/${P}-cflags.patch"
-
-	cp ${WORKDIR}/m4/* m4/
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	local MY_OPTS=""
-	if use !encode || use !aac; then
-		MY_OPTS="--without-faac"
-	fi
-
-	econf --enable-shared \
-		--enable-static \
-		--enable-gpl \
-		$(use_enable mmx) \
-		$(use_with X x) \
-		$(use_with gtk) \
-		$(use_with dv libdv) \
-		$(use_with alsa) \
-		$(use_with aac faad2) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use vorbis || echo "--without-vorbis") \
-		$(use_with lame) \
-		$(use_with x264) \
-		$(use_with ffmpeg) \
-		$(use_with opengl) \
-		${MY_OPTS} \
-		--without-cpuflags || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Compatibility with software that uses quicktime prefix, but
-	# don't do that when building for Darwin/MacOS
-	[[ ${CHOST} != *-darwin* ]] && \
-	dosym /usr/include/lqt /usr/include/quicktime
-}
-
-pkg_preinst() {
-	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
-		elog "For compatibility with other quicktime libraries, ${PN} was"
-		elog "going to create a /usr/include/quicktime symlink, but for some"
-		elog "reason that is a directory on your system."
-
-		if $(has_version =media-libs/libquicktime-0.9.4); then
-			elog "It seems this directory belongs to libquicktime-0.9.4."
-			elog "We'll delete that directory now."
-			rm -rvf /usr/include/quicktime
-		else
-			elog "Please check that is empty, and remove it, or submit a bug"
-			elog "telling us which package owns the directory."
-			die "/usr/include/quicktime is a directory."
-		fi
-	fi
-}
diff --git a/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild b/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
deleted file mode 100644
index 5b82aaff3593..000000000000
--- a/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-0.9.7-r1.ebuild,v 1.23 2007/07/22 08:53:22 drac Exp $
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit libtool eutils autotools
-
-DESCRIPTION="A library based on quicktime4linux with extensions"
-HOMEPAGE="http://libquicktime.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}-m4-1.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-
-IUSE="gtk jpeg mmx vorbis png dv ieee1394 X"
-
-RDEPEND="dv? ( media-libs/libdv )
-	gtk? ( >=x11-libs/gtk+-2.4.0 )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	vorbis? ( media-libs/libvorbis )
-	ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 )
-	X? ( x11-libs/libXaw x11-libs/libXv x11-proto/xextproto )
-	!virtual/quicktime"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4.0.5
-	dev-util/pkgconfig"
-
-PROVIDE="virtual/quicktime"
-
-pkg_setup() {
-	if has_version '=x11-base/xorg-x11-6*' && ! built_with_use x11-base/xorg-x11 xv; then
-		die "You need xv support to compile ${PN}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e "s:\(have_libavcodec=\)true:\1false:g" configure.ac
-	epatch "${FILESDIR}"/${P}-dv.patch
-	epatch "${FILESDIR}"/${P}-unrice.patch
-	cp "${WORKDIR}"/m4/* m4/
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-src_compile() {
-	econf --enable-shared \
-		--enable-static \
-		$(use_enable mmx) \
-		$(use_enable ieee1394 firewire) \
-		$(use_with dv libdv) \
-		$(use_with X x) \
-		--without-cpuflags || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-
-	# Compatibility with software that uses quicktime prefix, but
-	# don't do that when building for Darwin/MacOS
-	[[ ${CHOST} != *-darwin* ]] && \
-		dosym /usr/include/lqt /usr/include/quicktime
-}
-
-pkg_preinst() {
-	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
-		elog "For compatibility with other quicktime libraries, ${PN} was"
-		elog "going to create a /usr/include/quicktime symlink, but for some"
-		elog "reason that is a directory on your system."
-		if $(has_version =media-libs/libquicktime-0.9.4); then
-			elog "It seems this directory belongs to libquicktime-0.9.4."
-			elog "We'll delete that directory now."
-			rm -rvf /usr/include/quicktime
-	    else
-			elog "Please check that is empty, and remove it, or submit a bug"
-			elog "telling us which package owns the directory."
-			die "/usr/include/quicktime is a directory."
-	    fi
-	fi
-}
diff --git a/media-libs/libquicktime/libquicktime-1.0.0.ebuild b/media-libs/libquicktime/libquicktime-1.0.0.ebuild
deleted file mode 100644
index 5771b2c7d633..000000000000
--- a/media-libs/libquicktime/libquicktime-1.0.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.0.0.ebuild,v 1.4 2007/09/23 11:27:34 drac Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
-inherit libtool eutils autotools
-
-DESCRIPTION="A library based on quicktime4linux with extensions"
-HOMEPAGE="http://libquicktime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg"
-
-RDEPEND="dv? ( media-libs/libdv )
-	gtk? ( >=x11-libs/gtk+-2.4.0 )
-	aac? (
-		media-libs/faad2
-		encode? ( media-libs/faac )
-	)
-	alsa? ( media-libs/alsa-lib )
-	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	lame? ( media-sound/lame )
-	ffmpeg? ( media-video/ffmpeg )
-	x264? ( >=media-libs/x264-svn-20060810 )
-	X? ( x11-libs/libXaw
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libX11
-		opengl? ( media-libs/mesa )
-	)
-	!virtual/quicktime"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/videoproto
-		x11-proto/xextproto
-	)
-	dev-util/pkgconfig"
-
-PROVIDE="virtual/quicktime"
-
-pkg_setup() {
-	if has_version '=x11-base/xorg-x11-6*' && ! built_with_use x11-base/xorg-x11 xv; then
-		die "You need xv support to compile ${PN}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	epatch "${FILESDIR}"/${P}-gtk212.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	local MY_OPTS=""
-	if use !encode || use !aac; then
-		MY_OPTS="--without-faac"
-	fi
-
-	econf --enable-shared \
-		--enable-static \
-		--enable-gpl \
-		$(use_enable mmx) \
-		$(use_with X x) \
-		$(use_with gtk) \
-		$(use_with dv libdv) \
-		$(use_with alsa) \
-		$(use_with aac faad2) \
-		$(use_with png libpng) \
-		$(use_with jpeg libjpeg) \
-		$(use vorbis || echo "--without-vorbis") \
-		$(use_with lame) \
-		$(use_with x264) \
-		$(use_with ffmpeg) \
-		$(use_with opengl) \
-		${MY_OPTS} \
-		--without-cpuflags || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Compatibility with software that uses quicktime prefix, but
-	# don't do that when building for Darwin/MacOS
-	[[ ${CHOST} != *-darwin* ]] && \
-	dosym /usr/include/lqt /usr/include/quicktime
-}
-
-pkg_preinst() {
-	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
-		elog "For compatibility with other quicktime libraries, ${PN} was"
-		elog "going to create a /usr/include/quicktime symlink, but for some"
-		elog "reason that is a directory on your system."
-
-		if $(has_version =media-libs/libquicktime-0.9.4); then
-			elog "It seems this directory belongs to libquicktime-0.9.4."
-			elog "We'll delete that directory now."
-			rm -rvf /usr/include/quicktime
-		else
-			elog "Please check that is empty, and remove it, or submit a bug"
-			elog "telling us which package owns the directory."
-			die "/usr/include/quicktime is a directory."
-		fi
-	fi
-}