stable x86, bug #347676; cleanup; eapi=2

(Portage version: 2.1.9.24/cvs/Linux i686)

6 files changed, 17 insertions, 438 deletions

diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog
index c456df0e0a68..7c04614f3569 100644
--- a/media-plugins/vdr-image/ChangeLog
+++ b/media-plugins/vdr-image/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-image
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.31 2010/12/22 13:35:18 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.32 2011/01/03 21:58:14 hd_brummy Exp $
+
+  03 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-image-0.2.7.26-gentoo.diff, -files/vdr-image-0.2.7-gentoo.diff,
+  -files/vdr-image-0.2.7-new-ffmpeg.diff, vdr-image-0.3.0.ebuild,
+  -files/ffmpeg-0.4.9_p20080326-new_header.diff:
+  stable x86, bug #347676; cleanup; eapi=2
 
   22 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-image-0.3.0.ebuild:
diff --git a/media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff b/media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff
deleted file mode 100644
index 06033e552c79..000000000000
--- a/media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-new ffmpeg header structur
-https://bugs.gentoo.org/show_bug.cgi?id=214740
-Joerg Bornkessel <hd_brummy@gentoo.org> 29 Mar 2008
-diff -Naur image-0.2.7.orig/liboutput/encode.c image-0.2.7/liboutput/encode.c
---- image-0.2.7.orig/liboutput/encode.c	2008-03-29 14:56:45.000000000 +0100
-+++ image-0.2.7/liboutput/encode.c	2008-03-29 14:57:06.000000000 +0100
-@@ -31,7 +31,7 @@
- #ifdef FFMDIR
- #include <swscale.h>
- #else
--#include <ffmpeg/swscale.h>
-+#include <libswscale/swscale.h>
- #endif
- #endif
- }
-diff -Naur image-0.2.7.orig/liboutput/encode.h image-0.2.7/liboutput/encode.h
---- image-0.2.7.orig/liboutput/encode.h	2008-03-29 14:56:45.000000000 +0100
-+++ image-0.2.7/liboutput/encode.h	2008-03-29 14:57:21.000000000 +0100
-@@ -29,7 +29,7 @@
- #ifdef FFMDIR
- #include <avcodec.h>
- #else
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- #endif 
- }
- 
diff --git a/media-plugins/vdr-image/files/vdr-image-0.2.7-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.2.7-gentoo.diff
deleted file mode 100644
index 6f07df90090d..000000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.2.7-gentoo.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Naur image-0.2.5.orig/control-image.c image-0.2.5/control-image.c
---- image-0.2.5.orig/control-image.c	2006-03-06 13:53:36.131134750 +0100
-+++ image-0.2.5/control-image.c	2006-03-06 13:57:06.248266250 +0100
-@@ -617,7 +617,7 @@
-       return osContinue;
-       
-     // Load additional Commands
--    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "imagecmds.conf"));
-+    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "image/imagecmds.conf"));
-   
-     if(pCmd->Count() <= 0)  {
-       delete pCmd;
-diff -Naur image-0.2.5.orig/examples/imagecmds.conf image-0.2.5/examples/imagecmds.conf
---- image-0.2.5.orig/examples/imagecmds.conf	2006-03-06 13:53:36.131134750 +0100
-+++ image-0.2.5/examples/imagecmds.conf	2006-03-06 14:10:06.753044750 +0100
-@@ -20,3 +20,5 @@
- Rotate JPEG picture lossless by 90 degrees to the right  : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Rotate JPEG picture lossless by 90 degrees to the left   : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Delete picture                                          ?: rm -f %s
-+Change burn template                                     : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Change burn template (button)                            : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
-diff -Naur image-0.2.5.orig/examples/imagecmds.conf.DE image-0.2.5/examples/imagecmds.conf.DE
---- image-0.2.5.orig/examples/imagecmds.conf.DE	2006-03-06 13:53:36.131134750 +0100
-+++ image-0.2.5/examples/imagecmds.conf.DE	2006-03-06 14:09:52.112129750 +0100
-@@ -11,6 +11,8 @@
- Informationen über das Bild                              : identify -verbose
- Größe des Bildes                                         : du -chs %s
- Exif Informationen des JPEG-Bildes ausgeben              : jpegtopnm -dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat $CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp
--Rotatiere JPEG Bildes verlustlos um 90° nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
--Rotatiere JPEG Bildes verlustlos um 90° nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Rechts		 : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Links       	 : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Lösche Bild                                             ?: rm -f %s
-+Hintergrund vdr-burn ändern                              : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Button vdr-burn ändern                             		 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
-diff -Naur image-0.2.5.orig/image.c image-0.2.5/image.c
---- image-0.2.5.orig/image.c	2006-03-06 13:53:36.143135500 +0100
-+++ image-0.2.5/image.c	2006-03-06 13:57:59.203575750 +0100
-@@ -107,7 +107,7 @@
-     return false;
-   }
- 
--  ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory),  "imagesources.conf"));
-+  ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory),  "image/imagesources.conf"));
-   if(ImageSources.Count()<1) {
-     esyslog("imageplugin: you must have defined at least one source in imagesources.conf");
-     return false;
diff --git a/media-plugins/vdr-image/files/vdr-image-0.2.7-new-ffmpeg.diff b/media-plugins/vdr-image/files/vdr-image-0.2.7-new-ffmpeg.diff
deleted file mode 100644
index c4938ff93aa7..000000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.2.7-new-ffmpeg.diff
+++ /dev/null
@@ -1,309 +0,0 @@
-diff -ru image-0.2.7/data.h image-svn/data.h
---- image-0.2.7/data.h	2006-01-27 22:31:04.000000000 +0100
-+++ image-svn/data.h	2007-07-05 13:00:01.000000000 +0200
-@@ -42,6 +42,7 @@
- class cScanDir {
-   char *QuoteString(const char *str);
- protected:
-+  virtual ~cScanDir() {};
-   enum eScanType { stFile, stDir };
-   virtual void DoItem(cFileSource *src, const char *subdir, const char *name)=0;
- public:
-diff -ru image-0.2.7/exif.c image-svn/exif.c
---- image-0.2.7/exif.c	2006-05-30 19:41:21.000000000 +0200
-+++ image-svn/exif.c	2007-07-05 13:00:01.000000000 +0200
-@@ -1,7 +1,7 @@
- /*
-  * Image plugin to VDR (C++)
-  *
-- * (C) 2006 Andreas Brachold    <anbr at users.berlios.de>
-+ * (C) 2006-2007 Andreas Brachold    <anbr at users.berlios.de>
-  *
-  * This code is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-@@ -19,9 +19,11 @@
-  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
-  */
- 
-+extern "C" {
- #include <libexif/exif-data.h>
- #include <libexif/exif-ifd.h>
- #include <libexif/exif-loader.h>
-+}
- 
- #include <sstream>
- 
-diff -ru image-0.2.7/HISTORY image-svn/HISTORY
---- image-0.2.7/HISTORY	2007-01-02 14:56:07.000000000 +0100
-+++ image-svn/HISTORY	2007-07-05 13:00:01.000000000 +0200
-@@ -1,7 +1,11 @@
- VDR Plugin 'image' Revision History
- -----------------------------------
- 
--2006-01-02
-+2007-06-10
-+- for build now 'pkg-config' needed
-+- Use swscale to converting image (Thanks to Holger Brunn, for summit a patch)
-+
-+2007-01-02
- - Release Version 0.2.7
- 
- 2006-12-24
-diff -ru image-0.2.7/liboutput/encode.c image-svn/liboutput/encode.c
---- image-0.2.7/liboutput/encode.c	2006-12-24 13:04:16.000000000 +0100
-+++ image-svn/liboutput/encode.c	2007-07-05 12:59:57.000000000 +0200
-@@ -1,7 +1,7 @@
- /***************************************************************************
-  * encode.c
-  *
-- * (C) Copyright  2004-2006 Andreas Brachold    <anbr at users.berlios.de>
-+ * (C) Copyright  2004-2007 Andreas Brachold    <anbr at users.berlios.de>
-  *  Created: Thu Aug  5 2004
-  * 
-  ****************************************************************************/
-@@ -26,6 +26,16 @@
- #include <string.h>
- #include <stdlib.h>
- 
-+extern "C" {
-+#ifdef HAVE_SWSCALER
-+#ifdef FFMDIR
-+#include <swscale.h>
-+#else
-+#include <ffmpeg/swscale.h>
-+#endif
-+#endif
-+}
-+
- #include "encode.h"
- #include <vdr/device.h>
- #include <vdr/tools.h>
-@@ -190,11 +200,29 @@
-     }
-     else
-     {
--        if(img_convert((AVPicture*)frame->data, PIX_FMT_YUV420P, 
-+        int result;
-+#ifndef HAVE_SWSCALER
-+        result=img_convert((AVPicture*)frame->data, PIX_FMT_YUV420P, 
-                        (AVPicture*)m_pImageFilled, PIX_FMT_RGB24, 
--                        m_nWidth, m_nHeight))  
-+                       m_nWidth, m_nHeight);
-+#else
-+        SwsContext* convert_ctx = sws_getContext(m_nWidth, m_nHeight, 
-+                        PIX_FMT_RGB24, m_nWidth, m_nHeight, 
-+                        PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
-+
-+	    if(!convert_ctx) {
-+            esyslog("imageplugin: failed to initialize swscaler context");
-+            return false;
-+    	}
-+
-+	    result=sws_scale(convert_ctx, ((AVPicture*)m_pImageFilled)->data, 
-+                                      ((AVPicture*)m_pImageFilled)->linesize, 
-+                         0, m_nHeight, frame->data, frame->linesize);
-+	    sws_freeContext(convert_ctx);
-+#endif
-+        if(result < 0)
-         {
--            esyslog("imageplugin: failed convert RGB to YUV");
-+            esyslog("imageplugin: failed convert RGB to YUV: %X", result);
-             return false;
-         }
-     }
-diff -ru image-0.2.7/liboutput/encode.h image-svn/liboutput/encode.h
---- image-0.2.7/liboutput/encode.h	2006-01-11 20:23:30.000000000 +0100
-+++ image-svn/liboutput/encode.h	2007-07-05 12:59:57.000000000 +0200
-@@ -25,11 +25,13 @@
- #ifndef _ENCODE_H
- #define _ENCODE_H
- 
-+extern "C" {
- #ifdef FFMDIR
- #include <avcodec.h>
- #else
- #include <ffmpeg/avcodec.h>
- #endif 
-+}
- 
- #include "../setup-image.h"
- //#define TESTCODE
-diff -ru image-0.2.7/liboutput/Makefile image-svn/liboutput/Makefile
---- image-0.2.7/liboutput/Makefile	2006-01-29 17:04:05.000000000 +0100
-+++ image-svn/liboutput/Makefile	2007-07-05 12:59:57.000000000 +0200
-@@ -9,6 +9,7 @@
- 
- CXX      ?= g++
- CXXFLAGS ?= -O0 -g -Wall -Woverloaded-virtual
-+PKG-CONFIG ?= pkg-config
- 
- -include $(VDRDIR)/Make.config
- 
-@@ -18,14 +19,28 @@
- INCLUDES += -I$(VDRDIR)/include -I.
- ifdef FFMDIR
- INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
-+DEFINES += -DFFMDIR
-+ifndef WITHOUT_SWSCALER
-+  DEFINES += -DHAVE_SWSCALER
-+  INCLUDES += -I$(FFMDIR)/libswscale
-+endif
-+else
-+
-+ifndef WITHOUT_SWSCALER
-+  DEFINES += -DHAVE_SWSCALER
-+  PKG-INCLUDES += libswscale
-+endif
-+
-+  PKG-INCLUDES += libavcodec
- endif
- 
- DEFINES  += -D_GNU_SOURCE
- 
--ifdef FFMDIR
--DEFINES += -DFFMDIR
-+ifdef PKG-INCLUDES
-+INCLUDES += $(shell $(PKG-CONFIG) --cflags $(PKG-INCLUDES))
- endif
- 
-+
- ### The object files (add further files here):
- 
- OBJS = encode.o stillimage.o stillimage-player.o
-diff -ru image-0.2.7/LIESMICH image-svn/LIESMICH
---- image-0.2.7/LIESMICH	2006-01-28 08:06:34.000000000 +0100
-+++ image-svn/LIESMICH	2007-07-05 13:00:01.000000000 +0200
-@@ -22,7 +22,9 @@
- - das Plugin ist abhängig vom folgenden Paketen
-     + ffmpeg (getestet mit ffmpeg-0.4.8/ffmpeg-0.4.9pre1/ffmpeg-cvs)
-         http://ffmpeg.sourceforge.net
--    + libexif-0.6.13 (siehe unten, für Kompilieren ohne diese)
-+    + Zum Kompilieren wird 'pkg-config' benötigt
-+        http://pkgconfig.freedesktop.org/
-+    + libexif-0.6.13 ... 0.6.15 (siehe unten, für Kompilieren ohne diese)
-         http://libexif.sourceforge.net/
-     + zur Ausführung wird auch das Paket netpbm benötigt
-         http://netpbm.sourceforge.net/
-@@ -65,6 +67,11 @@
- 
-     $ make plugins FFMDIR=/usr/src/ffmpeg-cvs
- 
-+ Kompilieren ohne swscaler zur Bildconvertierung mittels ffmpeg
-+   (WITHOUT_SWSCALER=1 verwendet img_convert, notwendig für ältere Versionen von ffmpeg)
-+    
-+    $ make plugins WITHOUT_SWSCALER=1
-+
-  Kompilieren ohne libexif ¹)
-     
-     $ make plugins WITHOUT_LIBEXIF=1
-diff -ru image-0.2.7/Makefile image-svn/Makefile
---- image-0.2.7/Makefile	2006-08-27 15:51:11.000000000 +0200
-+++ image-svn/Makefile	2007-07-05 13:00:01.000000000 +0200
-@@ -1,7 +1,7 @@
- #
- # Makefile for Image plugin to VDR
- #
--# (C) 2004-2006 Andreas Brachold    <anbr at users.berlios.de>
-+# (C) 2004-2007 Andreas Brachold    <anbr at users.berlios.de>
- #
- # This code is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License
-@@ -31,6 +31,7 @@
- 
- CXX      ?= g++
- CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
-+PKG-CONFIG ?= pkg-config
- 
- ###############################################
- ###############################################
-@@ -86,26 +87,38 @@
- INCLUDES += -I$(VDRDIR)/include -I.
- 
- ifdef FFMDIR
--INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
--LIBS += -L$(FFMDIR)/libavcodec
-+DEFINES += -DFFMDIR
-+LIBS += -L$(FFMDIR)/libavcodec -lavcodec -lz
- ifeq ($(LIBAVCODECVERSION),51)
- LIBS += -L$(FFMDIR)/libavformat -L$(FFMDIR)/libavutil
- LIBS += -lavformat -lavutil
- endif
-+ifndef WITHOUT_SWSCALER
-+  DEFINES += -DHAVE_SWSCALER
-+  LIBS += -L$(FFMDIR)/libswscale -lswscale
-+endif
-+else
-+  PKG-LIBS += libavcodec
-+ifndef WITHOUT_SWSCALER
-+  PKG-LIBS += libswscale
- endif
--
--LIBS += -lavcodec
--LIBS += -lz
--
--ifdef FFMDIR
--DEFINES += -DFFMDIR
- endif
- 
- ifndef WITHOUT_LIBEXIF
--  LIBS    += -lexif
-+  PKG-INCLUDES += libexif
-+  PKG-LIBS += libexif
-   DEFINES += -DHAVE_LIBEXIF
- endif
- 
-+
-+ifdef PKG-INCLUDES
-+INCLUDES += $(shell $(PKG-CONFIG) --cflags $(PKG-INCLUDES))
-+endif
-+
-+ifdef PKG-LIBS
-+LIBS    += $(shell $(PKG-CONFIG) --libs $(PKG-LIBS))
-+endif
-+
- ### The object files (add further files here):
- 
- OBJS = ${PLUGIN}.o i18n.o data.o menu.o data-image.o menu-image.o \
-@@ -166,8 +179,7 @@
- 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
- 	@echo Distribution package created as $(PACKAGE).tar.gz
- 
--clean:
--	@-rm -f $(OBJS) $(DEPFILE) *.so *.tar.gz core* *~ contrib/*~  examples/*~ scripts/*~
-+subdirs-clean:
- 	@for i in $(SUBDIRS) ;\
- 	do \
- 	    ( cd $$i;\
-@@ -175,3 +187,6 @@
-        ) \
- 	|| exit 1;\
- 	done
-+
-+clean: subdirs-clean
-+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tar.gz core* *~ contrib/*~  examples/*~ scripts/*~
-diff -ru image-0.2.7/README image-svn/README
---- image-0.2.7/README	2006-01-14 12:07:29.000000000 +0100
-+++ image-svn/README	2007-07-05 13:00:01.000000000 +0200
-@@ -22,7 +22,9 @@
- - plugin depends follow packages
-     + ffmpeg (tested with ffmpeg-0.4.8/ffmpeg-0.4.9pre1/ffmpeg-cvs)
-         http://ffmpeg.sourceforge.net
--    + libexif-0.6.13 (see below for build without this)
-+    + for build you need 'pkg-config'
-+        http://pkgconfig.freedesktop.org/
-+    + libexif-0.6.13 ... 0.6.15 (see below for build without this)
-         http://libexif.sourceforge.net/
-     + for running your will need also package netpbm
-         http://netpbm.sourceforge.net/
-@@ -65,6 +67,11 @@
- 
-     $ make plugins FFMDIR=/usr/src/ffmpeg-cvs
- 
-+ compile without swscaler to convert images via ffmpeg
-+   (WITHOUT_SWSCALER=1 use img_convert, needed for older versions from ffmpeg)
-+    
-+    $ make plugins WITHOUT_SWSCALER=1
-+
-  compile without libexif ¹)
-     
-     $ make plugins WITHOUT_LIBEXIF=1
diff --git a/media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff
deleted file mode 100644
index 76e1e13ac00e..000000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur image-0.2.7.26.orig/control-image.c image-0.2.7.26/control-image.c
---- image-0.2.7.26.orig/control-image.c	2008-10-25 23:48:18.000000000 +0200
-+++ image-0.2.7.26/control-image.c	2008-10-25 23:49:01.000000000 +0200
-@@ -606,7 +606,7 @@
-       return osContinue;
-       
-     // Load additional Commands
--    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "imagecmds.conf"));
-+    pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "image/imagecmds.conf"));
-   
-     if(pCmd->Count() <= 0)  {
-       delete pCmd;
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf image-0.2.7.26/examples/imagecmds.conf
---- image-0.2.7.26.orig/examples/imagecmds.conf	2008-10-25 23:48:18.000000000 +0200
-+++ image-0.2.7.26/examples/imagecmds.conf	2008-10-25 23:50:53.000000000 +0200
-@@ -20,3 +20,5 @@
- Rotate JPEG picture lossless by 90 degrees to the right  : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Rotate JPEG picture lossless by 90 degrees to the left   : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Delete picture                                          ?: rm -f %s
-+Change burn template									 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Change burn template ( Button )							 : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
-\ Kein Zeilenumbruch am Dateiende.
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf.DE image-0.2.7.26/examples/imagecmds.conf.DE
---- image-0.2.7.26.orig/examples/imagecmds.conf.DE	2008-10-25 23:48:18.000000000 +0200
-+++ image-0.2.7.26/examples/imagecmds.conf.DE	2008-10-25 23:55:49.000000000 +0200
-@@ -11,6 +11,8 @@
- Informationen über das Bild                              : identify -verbose
- Größe des Bildes                                         : du -chs %s
- Exif Informationen des JPEG-Bildes ausgeben              : jpegtopnm -dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat $CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp
--Rotatiere JPEG Bildes verlustlos um 90° nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
--Rotatiere JPEG Bildes verlustlos um 90° nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Rechts      : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Links       : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Lösche Bild                                             ?: rm -f %s
-+Hintergrund vdr-burn ändern								: echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Button vdr-burn ändern								: echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
-diff -Naur image-0.2.7.26.orig/image.c image-0.2.7.26/image.c
---- image-0.2.7.26.orig/image.c	2008-10-25 23:48:18.000000000 +0200
-+++ image-0.2.7.26/image.c	2008-10-25 23:53:43.000000000 +0200
-@@ -102,7 +102,7 @@
-     return false;
-   }
-   
--  cString szConfSource = AddDirectory(ConfigDirectory(g_szConfigDirectory),  "imagesources.conf");
-+  cString szConfSource = AddDirectory(ConfigDirectory(g_szConfigDirectory),  "image/imagesources.conf");
-   ImageSources.Load(szConfSource);
-   if(ImageSources.Count()<1) {
-     const char* sz = szConfSource;
diff --git a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild b/media-plugins/vdr-image/vdr-image-0.3.0.ebuild
index c504b6f591ff..202bd69fa0e1 100644
--- a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild
+++ b/media-plugins/vdr-image/vdr-image-0.3.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.0.ebuild,v 1.5 2010/12/22 13:35:18 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.0.ebuild,v 1.6 2011/01/03 21:58:14 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin eutils flag-o-matic
 
@@ -8,7 +10,7 @@ DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp"
 HOMEPAGE="http://vdr-image.berlios.de/"
 SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="exif"
@@ -27,15 +29,17 @@ RDEPEND="${COMMON_DEPEND}
 VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh"
 BUILD_PARAMS="-j1"
 
-src_unpack() {
-	vdr-plugin_src_unpack
+src_prepare() {
+	vdr-plugin_src_prepare
 
 	epatch "${FILESDIR}/${P}-gentoo.diff"
 
 	use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
+
 	if has_version "<=media-video/ffmpeg-0.4.9_p20061016"; then
 		BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1"
 	fi
+
 	# UINT64_C is needed by ffmpeg headers
 	append-flags -D__STDC_CONSTANT_MACROS
 }