Depend on virtual/ffmpeg instead of media-video/ffmpeg. Drop older.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

12 files changed, 12 insertions, 1256 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index b771295d37c3..b83150d66fc7 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.39 2011/03/23 16:44:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.40 2011/03/26 14:58:11 scarabeus Exp $
+
+  26 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/gegl-0.0.18-newffmpeg.diff, -gegl-0.0.20.ebuild, -gegl-0.1.0.ebuild,
+  -gegl-0.1.0-r1.ebuild, -files/gegl-0.1.0-GLIB_CFLAGS.patch,
+  -gegl-0.1.2.ebuild, -files/gegl-0.1.2-backtrace.patch,
+  -files/gegl-0.1.2-buffer-overflow.patch, gegl-0.1.6.ebuild,
+  -files/gegl-18-configure-ac.patch, -files/gegl-20-configure-ac.patch:
+  Depend on virtual/ffmpeg instead of media-video/ffmpeg. Drop older.
 
   23 Mar 2011; Gilles Dartiguelongue <eva@gentoo.org> gegl-0.1.0.ebuild,
   gegl-0.1.0-r1.ebuild, gegl-0.1.2.ebuild, gegl-0.1.6.ebuild:
diff --git a/media-libs/gegl/files/gegl-0.0.18-newffmpeg.diff b/media-libs/gegl/files/gegl-0.0.18-newffmpeg.diff
deleted file mode 100644
index ca364ea63971..000000000000
--- a/media-libs/gegl/files/gegl-0.0.18-newffmpeg.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gegl-0.0.18/operations/external/ff-load.c gegl-0.0.18-1/operations/external/ff-load.c
---- gegl-0.0.18/operations/external/ff-load.c	2008-06-14 18:40:04.000000000 +0200
-+++ gegl-0.0.18-1/operations/external/ff-load.c	2008-06-26 14:45:14.000000000 +0200
-@@ -27,7 +27,7 @@
- 
- #include "gegl-chant.h"
- #include <errno.h>
--#include <ffmpeg/avformat.h>
-+#include <libavformat/avformat.h>
- 
- typedef struct
- {
-diff -Naur gegl-0.0.18/operations/workshop/external/ff-save.c gegl-0.0.18-1/operations/workshop/external/ff-save.c
---- gegl-0.0.18/operations/workshop/external/ff-save.c	2008-06-14 18:40:04.000000000 +0200
-+++ gegl-0.0.18-1/operations/workshop/external/ff-save.c	2008-06-26 14:45:03.000000000 +0200
-@@ -27,7 +27,7 @@
- #define GEGL_CHANT_C_FILE       "ff-save.c"
- 
- #include "gegl-chant.h"
--#include "ffmpeg/avformat.h"
-+#include "libavformat/avformat.h"
- 
- typedef struct
- {
diff --git a/media-libs/gegl/files/gegl-0.1.0-GLIB_CFLAGS.patch b/media-libs/gegl/files/gegl-0.1.0-GLIB_CFLAGS.patch
deleted file mode 100644
index e5d03e549b52..000000000000
--- a/media-libs/gegl/files/gegl-0.1.0-GLIB_CFLAGS.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b5e6f4f1f9c5038050387898581884fe73b7dc0f Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Fri, 03 Jul 2009 13:04:12 +0000
-Subject: Bug 587684 – building gegl fails in operations/workshop/external
-
-Add $(GLIB_CFLAGS), $(BABL_CFLAGS) where missing
----
-diff --git a/operations/workshop/external/Makefile.am b/operations/workshop/external/Makefile.am
-index 5a3b85b..075427a 100644
---- a/operations/workshop/external/Makefile.am
-+++ b/operations/workshop/external/Makefile.am
-@@ -7,7 +7,7 @@ ops =
- if HAVE_CAIRO
- line_profile_la_SOURCES = line-profile.c
- line_profile_la_LIBADD = $(op_libs) $(CAIRO_LIBS) $(PANGO_LIBS)
--line_profile_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(BABL_CFLAGS)
-+line_profile_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
- ops += line_profile.la
- endif
- 
-@@ -15,21 +15,21 @@ if HAVE_GTK
- ops += gtk_display.la
- gtk_display_la_SOURCES = gtk-display.c
- gtk_display_la_LIBADD  = $(op_libs) $(GTK_LIBS)
--gtk_display_la_CFLAGS  = $(GTK_CFLAGS) $(BABL_CFLAGS)
-+gtk_display_la_CFLAGS  = $(GTK_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
- endif
- 
- if HAVE_AVFORMAT
- ops += ff_save.la
- ff_save_la_SOURCES = ff-save.c
- ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS) -lswscale
--ff_save_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS)
-+ff_save_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(GLIB_CFLAGS)
- endif
- 
- if HAVE_LUA
- ops += gluas.la
- gluas_la_SOURCES = gluas.c
- gluas_la_LIBADD  = $(op_libs) $(LUA_LIBS)
--gluas_la_CFLAGS  = $(LUA_CFLAGS)
-+gluas_la_CFLAGS  = $(LUA_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
- endif
- 
- opdir = $(libdir)/gegl-@GEGL_API_VERSION@
---
-cgit v0.8.2
diff --git a/media-libs/gegl/files/gegl-0.1.2-backtrace.patch b/media-libs/gegl/files/gegl-0.1.2-backtrace.patch
deleted file mode 100644
index 2bf041fd111b..000000000000
--- a/media-libs/gegl/files/gegl-0.1.2-backtrace.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Not all platforms have backtrace() facility, such as Darwin <=10.4 and
-Solaris.
-
-See also
-https://trac.macports.org/browser/trunk/dports/graphics/gegl/files/patch-gegl-buffer-gegl-buffer.c.diff?rev=71233
-
-This patch uses a configure check to disable it based on existance of
-execinfo.h instead of hardcoded knowledge about the target platforms.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631183
-
---- gegl-0.1.2/configure.ac
-+++ gegl-0.1.2/configure.ac
-@@ -986,6 +986,7 @@
- 
- AM_CONDITIONAL(ENABLE_WORKSHOP, test "x$enable_workshop" = "xyes")
- 
-+AC_CHECK_HEADERS([execinfo.h])
- 
- dnl bin/node-editors/Makefile
- AC_OUTPUT([
---- gegl-0.1.2/gegl/buffer/gegl-buffer.c
-+++ gegl-0.1.2/gegl/buffer/gegl-buffer.c
-@@ -80,7 +80,7 @@
- /* #define GEGL_BUFFER_DEBUG_ALLOCATIONS to print allocation stack
-  * traces for leaked GeglBuffers using GNU C libs backtrace_symbols()
-  */
--#ifndef G_OS_WIN32
-+#ifdef HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
- 
-@@ -876,8 +876,8 @@
- gegl_buffer_get_alloc_stack (void)
- {
-   char  *result         = NULL;
--#ifdef G_OS_WIN32
--  result = g_strdup ("backtrack not available on win32\n");
-+#ifndef HAVE_EXECINFO_H
-+  result = g_strdup ("backtrack not available for this platform\n");
- #else
-   void  *functions[MAX_N_FUNCTIONS];
-   int    n_functions    = 0;
diff --git a/media-libs/gegl/files/gegl-0.1.2-buffer-overflow.patch b/media-libs/gegl/files/gegl-0.1.2-buffer-overflow.patch
deleted file mode 100644
index ee0ed47f545d..000000000000
--- a/media-libs/gegl/files/gegl-0.1.2-buffer-overflow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/319789
-http://git.gnome.org/browse/gegl/commit/?id=e287b94c8cb078db86d883395bd089002b405e18
-
---- a/gegl/buffer/gegl-buffer-save.c
-+++ b/gegl/buffer/gegl-buffer-save.c
-@@ -196,7 +196,7 @@ gegl_buffer_header_init (GeglBufferHeader *header,
-                          gint              bpp,
-                          Babl*             format)
- {
--  strcpy (header->magic, "GEGL");
-+  memcpy (header->magic, "GEGL", 4);
- 
-   header->flags = GEGL_FLAG_HEADER;
-   header->tile_width  = tile_width;
diff --git a/media-libs/gegl/files/gegl-18-configure-ac.patch b/media-libs/gegl/files/gegl-18-configure-ac.patch
deleted file mode 100644
index 20750dd78c87..000000000000
--- a/media-libs/gegl/files/gegl-18-configure-ac.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-diff -Naur gegl-0.0.18.orig/configure.ac gegl-0.0.18/configure.ac
---- gegl-0.0.18.orig/configure.ac	2008-10-03 01:02:53.000000000 +0400
-+++ gegl-0.0.18/configure.ac	2008-10-03 01:03:42.000000000 +0400
-@@ -438,23 +438,33 @@
-         *** Errors follow:
-             $DEP_PKG_ERRORS]))
- 
--PKG_CHECK_MODULES(GIO, gio-2.0, 
--	have_gio="yes"
--	AC_DEFINE(HAVE_GIO, 1, [Define to 1 to compile with gio support.])
--	GLIB_PACKAGES="$GLIB_PACKAGES gio-2.0",
--	have_gio="no (gio not found)")
-+AC_ARG_WITH(gio, [  --without-gio           build without GIO (from glib) support])
-+  if test x$with_gio != xno; then
-+    PKG_CHECK_MODULES(GIO, gio-2.0, 
-+      have_gio="yes"
-+      AC_DEFINE(HAVE_GIO, 1, [Define to 1 to compile with gio support.])
-+      GLIB_PACKAGES="$GLIB_PACKAGES gio-2.0",
-+      have_gio="no  (gio not found)")
-+  else
-+    have_gio="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_GIO, test "x$have_gio" = "xyes")
- 
- # Rerun PKG_CONFIG to add gthread-2.0 cflags and libs
- DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
- DEP_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES gthread-2.0`
- 
--PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION,
--  have_gtk="yes"
--  AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
--  GTK_CFLAGS="$GTK_CFLAGS"
--  GTK_LIBS="$GTK_LIBS",
--  have_gtk="no  (gtk+ not found)")
-+AC_ARG_WITH(gtk, [  --without-gtk           build without GTK+ support])
-+if test "x$with_gtk" != "xno"; then
-+  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION,
-+    have_gtk="yes"
-+    AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
-+    GTK_CFLAGS="$GTK_CFLAGS"
-+    GTK_LIBS="$GTK_LIBS",
-+    have_gtk="no  (gtk+ not found)")
-+else
-+  have_gtk="no  (disabled by flag)"
-+fi
- AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
- 
- AC_SUBST(GTK_CFLAGS)
-@@ -523,11 +533,16 @@
- # Check for Lua
- ###############
- 
--PKG_CHECK_MODULES(LUA, lua >= $LUA_REQUIRED_VERSION,
--  have_lua="yes",
--  [PKG_CHECK_MODULES(LUA, lua5.1 >= $LUA_REQUIRED_VERSION,
--     have_lua="yes",
--     have_lua="no  (usable lua not found)")])
-+AC_ARG_WITH(lua, [  --without-lua           build without Lua support])
-+  if test x$with_lua != xno; then
-+    PKG_CHECK_MODULES(LUA, lua >= $LUA_REQUIRED_VERSION,
-+      have_lua="yes",
-+      [PKG_CHECK_MODULES(LUA, lua5.1 >= $LUA_REQUIRED_VERSION,
-+         have_lua="yes",
-+         have_lua="no  (usable lua not found)")])
-+  else
-+    have_lua="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_LUA, test "x$have_lua" = "xyes")
- 
- AC_SUBST(LUA_CFLAGS) 
-@@ -538,17 +553,22 @@
- # Checks for Ruby used to make API docs
- #######################################
- 
--AC_CHECK_PROG(RUBY, ruby, yes, no)
--if test "$RUBY" = "no"; then
--  AC_MSG_WARN([
-+AC_ARG_WITH(ruby, [  --without-ruby          build without Ruby support])
-+  if test x$with_ruby != xno; then
-+    AC_CHECK_PROG(RUBY, ruby, yes, no)
-+    if test "$RUBY" = "no"; then
-+      AC_MSG_WARN([
- *** Could not find Ruby interpreter. The HTML API reference
- will not be updated.
- ])
--  have_ruby=no
--else
--  RUBY_BIN="$RUBY"
--  have_ruby=yes
--fi
-+      have_ruby=no
-+    else
-+      RUBY_BIN="$RUBY"
-+      have_ruby=yes
-+    fi
-+  else
-+    have_ruby="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_RUBY, test "x$have_ruby" = "xyes")
- 
- AC_SUBST(RUBY_BIN)
-@@ -558,9 +578,14 @@
- # Check for Cairo
- #################
- 
--PKG_CHECK_MODULES(CAIRO, cairo,
--  have_cairo="yes",
--  have_cairo="no  (usable cairo not found)")
-+AC_ARG_WITH(cairo, [  --without-cairo         build without Cairo and without pangocairo])
-+  if test x$with_cairo != xno; then
-+    PKG_CHECK_MODULES(CAIRO, cairo,
-+      have_cairo="yes",
-+      have_cairo="no  (usable cairo not found)")
-+  else
-+    have_cairo="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_CAIRO, test "x$have_cairo" = "xyes")
- 
- AC_SUBST(CAIRO_CFLAGS) 
-@@ -571,14 +596,23 @@
- # Checks for Pango stuff
- ########################
- 
--PKG_CHECK_MODULES(PANGO, pango,
--  have_pango="yes",
--  have_pango="no  (usable pango not found)")
-+AC_ARG_WITH(pango, [  --without-pango         build without Pango and without pangocairo])
-+  if test x$with_pango != xno; then
-+    PKG_CHECK_MODULES(PANGO, pango,
-+      have_pango="yes",
-+      have_pango="no  (usable pango not found)")
-+  else
-+    have_pango="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
- 
--PKG_CHECK_MODULES(PANGOCAIRO, pangocairo,
--  have_pangocairo="yes",
--  have_pangocairo="no  (usable pangocairo not found)")
-+if test x$with_pango != xno && test x$with_cairo != xno; then
-+  PKG_CHECK_MODULES(PANGOCAIRO, pangocairo,
-+    have_pangocairo="yes",
-+    have_pangocairo="no  (usable pangocairo not found)")
-+else
-+  have_pangocairo="no  (disabled by flag)"
-+fi
- AM_CONDITIONAL(HAVE_PANGOCAIRO, test "x$have_pangocairo" = "xyes")
- 
- AC_SUBST(PANGO_CFLAGS) 
-@@ -591,9 +625,14 @@
- # Check for gdk-pixbuf
- ######################
- 
--PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version,
--  have_gdk_pixbuf="yes",
--  have_gdk_pixbuf="no  (gdk-pixbuf not found)")
-+AC_ARG_WITH(gdkpixbuf, [  --without-gdkpixbuf     build without GDKPixbuf support])
-+  if test x$with_gdkpixbuf != xno; then
-+    PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version,
-+      have_gdk_pixbuf="yes",
-+      have_gdk_pixbuf="no  (gdk-pixbuf not found)")
-+  else
-+    have_gdk_pixbuf="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "x$have_gdk_pixbuf" = "xyes")
- 
- 
-@@ -626,6 +665,10 @@
-         jpeg_ok="no  (JPEG header file not found)"
-       fi
-     fi
-+  else
-+    if test x$with_libjpeg == xno; then
-+      jpeg_ok="no  (disabled by flag)"
-+    fi
-   fi
- 
-   if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
-@@ -640,9 +683,14 @@
- # Check for libpng
- ##################
- 
--PKG_CHECK_MODULES(PNG, libpng,
--  have_libpng="yes",
--  have_libpng="no  (usable libpng not found)")
-+AC_ARG_WITH(libpng, [  --without-libpng        build without PNG support])
-+  if test x$with_libpng != xno; then
-+    PKG_CHECK_MODULES(PNG, libpng,
-+      have_libpng="yes",
-+      have_libpng="no  (usable libpng not found)")
-+  else
-+    have_libpng="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = "xyes")
- 
- AC_SUBST(PNG_CFLAGS) 
-@@ -653,9 +701,14 @@
- # Check for librsvg
- ###################
- 
--PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= librsvg_required_version,
--  have_librsvg="yes",
--  have_librsvg="no  (usable librsvg not found)")
-+AC_ARG_WITH(librsvg, [  --without-librsvg       build without SVG support])
-+  if test x$with_librsvg != xno; then
-+    PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= librsvg_required_version,
-+      have_librsvg="yes",
-+      have_librsvg="no  (usable librsvg not found)")
-+  else
-+    have_librsvg="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_RSVG, test "x$have_librsvg" = "xyes")
- 
- AC_SUBST(RSVG_CFLAGS) 
-@@ -666,9 +719,14 @@
- # Check for OpenEXR
- ###################
- 
--PKG_CHECK_MODULES(OPENEXR, OpenEXR,
--  have_openexr="yes",
--  have_openexr="no  (usable OpenEXR not found)")
-+AC_ARG_WITH(openexr, [  --without-openexr       build without OpenEXR])
-+  if test x$with_openexr != xno; then
-+    PKG_CHECK_MODULES(OPENEXR, OpenEXR,
-+      have_openexr="yes",
-+      have_openexr="no  (usable OpenEXR not found)")
-+  else
-+    have_openexr="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_OPENEXR, test "x$have_openexr" = "xyes")
- 
- AC_SUBST(OPENEXR_CFLAGS) 
-@@ -679,16 +737,21 @@
- # Check for SDL
- ###############
- 
--dnl check for SDL
--AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
--if test "$SDL_CONFIG" = "no"; then
--  have_sdl="no  (usable libsdl not found)"
--  AC_MSG_RESULT([*** Check for SDL library failed.])
--else
--  have_sdl="yes"
--  SDL_CFLAGS=`$SDL_CONFIG --cflags`
--  SDL_LIBS=`$SDL_CONFIG --libs`
--fi
-+AC_ARG_WITH(libsdl, [  --without-libsdl        build without SDL support])
-+  if test x$with_libsdl != xno; then
-+    dnl check for SDL
-+    AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
-+    if test "$SDL_CONFIG" = "no"; then
-+      have_sdl="no  (usable libsdl not found)"
-+      AC_MSG_RESULT([*** Check for SDL library failed.])
-+    else
-+      have_sdl="yes"
-+      SDL_CFLAGS=`$SDL_CONFIG --cflags`
-+      SDL_LIBS=`$SDL_CONFIG --libs`
-+    fi
-+  else
-+    have_sdl="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_SDL, test "x$have_sdl" = "xyes")
- 
- AC_SUBST(SDL_CFLAGS)
-@@ -699,13 +762,18 @@
- # Check for graphviz
- ####################
-  
--AC_PATH_PROG(GRAPHVIZ, dot, no)
--if test "$GRAPHVIZ" = "no"; then
--  have_graphviz="no  (graphviz not found)"
--  AC_MSG_RESULT([*** Check for dot command from graphviz failed.])
--else
--  have_graphviz="yes"
--fi
-+AC_ARG_WITH(graphviz, [  --without-graphviz      build without graphviz support])
-+  if test x$with_graphviz != xno; then
-+    AC_PATH_PROG(GRAPHVIZ, dot, no)
-+    if test "$GRAPHVIZ" = "no"; then
-+      have_graphviz="no  (graphviz not found)"
-+      AC_MSG_RESULT([*** Check for dot command from graphviz failed.])
-+    else
-+      have_graphviz="yes"
-+    fi
-+  else
-+    have_graphviz="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_GRAPHVIZ, test "x$have_graphviz" = "xyes")
- 
- 
-@@ -713,13 +781,18 @@
- # Check for enscript
- ####################
-  
--AC_PATH_PROG(ENSCRIPT, enscript, no)
--if test "$ENSCRIPT" = "no"; then
--  have_enscript="no  (enscript not found)"
--  AC_MSG_RESULT([*** Check for enscript command failed.])
--else
--  have_enscript="yes"
--fi
-+AC_ARG_WITH(enscript, [  --without-enscript      build without enscript support])
-+  if test x$with_enscript != xno; then
-+    AC_PATH_PROG(ENSCRIPT, enscript, no)
-+    if test "$ENSCRIPT" = "no"; then
-+      have_enscript="no  (enscript not found)"
-+      AC_MSG_RESULT([*** Check for enscript command failed.])
-+    else
-+      have_enscript="yes"
-+    fi
-+  else
-+    have_enscript="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_ENSCRIPT, test "x$have_enscript" = "xyes")
- 
- 
-@@ -727,13 +800,18 @@
- # Check for asciidoc
- ####################
-  
--AC_PATH_PROG(ASCIIDOC, asciidoc, no)
--if test "$ASCIIDOC" = "no"; then
--  have_asciidoc="no  (asciidoc not found)"
--  AC_MSG_RESULT([*** Check for asciidoc failed.])
--else
--  have_asciidoc="yes"
--fi
-+AC_ARG_WITH(asciidoc, [  --without-asciidoc      build without asciidoc support])
-+  if test x$with_asciidoc != xno; then
-+    AC_PATH_PROG(ASCIIDOC, asciidoc, no)
-+    if test "$ASCIIDOC" = "no"; then
-+      have_asciidoc="no  (asciidoc not found)"
-+      AC_MSG_RESULT([*** Check for asciidoc failed.])
-+    else
-+      have_asciidoc="yes"
-+    fi
-+  else
-+    have_asciidoc="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_ASCIIDOC, test "x$have_asciidoc" = "xyes")
- 
- 
-@@ -741,14 +819,24 @@
- # Check for avcodec and avformat libraries
- ##########################################
- 
--PKG_CHECK_MODULES(AVCODEC, libavcodec,
--  have_libavcodec="yes",
--  have_libavcodec="no  (usable libavcodec not found)")
-+AC_ARG_WITH(libavcodec, [  --without-libavcodec    build without avcodec support])
-+  if test x$with_libavcodec != xno; then
-+    PKG_CHECK_MODULES(AVCODEC, libavcodec,
-+      have_libavcodec="yes",
-+      have_libavcodec="no  (usable libavcodec not found)")
-+  else
-+    have_libavcodec="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_AVCODEC, test "x$have_libavcodec" = "xyes")
-  
--PKG_CHECK_MODULES(AVFORMAT, libavformat,
--  have_libavformat="yes",
--  have_libavformat="no  (usable libavformat not found)")
-+AC_ARG_WITH(libavformat, [  --without-libavformat   build without avformat support])
-+  if test x$with_libavformat != xno; then
-+    PKG_CHECK_MODULES(AVFORMAT, libavformat,
-+      have_libavformat="yes",
-+      have_libavformat="no  (usable libavformat not found)")
-+  else
-+    have_libavformat="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_AVFORMAT, test "x$have_libavformat" = "xyes")
- 
- AC_SUBST(AVCODEC_CFLAGS) 
-@@ -761,9 +849,13 @@
- # Check for V4L
- ###############
-  
--have_v4l=no
--AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes)
--
-+AC_ARG_WITH(v4l, [  --without-v4l           build without video4linux support])
-+  if test x$with_v4l != xno; then
-+    have_v4l=no
-+    AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes)
-+  else
-+    have_v4l="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_V4L, test "x$have_v4l" = "xyes")
- 
- 
-@@ -871,3 +963,5 @@
-   avformat:       $have_libavformat
-   V4L:            $have_v4l
- ]);
-+
-+# vim:ts=2:et:sw=2
diff --git a/media-libs/gegl/files/gegl-20-configure-ac.patch b/media-libs/gegl/files/gegl-20-configure-ac.patch
deleted file mode 100644
index 1a8358cf7458..000000000000
--- a/media-libs/gegl/files/gegl-20-configure-ac.patch
+++ /dev/null
@@ -1,423 +0,0 @@
---- configure.ac.orig	2008-10-05 23:10:15.000000000 +0200
-+++ configure.ac	2008-10-10 00:46:24.000000000 +0200
-@@ -50,6 +50,7 @@
- m4_define([openexr_required_version], [0.0.0])
- m4_define([sdl_required_version], [0.0.0])
- m4_define([graphviz_required_version], [0.0.0])
-+m4_define([libopenraw_required_version], [0.0.5])
- 
- AC_INIT(gegl, gegl_major_version.gegl_minor_version.gegl_micro_version)
- AC_CONFIG_SRCDIR([gegl/gegl.h.in])
-@@ -453,23 +454,33 @@
-         *** Errors follow:
-             $DEP_PKG_ERRORS]))
- 
--PKG_CHECK_MODULES(GIO, gio-2.0, 
--	have_gio="yes"
--	AC_DEFINE(HAVE_GIO, 1, [Define to 1 to compile with gio support.])
--	GLIB_PACKAGES="$GLIB_PACKAGES gio-2.0",
--	have_gio="no (gio not found)")
-+AC_ARG_WITH(gio, [  --without-gio           build without GIO (from glib) support])
-+  if test x$with_gio != xno; then
-+    PKG_CHECK_MODULES(GIO, gio-2.0, 
-+      have_gio="yes"
-+      AC_DEFINE(HAVE_GIO, 1, [Define to 1 to compile with gio support.])
-+      GLIB_PACKAGES="$GLIB_PACKAGES gio-2.0",
-+      have_gio="no  (gio not found)")
-+  else
-+    have_gio="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_GIO, test "x$have_gio" = "xyes")
- 
- # Rerun PKG_CONFIG to add gthread-2.0 cflags and libs
- DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0`
- DEP_LIBS=`$PKG_CONFIG --libs $GLIB_PACKAGES gthread-2.0`
- 
--PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION,
--  have_gtk="yes"
--  AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
--  GTK_CFLAGS="$GTK_CFLAGS"
--  GTK_LIBS="$GTK_LIBS",
--  have_gtk="no  (gtk+ not found)")
-+AC_ARG_WITH(gtk, [  --without-gtk           build without GTK+ support])
-+if test "x$with_gtk" != "xno"; then
-+  PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION,
-+    have_gtk="yes"
-+    AC_DEFINE(HAVE_GTK, 1, [Define to 1 to compile with gtk support.])
-+    GTK_CFLAGS="$GTK_CFLAGS"
-+    GTK_LIBS="$GTK_LIBS",
-+    have_gtk="no  (gtk+ not found)")
-+else
-+  have_gtk="no  (disabled by flag)"
-+fi
- AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
- 
- AC_SUBST(GTK_CFLAGS)
-@@ -538,11 +549,16 @@
- # Check for Lua
- ###############
- 
--PKG_CHECK_MODULES(LUA, lua >= $LUA_REQUIRED_VERSION,
--  have_lua="yes",
--  [PKG_CHECK_MODULES(LUA, lua5.1 >= $LUA_REQUIRED_VERSION,
--     have_lua="yes",
--     have_lua="no  (usable lua not found)")])
-+AC_ARG_WITH(lua, [  --without-lua           build without Lua support])
-+  if test x$with_lua != xno; then
-+    PKG_CHECK_MODULES(LUA, lua >= $LUA_REQUIRED_VERSION,
-+      have_lua="yes",
-+      [PKG_CHECK_MODULES(LUA, lua5.1 >= $LUA_REQUIRED_VERSION,
-+         have_lua="yes",
-+         have_lua="no  (usable lua not found)")])
-+  else
-+    have_lua="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_LUA, test "x$have_lua" = "xyes")
- 
- AC_SUBST(LUA_CFLAGS) 
-@@ -553,17 +569,22 @@
- # Checks for Ruby used to make API docs
- #######################################
- 
--AC_CHECK_PROG(RUBY, ruby, yes, no)
--if test "$RUBY" = "no"; then
--  AC_MSG_WARN([
-+AC_ARG_WITH(ruby, [  --without-ruby          build without Ruby support])
-+  if test x$with_ruby != xno; then
-+    AC_CHECK_PROG(RUBY, ruby, yes, no)
-+    if test "$RUBY" = "no"; then
-+      AC_MSG_WARN([
- *** Could not find Ruby interpreter. The HTML API reference
- will not be updated.
- ])
--  have_ruby=no
--else
--  RUBY_BIN="$RUBY"
--  have_ruby=yes
--fi
-+      have_ruby=no
-+    else
-+      RUBY_BIN="$RUBY"
-+      have_ruby=yes
-+    fi
-+  else
-+    have_ruby="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_RUBY, test "x$have_ruby" = "xyes")
- 
- AC_SUBST(RUBY_BIN)
-@@ -573,9 +594,14 @@
- # Check for Cairo
- #################
- 
--PKG_CHECK_MODULES(CAIRO, cairo,
--  have_cairo="yes",
--  have_cairo="no  (usable cairo not found)")
-+AC_ARG_WITH(cairo, [  --without-cairo         build without Cairo and without pangocairo])
-+  if test x$with_cairo != xno; then
-+    PKG_CHECK_MODULES(CAIRO, cairo,
-+      have_cairo="yes",
-+      have_cairo="no  (usable cairo not found)")
-+  else
-+    have_cairo="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_CAIRO, test "x$have_cairo" = "xyes")
- 
- AC_SUBST(CAIRO_CFLAGS) 
-@@ -586,14 +612,23 @@
- # Checks for Pango stuff
- ########################
- 
--PKG_CHECK_MODULES(PANGO, pango,
--  have_pango="yes",
--  have_pango="no  (usable pango not found)")
-+AC_ARG_WITH(pango, [  --without-pango         build without Pango and without pangocairo])
-+  if test x$with_pango != xno; then
-+    PKG_CHECK_MODULES(PANGO, pango,
-+      have_pango="yes",
-+      have_pango="no  (usable pango not found)")
-+  else
-+    have_pango="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
- 
--PKG_CHECK_MODULES(PANGOCAIRO, pangocairo,
--  have_pangocairo="yes",
--  have_pangocairo="no  (usable pangocairo not found)")
-+if test x$with_pango != xno && test x$with_cairo != xno; then
-+  PKG_CHECK_MODULES(PANGOCAIRO, pangocairo,
-+    have_pangocairo="yes",
-+    have_pangocairo="no  (usable pangocairo not found)")
-+else
-+  have_pangocairo="no  (disabled by flag)"
-+fi
- AM_CONDITIONAL(HAVE_PANGOCAIRO, test "x$have_pangocairo" = "xyes")
- 
- AC_SUBST(PANGO_CFLAGS) 
-@@ -606,9 +641,14 @@
- # Check for gdk-pixbuf
- ######################
- 
--PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version,
--  have_gdk_pixbuf="yes",
--  have_gdk_pixbuf="no  (gdk-pixbuf not found)")
-+AC_ARG_WITH(gdkpixbuf, [  --without-gdkpixbuf     build without GDKPixbuf support])
-+  if test x$with_gdkpixbuf != xno; then
-+    PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gtk_required_version,
-+      have_gdk_pixbuf="yes",
-+      have_gdk_pixbuf="no  (gdk-pixbuf not found)")
-+  else
-+    have_gdk_pixbuf="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_GDK_PIXBUF, test "x$have_gdk_pixbuf" = "xyes")
- 
- 
-@@ -641,6 +681,10 @@
-         jpeg_ok="no  (JPEG header file not found)"
-       fi
-     fi
-+  else
-+    if test x$with_libjpeg == xno; then
-+      jpeg_ok="no  (disabled by flag)"
-+    fi
-   fi
- 
-   if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
-@@ -655,9 +699,14 @@
- # Check for libpng
- ##################
- 
--PKG_CHECK_MODULES(PNG, libpng,
--  have_libpng="yes",
--  have_libpng="no  (usable libpng not found)")
-+AC_ARG_WITH(libpng, [  --without-libpng        build without PNG support])
-+  if test x$with_libpng != xno; then
-+    PKG_CHECK_MODULES(PNG, libpng,
-+      have_libpng="yes",
-+      have_libpng="no  (usable libpng not found)")
-+  else
-+    have_libpng="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = "xyes")
- 
- AC_SUBST(PNG_CFLAGS) 
-@@ -668,9 +717,14 @@
- # Check for librsvg
- ###################
- 
--PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= librsvg_required_version,
--  have_librsvg="yes",
--  have_librsvg="no  (usable librsvg not found)")
-+AC_ARG_WITH(librsvg, [  --without-librsvg       build without SVG support])
-+  if test x$with_librsvg != xno; then
-+    PKG_CHECK_MODULES(RSVG, librsvg-2.0 >= librsvg_required_version,
-+      have_librsvg="yes",
-+      have_librsvg="no  (usable librsvg not found)")
-+  else
-+    have_librsvg="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_RSVG, test "x$have_librsvg" = "xyes")
- 
- AC_SUBST(RSVG_CFLAGS) 
-@@ -681,9 +735,14 @@
- # Check for OpenEXR
- ###################
- 
--PKG_CHECK_MODULES(OPENEXR, OpenEXR,
--  have_openexr="yes",
--  have_openexr="no  (usable OpenEXR not found)")
-+AC_ARG_WITH(openexr, [  --without-openexr       build without OpenEXR])
-+  if test x$with_openexr != xno; then
-+    PKG_CHECK_MODULES(OPENEXR, OpenEXR,
-+      have_openexr="yes",
-+      have_openexr="no  (usable OpenEXR not found)")
-+  else
-+    have_openexr="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_OPENEXR, test "x$have_openexr" = "xyes")
- 
- AC_SUBST(OPENEXR_CFLAGS) 
-@@ -694,16 +753,21 @@
- # Check for SDL
- ###############
- 
--dnl check for SDL
--AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
--if test "$SDL_CONFIG" = "no"; then
--  have_sdl="no  (usable libsdl not found)"
--  AC_MSG_RESULT([*** Check for SDL library failed.])
--else
--  have_sdl="yes"
--  SDL_CFLAGS=`$SDL_CONFIG --cflags`
--  SDL_LIBS=`$SDL_CONFIG --libs`
--fi
-+AC_ARG_WITH(libsdl, [  --without-libsdl        build without SDL support])
-+  if test x$with_libsdl != xno; then
-+    dnl check for SDL
-+    AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
-+    if test "$SDL_CONFIG" = "no"; then
-+      have_sdl="no  (usable libsdl not found)"
-+      AC_MSG_RESULT([*** Check for SDL library failed.])
-+    else
-+      have_sdl="yes"
-+      SDL_CFLAGS=`$SDL_CONFIG --cflags`
-+      SDL_LIBS=`$SDL_CONFIG --libs`
-+    fi
-+  else
-+    have_sdl="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_SDL, test "x$have_sdl" = "xyes")
- 
- AC_SUBST(SDL_CFLAGS)
-@@ -714,10 +778,15 @@
- # Check for libopenraw
- ####################
- 
--dnl check for libopenraw
--PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0,
--  have_openraw="yes",
--  have_openraw="no (usable libopenraw not found)")
-+AC_ARG_WITH(libopenraw, [  --without-libopenraw        build without libopenraw support])
-+  if test x$with_libopenraw != xno; then
-+    dnl check for libopenraw
-+    PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= libopenraw,
-+      have_openraw="yes",
-+      have_openraw="no  (usable libopenraw not found)")
-+    else
-+      have_openraw="no  (disabled by flag)"
-+    fi
- AM_CONDITIONAL(HAVE_OPENRAW, test "x$have_openraw" = "xyes")
- 
- AC_SUBST(OPENRAW_CFLAGS) 
-@@ -728,13 +797,18 @@
- # Check for graphviz
- ####################
-  
--AC_PATH_PROG(GRAPHVIZ, dot, no)
--if test "$GRAPHVIZ" = "no"; then
--  have_graphviz="no  (graphviz not found)"
--  AC_MSG_RESULT([*** Check for dot command from graphviz failed.])
--else
--  have_graphviz="yes"
--fi
-+AC_ARG_WITH(graphviz, [  --without-graphviz      build without graphviz support])
-+  if test x$with_graphviz != xno; then
-+    AC_PATH_PROG(GRAPHVIZ, dot, no)
-+    if test "$GRAPHVIZ" = "no"; then
-+      have_graphviz="no  (graphviz not found)"
-+      AC_MSG_RESULT([*** Check for dot command from graphviz failed.])
-+    else
-+      have_graphviz="yes"
-+    fi
-+  else
-+    have_graphviz="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_GRAPHVIZ, test "x$have_graphviz" = "xyes")
- 
- 
-@@ -742,13 +816,18 @@
- # Check for enscript
- ####################
-  
--AC_PATH_PROG(ENSCRIPT, enscript, no)
--if test "$ENSCRIPT" = "no"; then
--  have_enscript="no  (enscript not found)"
--  AC_MSG_RESULT([*** Check for enscript command failed.])
--else
--  have_enscript="yes"
--fi
-+AC_ARG_WITH(enscript, [  --without-enscript      build without enscript support])
-+  if test x$with_enscript != xno; then
-+    AC_PATH_PROG(ENSCRIPT, enscript, no)
-+    if test "$ENSCRIPT" = "no"; then
-+      have_enscript="no  (enscript not found)"
-+      AC_MSG_RESULT([*** Check for enscript command failed.])
-+    else
-+      have_enscript="yes"
-+    fi
-+  else
-+    have_enscript="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_ENSCRIPT, test "x$have_enscript" = "xyes")
- 
- 
-@@ -756,13 +835,18 @@
- # Check for asciidoc
- ####################
-  
--AC_PATH_PROG(ASCIIDOC, asciidoc, no)
--if test "$ASCIIDOC" = "no"; then
--  have_asciidoc="no  (asciidoc not found)"
--  AC_MSG_RESULT([*** Check for asciidoc failed.])
--else
--  have_asciidoc="yes"
--fi
-+AC_ARG_WITH(asciidoc, [  --without-asciidoc      build without asciidoc support])
-+  if test x$with_asciidoc != xno; then
-+    AC_PATH_PROG(ASCIIDOC, asciidoc, no)
-+    if test "$ASCIIDOC" = "no"; then
-+      have_asciidoc="no  (asciidoc not found)"
-+      AC_MSG_RESULT([*** Check for asciidoc failed.])
-+    else
-+      have_asciidoc="yes"
-+    fi
-+  else
-+    have_asciidoc="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_ASCIIDOC, test "x$have_asciidoc" = "xyes")
- 
- 
-@@ -770,14 +854,24 @@
- # Check for avcodec and avformat libraries
- ##########################################
- 
--PKG_CHECK_MODULES(AVCODEC, libavcodec,
--  have_libavcodec="yes",
--  have_libavcodec="no  (usable libavcodec not found)")
-+AC_ARG_WITH(libavcodec, [  --without-libavcodec    build without avcodec support])
-+  if test x$with_libavcodec != xno; then
-+    PKG_CHECK_MODULES(AVCODEC, libavcodec,
-+      have_libavcodec="yes",
-+      have_libavcodec="no  (usable libavcodec not found)")
-+  else
-+    have_libavcodec="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_AVCODEC, test "x$have_libavcodec" = "xyes")
-  
--PKG_CHECK_MODULES(AVFORMAT, libavformat,
--  have_libavformat="yes",
--  have_libavformat="no  (usable libavformat not found)")
-+AC_ARG_WITH(libavformat, [  --without-libavformat   build without avformat support])
-+  if test x$with_libavformat != xno; then
-+    PKG_CHECK_MODULES(AVFORMAT, libavformat,
-+      have_libavformat="yes",
-+      have_libavformat="no  (usable libavformat not found)")
-+  else
-+    have_libavformat="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_AVFORMAT, test "x$have_libavformat" = "xyes")
- 
- AC_SUBST(AVCODEC_CFLAGS) 
-@@ -790,9 +884,13 @@
- # Check for V4L
- ###############
-  
--have_v4l=no
--AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes)
--
-+AC_ARG_WITH(v4l, [  --without-v4l           build without video4linux support])
-+  if test x$with_v4l != xno; then
-+    have_v4l=no
-+    AC_CHECK_HEADER(linux/videodev.h, have_v4l=yes)
-+  else
-+    have_v4l="no  (disabled by flag)"
-+  fi
- AM_CONDITIONAL(HAVE_V4L, test "x$have_v4l" = "xyes")
- 
- 
-@@ -901,3 +999,5 @@
-   avformat:       $have_libavformat
-   V4L:            $have_v4l
- ]);
-+
-+# vim:ts=2:et:sw=2
diff --git a/media-libs/gegl/gegl-0.0.20.ebuild b/media-libs/gegl/gegl-0.0.20.ebuild
deleted file mode 100644
index 9e645e3c675b..000000000000
--- a/media-libs/gegl/gegl-0.0.20.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.0.20.ebuild,v 1.16 2010/11/07 19:44:30 anarchy Exp $
-
-WANT_AUTOCONF=latest
-
-inherit eutils autotools
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-SRC_URI="ftp://ftp.gimp.org/pub/${PN}/0.0/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-IUSE="cairo debug doc ffmpeg jpeg mmx openexr png raw sdl sse svg v4l"
-
-DEPEND=">=media-libs/babl-0.0.20
-	>=dev-libs/glib-2.18.0
-	media-libs/libpng
-	>=x11-libs/gtk+-2.14.0
-	x11-libs/pango
-	cairo? ( x11-libs/cairo )
-	doc? ( app-text/asciidoc
-		dev-lang/ruby
-		>=dev-lang/lua-5.1.0
-		app-text/enscript
-		media-gfx/graphviz
-		media-gfx/imagemagick )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
-	jpeg? ( virtual/jpeg )
-	openexr? ( media-libs/openexr )
-	raw? ( >=media-libs/libopenraw-0.0.5 )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14.0 )"
-
-pkg_setup() {
-	if use doc && ! built_with_use 'media-gfx/imagemagick' 'png'; then
-		eerror "You must build imagemagick with png support"
-		die "media-gfx/imagemagick built without png"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	#HACK!GACK!HACK!
-	#Interface name changed, we change with it.
-	if has_version '>=media-video/ffmpeg-0.4.9_p20081014'
-	then
-		sed -i \
-			-e 's:p->enc->error_resilience:p->enc->error_recognition:' \
-			operations/external/ff-load.c || die "404"
-	fi
-
-	epatch "${FILESDIR}/gegl-20-configure-ac.patch" || die
-	epatch "${FILESDIR}/gegl-0.0.18-newffmpeg.diff" || die
-
-	eautoreconf
-}
-
-src_compile() {
-	econf --enable-gtk --enable-pango --enable-gdkpixbuf \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with v4l) \
-		$(use_enable doc docs) \
-		$(use_with doc asciidoc) \
-		$(use_with doc enscript) \
-		$(use_with doc graphviz) \
-		$(use_with doc lua) \
-		$(use_with doc ruby) \
-		$(use_enable doc workshop) \
-		$(use_with ffmpeg libavcodec) \
-		$(use_with ffmpeg libavformat) \
-		$(use_with jpeg libjpeg) \
-		$(use_enable mmx) \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl libsdl) \
-		$(use_with svg librsvg) \
-		$(use_enable sse) \
-		|| die "econf failed"
-	env GEGL_SWAP="${WORKDIR}" emake || die "emake failed"
-}
-
-src_install() {
-	# emake install doesn't install anything
-	einstall || die "einstall failed"
-	find "${D}" -name '*.la' -delete
-	dodoc ChangeLog INSTALL README NEWS || die "dodoc failed"
-
-	# don't know why einstall omits this?!
-	insinto "/usr/include/${PN}-0.0/${PN}/buffer/"
-	doins "${WORKDIR}/${P}/${PN}"/buffer/*.h || die "doins buffer failed"
-	insinto "/usr/include/${PN}-0.0/${PN}/module/"
-	doins "${WORKDIR}/${P}/${PN}"/module/*.h || die "doins module failed"
-}
diff --git a/media-libs/gegl/gegl-0.1.0-r1.ebuild b/media-libs/gegl/gegl-0.1.0-r1.ebuild
deleted file mode 100644
index 0489ad018696..000000000000
--- a/media-libs/gegl/gegl-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.0-r1.ebuild,v 1.3 2011/03/23 16:44:53 eva Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="cairo debug doc ffmpeg jpeg mmx openexr png raw sdl sse svg v4l"
-
-DEPEND=">=media-libs/babl-0.1.0
-	>=dev-libs/glib-2.18.0:2
-	media-libs/libpng
-	>=x11-libs/gtk+-2.14.0:2
-	x11-libs/pango
-	cairo? ( x11-libs/cairo )
-	doc? ( app-text/asciidoc
-		dev-lang/ruby
-		>=dev-lang/lua-5.1.0
-		app-text/enscript
-		media-gfx/graphviz
-		media-gfx/imagemagick[png] )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
-	jpeg? ( virtual/jpeg )
-	openexr? ( media-libs/openexr )
-	raw? ( >=media-libs/libopenraw-0.0.5 )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14.0:2 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Fix operations/workshop/external CFLAGS, bug #283444
-	epatch "${FILESDIR}/${P}-GLIB_CFLAGS.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-gtk --with-pango --with-gdk-pixbuf \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		$(use_with v4l libv4l) \
-		$(use_enable doc docs) \
-		$(use_with doc graphviz) \
-		$(use_with doc lua) \
-		$(use_enable doc workshop) \
-		$(use_with ffmpeg libavformat) \
-		$(use_with jpeg libjpeg) \
-		$(use_enable mmx) \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_enable sse)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${D}" -name '*.la' -delete
-	dodoc ChangeLog INSTALL README NEWS || die "dodoc failed"
-}
diff --git a/media-libs/gegl/gegl-0.1.0.ebuild b/media-libs/gegl/gegl-0.1.0.ebuild
deleted file mode 100644
index fc84e7753aa1..000000000000
--- a/media-libs/gegl/gegl-0.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.0.ebuild,v 1.3 2011/03/23 16:44:53 eva Exp $
-
-EAPI="2"
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="cairo debug doc ffmpeg jpeg mmx openexr png raw sdl sse svg v4l"
-
-DEPEND=">=media-libs/babl-0.1.0
-	>=dev-libs/glib-2.18.0:2
-	media-libs/libpng
-	>=x11-libs/gtk+-2.14.0:2
-	x11-libs/pango
-	cairo? ( x11-libs/cairo )
-	doc? ( app-text/asciidoc
-		dev-lang/ruby
-		>=dev-lang/lua-5.1.0
-		app-text/enscript
-		media-gfx/graphviz
-		media-gfx/imagemagick[png] )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
-	jpeg? ( virtual/jpeg )
-	openexr? ( media-libs/openexr )
-	raw? ( >=media-libs/libopenraw-0.0.5 )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14.0:2 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf --with-gtk --with-pango --with-gdk-pixbuf \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		$(use_with v4l libv4l) \
-		$(use_enable doc docs) \
-		$(use_with doc graphviz) \
-		$(use_with doc lua) \
-		$(use_enable doc workshop) \
-		$(use_with ffmpeg libavformat) \
-		$(use_with jpeg libjpeg) \
-		$(use_enable mmx) \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_enable sse)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${D}" -name '*.la' -delete
-	dodoc ChangeLog INSTALL README NEWS || die "dodoc failed"
-}
diff --git a/media-libs/gegl/gegl-0.1.2.ebuild b/media-libs/gegl/gegl-0.1.2.ebuild
deleted file mode 100644
index 633013ff4dfb..000000000000
--- a/media-libs/gegl/gegl-0.1.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.2.ebuild,v 1.7 2011/03/23 16:44:53 eva Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-IUSE="cairo debug doc ffmpeg jpeg mmx openexr png raw sdl sse svg v4l"
-
-DEPEND=">=media-libs/babl-0.1.2
-	>=dev-libs/glib-2.22.0:2
-	media-libs/libpng
-	>=x11-libs/gtk+-2.18.0:2
-	x11-libs/pango
-	cairo? ( x11-libs/cairo )
-	doc? ( app-text/asciidoc
-		dev-lang/ruby
-		>=dev-lang/lua-5.1.0
-		app-text/enscript
-		media-gfx/graphviz
-		media-gfx/imagemagick[png] )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
-	jpeg? ( virtual/jpeg )
-	openexr? ( media-libs/openexr )
-	raw? ( >=media-libs/libopenraw-0.0.5 )
-	sdl? ( media-libs/libsdl )
-	svg? ( >=gnome-base/librsvg-2.14.0:2 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
-	epatch "${FILESDIR}"/${P}-backtrace.patch
-	# fix OSX loadable module filename extension
-	sed -i -e 's/\.dylib/.bundle/' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --with-gtk --with-pango --with-gdk-pixbuf \
-		$(use_enable debug) \
-		$(use_with cairo) \
-		$(use_with cairo pangocairo) \
-		$(use_with v4l libv4l) \
-		$(use_enable doc docs) \
-		$(use_with doc graphviz) \
-		$(use_with doc lua) \
-		$(use_enable doc workshop) \
-		$(use_with ffmpeg libavformat) \
-		$(use_with jpeg libjpeg) \
-		$(use_enable mmx) \
-		$(use_with openexr) \
-		$(use_with png libpng) \
-		$(use_with raw libopenraw) \
-		$(use_with sdl) \
-		$(use_with svg librsvg) \
-		$(use_enable sse)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${D}" -name '*.la' -delete
-	dodoc ChangeLog INSTALL README NEWS || die "dodoc failed"
-}
diff --git a/media-libs/gegl/gegl-0.1.6.ebuild b/media-libs/gegl/gegl-0.1.6.ebuild
index 342219481cd1..a25aafe520c1 100644
--- a/media-libs/gegl/gegl-0.1.6.ebuild
+++ b/media-libs/gegl/gegl-0.1.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.6.ebuild,v 1.4 2011/03/23 16:44:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.6.ebuild,v 1.5 2011/03/26 14:58:11 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 
 inherit eutils autotools
 
@@ -28,7 +28,7 @@ DEPEND=">=media-libs/babl-0.1.4
 		app-text/enscript
 		media-gfx/graphviz
 		|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagic[png] ) )
-	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	ffmpeg? ( virtual/ffmpeg )
 	jpeg? ( virtual/jpeg )
 	openexr? ( media-libs/openexr )
 	raw? ( >=media-libs/libopenraw-0.0.5 )