version bump; cleanup; some cosmetic

(Portage version: 2.1.6.7/cvs/Linux i686)

7 files changed, 262 insertions, 332 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index a6c8bab1d0c9..0f10aae38054 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-graphtft
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.12 2009/02/24 18:05:21 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.13 2009/03/24 18:02:58 hd_brummy Exp $
+
+*vdr-graphtft-0.2.2 (24 Mar 2009)
+
+  24 Mar 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-graphtft-0.1.18_alpha-gentoo.diff,
+  +files/vdr-graphtft-0.2.2_gentoo.diff, -vdr-graphtft-0.1.18_alpha.ebuild,
+  -vdr-graphtft-0.1.21_alpha.ebuild, vdr-graphtft-0.1.21_alpha-r1.ebuild,
+  +vdr-graphtft-0.2.2.ebuild:
+  version bump; cleanup; some cosmetic
 
   24 Feb 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-graphtft-0.1.21_alpha.ebuild, vdr-graphtft-0.1.21_alpha-r1.ebuild:
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-gentoo.diff
deleted file mode 100644
index c3ed929ba3a6..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-gentoo.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -Naur graphtft-0.1.16.alpha.orig/dfbrenderer/dfbrenderer.c graphtft-0.1.16.alpha/dfbrenderer/dfbrenderer.c
---- graphtft-0.1.16.alpha.orig/dfbrenderer/dfbrenderer.c	2007-12-12 20:15:39.223026383 +0100
-+++ graphtft-0.1.16.alpha/dfbrenderer/dfbrenderer.c	2007-12-12 20:17:01.430709769 +0100
-@@ -333,7 +333,7 @@
-       else
-       {
-          const char* tmp = themePath.c_str();
--         asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+         asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-       }
- 
-       tell(4,"creating imageprovider for %s\n", fpath);
-@@ -383,7 +383,7 @@
- 
-    if (!fontCache.Contains(FontFaceSize(fontName, fontSize)))
-    {
--      asprintf(&fpath, "%s/graphTFT/fonts/%s.ttf", confPath.c_str(), fontName);
-+      asprintf(&fpath, "%s/fonts/%s.ttf", confPath.c_str(), fontName);
- 
-       tell(4,"creating font for %s\n", fpath);
- 
-@@ -444,7 +444,7 @@
- 
-    if (!fontCache.Contains(FontFaceSize(font_name, size)))
-    {
--      asprintf(&fpath, "%s/graphTFT/fonts/%s.ttf", confPath.c_str(), font_name);
-+      asprintf(&fpath, "%s/fonts/%s.ttf", confPath.c_str(), font_name);
- 
-       tell(4,"creating font for %s\n", fpath);
- 
-diff -Naur graphtft-0.1.16.alpha.orig/graphtft.c graphtft-0.1.16.alpha/graphtft.c
---- graphtft-0.1.16.alpha.orig/graphtft.c	2007-12-12 20:15:39.246358112 +0100
-+++ graphtft-0.1.16.alpha/graphtft.c	2007-12-12 20:19:52.292300174 +0100
-@@ -20,6 +20,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -255,14 +257,7 @@
- 
- #endif
- 
--   // try to get the config dir
--
--   if (!ConfigDirectory())
--      return false;
--
--   // init 
--
--   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
-+   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
- 
- #if APIVERSNUM < 10507
-    RegisterI18n(Phrases);
-@@ -278,7 +273,7 @@
-    if (loadThemes() != 0)
-       return false;
- 
--   return display->Init(_dev, ConfigDirectory(), port);
-+   return display->Init(_dev, DATA_DIR, port);
- }
- 
- //***************************************************************************
-@@ -294,8 +289,8 @@
- 
-    // look for the themes in the config directory
- 
--   asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
--            ConfigDirectory());
-+   asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", 
-+            DATA_DIR);
- 
-    p = popen(buffer, "r");
- 
-diff -Naur graphtft-0.1.16.alpha.orig/imlibrenderer/imlibrenderer.c graphtft-0.1.16.alpha/imlibrenderer/imlibrenderer.c
---- graphtft-0.1.16.alpha.orig/imlibrenderer/imlibrenderer.c	2007-12-12 20:15:39.369682970 +0100
-+++ graphtft-0.1.16.alpha/imlibrenderer/imlibrenderer.c	2007-12-12 20:20:35.006031224 +0100
-@@ -53,7 +53,7 @@
-  
-    // font
- 
--   std::ostringstream path; path <<  confPath.c_str() << "/graphTFT/fonts/";
-+   std::ostringstream path; path <<  confPath.c_str() << "/fonts/";
-    imlib_add_path_to_font_path(path.str().c_str());
-   
-    // new image
-@@ -134,7 +134,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    new_image = imlib_load_image(path.str().c_str());
- 
-diff -Naur graphtft-0.1.18.alpha.orig/dspitems.c graphtft-0.1.18.alpha/dspitems.c
---- graphtft-0.1.18.alpha.orig/dspitems.c	2008-04-13 20:04:45.855102424 +0200
-+++ graphtft-0.1.18.alpha/dspitems.c	2008-04-13 20:05:41.912312127 +0200
-@@ -697,7 +697,7 @@
-       if (p[0] != '/')
-       {
-          p = string(GraphTFTSetup.PluginConfPath) 
--            + "/graphTFT/themes/" 
-+            + "/themes/" 
-             + string(theTheme->getDir()) 
-             + "/" + p;
-       }
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff
new file mode 100644
index 000000000000..b747b70b01ca
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2_gentoo.diff
@@ -0,0 +1,139 @@
+# fix some path for gentoo install ( LFH conform )
+# Joerg Bornkessel <hd_brummy@g.o> 24 Mar 2009
+
+diff -Naur graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c graphtft-0.2.2/dfbrenderer/dfbrenderer.c
+--- graphtft-0.2.2.orig/dfbrenderer/dfbrenderer.c	2009-03-24 18:15:02.000000000 +0100
++++ graphtft-0.2.2/dfbrenderer/dfbrenderer.c	2009-03-24 18:17:04.000000000 +0100
+@@ -231,7 +231,7 @@
+       {
+          // make path relative to the themes directory
+ 
+-         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
++         asprintf(&path, "%s/themes/%s/%s", 
+                   confPath.c_str(), themePath.c_str(), p.c_str());
+       }
+       else
+@@ -255,7 +255,7 @@
+    
+    // at least add the default path
+ 
+-   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
++   asprintf(&path, "%s/fonts/", confPath.c_str());
+    tell(0, "Info: Adding font path '%s'", path);
+    fontPaths[count] = path;
+    free(path);
+@@ -464,7 +464,7 @@
+    else
+    {
+       const char* tmp = themePath.c_str();
+-      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
++      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
+    }
+ 
+    tell(4,"creating imageprovider for %s\n", fpath);
+@@ -538,7 +538,7 @@
+    else
+    {
+       const char* tmp = themePath.c_str();
+-      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
++      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
+    }
+ 
+    tell(4,"creating imageprovider for %s\n", fpath);
+diff -Naur graphtft-0.2.2.orig/dspitems.c graphtft-0.2.2/dspitems.c
+--- graphtft-0.2.2.orig/dspitems.c	2009-03-24 18:15:02.000000000 +0100
++++ graphtft-0.2.2/dspitems.c	2009-03-24 18:18:06.000000000 +0100
+@@ -108,7 +108,7 @@
+       if (p[0] != '/')
+       {
+          p = string(GraphTFTSetup.PluginConfPath) 
+-            + "/graphTFT/themes/" 
++            + "/themes/" 
+             + string(Thms::theTheme->getDir()) 
+             + "/" + p;
+       }
+diff -Naur graphtft-0.2.2.orig/graphtft.c graphtft-0.2.2/graphtft.c
+--- graphtft-0.2.2.orig/graphtft.c	2009-03-24 18:15:02.000000000 +0100
++++ graphtft-0.2.2/graphtft.c	2009-03-24 18:20:06.000000000 +0100
+@@ -21,6 +21,8 @@
+ #include <graphtft.h>
+ #include <span.h>
+ 
++#define DATA_DIR "/usr/share/vdr/graphTFT"
++
+ //***************************************************************************
+ // cGraphTFTMenu
+ //***************************************************************************
+@@ -261,14 +263,7 @@
+ 
+ #endif
+ 
+-   // try to get the config dir
+-
+-   if (!ConfigDirectory())
+-      return false;
+-
+-   // init 
+-
+-   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
++   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
+ 
+ #if APIVERSNUM < 10507
+    RegisterI18n(Phrases);
+@@ -284,7 +279,7 @@
+    if (loadThemes() != 0)
+       return false;
+ 
+-   if (display->Init(_dev, ConfigDirectory(), port) != success)
++   if (display->Init(_dev, DATA_DIR, port) != success)
+    {
+       tell(0, "Error: Initializing graphTFT device faild, aborting!");
+ 
+@@ -308,7 +303,7 @@
+    // look for the themes in the config directory
+ 
+    asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
+-            ConfigDirectory());
++            DATA_DIR);
+ 
+    p = popen(buffer, "r");
+ 
+diff -Naur graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c graphtft-0.2.2/imlibrenderer/imlibrenderer.c
+--- graphtft-0.2.2.orig/imlibrenderer/imlibrenderer.c	2009-03-24 18:15:02.000000000 +0100
++++ graphtft-0.2.2/imlibrenderer/imlibrenderer.c	2009-03-24 18:21:03.000000000 +0100
+@@ -107,7 +107,7 @@
+       {
+          // make path relative to the themes directory
+ 
+-         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
++         asprintf(&path, "%s/themes/%s/%s", 
+                   confPath.c_str(), themePath.c_str(), p.c_str());
+       }
+       else
+@@ -130,7 +130,7 @@
+    
+    // at least add the default path
+ 
+-   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
++   asprintf(&path, "%s/fonts/", confPath.c_str());
+    tell(0, "Info: Adding font path '%s'", path);
+    imlib_add_path_to_font_path(path);
+    free(path);
+@@ -201,7 +201,7 @@
+    if (fname[0] == '/')
+       path << fname;
+    else
+-      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
++      path << confPath << "/themes/" << themePath << "/" << fname; 
+ 
+    if (!fileExists(path.str().c_str()))
+    { 
+@@ -273,7 +273,7 @@
+    if (fname[0] == '/')
+       path << fname;
+    else
+-      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
++      path << confPath << "/themes/" << themePath << "/" << fname; 
+ 
+    if (!fileExists(path.str().c_str()))
+    { 
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild
deleted file mode 100644
index 195802862803..000000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild,v 1.5 2008/08/10 18:26:55 hd_brummy Exp $
-
-EAPI=1
-
-MY_PV="${PV/_alpha/.alpha}"
-MY_P="${PN}-${MY_PV}"
-
-inherit vdr-plugin qt4
-
-DESCRIPTION="VDR plugin: GraphTFT"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://www.jwendel.de/vdr/${MY_P}.tar.bz2
-		http://www.jwendel.de/vdr/DeepBlue-horchi-0.0.6.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-IUSE="directfb graphtft-fe"
-
-DEPEND=">=media-video/vdr-1.4.7-r9
-		media-fonts/ttf-bitstream-vera
-		media-libs/imlib2
-		media-gfx/imagemagick
-		gnome-base/libgtop
-		>=media-video/ffmpeg-0.4.8
-		directfb? ( dev-libs/DirectFB )
-		graphtft-fe? ( =x11-libs/qt-4.3*:4 )"
-
-PATCHES=("${FILESDIR}/${P}-gentoo.diff"
-		"${FILESDIR}/gcc-4.3-missing_includes.diff")
-
-S="${WORKDIR}/graphtft-${MY_PV}"
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! built_with_use media-video/vdr graphtft; then
-		echo
-		eerror "Please recompile VDR with USE=\"graphtft\""
-		die "Unpached VDR found"
-		echo
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	sed -i "${WORKDIR}"/DeepBlue/DeepBlue.theme -e "s:Enigma:Vera:"
-	sed -i "${S}"/themes/DeepBlue.theme -e "s:Enigma:Vera:"
-	sed -i Makefile -e "s:WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-	sed -i common.h -e "s:void tell:int tell:"
-	sed -i common.c -e "s:void tell:int tell:"
-
-	if has_version ">=media-video/ffmpeg-0.4.9_p20070525" ; then
-		sed -i Makefile -e "s:#HAVE_SWSCALE:HAVE_SWSCALE:"
-	fi
-
-	if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
-		epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff"
-	fi
-
-	has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/${P}-imagemagick-6.4-new_header.diff"
-
-	use directfb && sed -i Makefile \
-		-e "s:#HAVE_DFB = 1:HAVE_DFB = 1:"
-
-	use graphtft-fe && sed -i Makefile \
-		-e "s:#WITH_X_COMM:WITH_X_COMM:"
-}
-
-src_compile() {
-	vdr-plugin_src_compile
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe
-		sed -i build.sh -e "s:qmake-qt4:qmake:"
-		./clean.sh
-		./build.sh || die "build.sh failed"
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/graphTFT/themes/DeepBlue/
-	doins -r "${WORKDIR}"/DeepBlue/*
-	doins "${S}"/themes/DeepBlue.theme
-
-	dosym /usr/share/fonts/ttf-bitstream-vera /usr/share/vdr/graphTFT/fonts
-
-	dodoc "${S}"/documents/*
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe && dobin graphtft-fe
-		doinit graphtft-fe
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Graphtft-fe user:"
-	elog "Edit /etc/conf.d/vdr.graphtft"
-	elog "/etc/init.d/graphtft-fe start"
-	echo
-}
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha-r1.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha-r1.ebuild
index e7958b0cab9a..d06b53d037d3 100644
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha-r1.ebuild
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha-r1.ebuild,v 1.2 2009/02/24 18:05:21 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha-r1.ebuild,v 1.3 2009/03/24 18:02:58 hd_brummy Exp $
 
 EAPI="2"
 MY_PV="${PV/_alpha/.alpha}"
@@ -26,6 +26,7 @@ DEPEND=">=media-video/vdr-1.4.7-r9[graphtft]
 		>=media-video/ffmpeg-0.4.8
 		directfb? ( dev-libs/DirectFB )
 		graphtft-fe? ( x11-libs/qt-gui:4 )"
+RDEPEND="${DEPEND}"
 
 PATCHES=("${FILESDIR}/${P}-gentoo.diff
 		${FILESDIR}/gcc-4.3-missing_includes.diff")
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha.ebuild
deleted file mode 100644
index 48d27879c867..000000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha.ebuild,v 1.5 2009/02/24 18:05:21 hd_brummy Exp $
-
-EAPI="1"
-MY_PV="${PV/_alpha/.alpha}"
-MY_P="${PN}-${MY_PV}"
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: GraphTFT"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://www.jwendel.de/vdr/${MY_P}.tar.bz2
-		http://www.jwendel.de/vdr/DeepBlue-horchi-0.0.8.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-IUSE="directfb graphtft-fe"
-
-DEPEND=">=media-video/vdr-1.4.7-r9
-		media-fonts/ttf-bitstream-vera
-		media-libs/imlib2
-		media-gfx/imagemagick
-		gnome-base/libgtop
-		>=media-video/ffmpeg-0.4.8
-		directfb? ( dev-libs/DirectFB )
-		graphtft-fe? ( x11-libs/qt-gui:4 )"
-
-PATCHES=("${FILESDIR}/${P}-gentoo.diff
-		${FILESDIR}/gcc-4.3-missing_includes.diff")
-
-S="${WORKDIR}/graphtft-${MY_PV}"
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! built_with_use media-video/vdr graphtft; then
-		echo
-		eerror "Please recompile VDR with USE=\"graphtft\""
-		die "Unpached VDR found"
-		echo
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	sed -i "${WORKDIR}"/DeepBlue/DeepBlue.theme -e "s:Enigma:Vera:"
-	sed -i "${S}"/themes/DeepBlue.theme -e "s:Enigma:Vera:"
-	sed -i Makefile -e "s:WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-	sed -i common.h -e "s:void tell:int tell:"
-	sed -i common.c -e "s:void tell:int tell:"
-
-	if has_version ">=media-video/ffmpeg-0.4.9_p20070525" ; then
-		sed -i Makefile -e "s:#HAVE_SWSCALE:HAVE_SWSCALE:" \
-		-e "s:LIBS+=-lswscale:LIBS += -L\$\(FFMDIR\) -lswscale:"
-
-	fi
-
-	has_version ">=media-video/ffmpeg-0.4.9_p20080326" \
-	&& epatch "${FILESDIR}/${PN}-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff"
-
-	has_version ">=media-gfx/imagemagick-6.4" \
-	&& epatch "${FILESDIR}/${PN}-0.1.18_alpha-imagemagick-6.4-new_header.diff"
-
-	use !directfb && sed -i Makefile \
-		-e "s:HAVE_DFB = 1:#HAVE_DFB = 1:"
-
-	use graphtft-fe && sed -i Makefile \
-		-e "s:#WITH_X_COMM:WITH_X_COMM:"
-}
-
-src_compile() {
-	vdr-plugin_src_compile
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe
-		sed -i build.sh -e "s:qmake-qt4:qmake:"
-		./clean.sh
-		./build.sh || die "build.sh failed"
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /usr/share/vdr/graphTFT/themes/DeepBlue/
-	doins -r "${WORKDIR}"/DeepBlue/*
-	doins "${S}"/themes/DeepBlue.theme
-
-	dosym /usr/share/fonts/ttf-bitstream-vera /usr/share/vdr/graphTFT/fonts
-
-	dodoc "${S}"/documents/*
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe && dobin graphtft-fe
-		doinit graphtft-fe
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Graphtft-fe user:"
-	elog "Edit /etc/conf.d/vdr.graphtft"
-	elog "/etc/init.d/graphtft-fe start"
-	echo
-}
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2.ebuild
new file mode 100644
index 000000000000..60cd4ac130c1
--- /dev/null
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2.ebuild,v 1.1 2009/03/24 18:02:58 hd_brummy Exp $
+
+EAPI="2"
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: GraphTFT"
+HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
+SRC_URI="http://www.jwendel.de/vdr/${P}.tar.bz2
+		http://www.jwendel.de/vdr/DeepBlue-horchi-0.0.11.tar.bz2"
+#		http://www.jwendel.de/vdr/alien-vs-predator-0.0.11.tar.bz2"
+
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+IUSE="directfb graphtft-fe imagemagick"
+
+DEPEND=">=media-video/vdr-1.6.0_p2-r1[graphtft]
+		media-fonts/ttf-bitstream-vera
+		media-libs/imlib2[png]
+		imagemagick? ( media-gfx/imagemagick[png] )
+		gnome-base/libgtop
+		>=media-video/ffmpeg-0.4.8_p20090201
+		directfb? ( dev-libs/DirectFB )
+		graphtft-fe? ( x11-libs/qt-gui:4 )"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}_gentoo.diff" )
+
+extpatch_v_check() {
+
+	EXTPATCH_V="`cat /var/db/pkg/media-video/vdr-*/vdr-*.ebuild | grep EXT_V | head -n 1 | cut -c8-9`"
+
+	if [ "${EXTPATCH_V}" -lt "65" ]; then
+		echo
+		eerror "You need an update of vdr with a newer EXTENSIONSPATCH version!"
+		eerror "minimal version of Extensionspatch = 65!"
+		eerror "graphtft will not work fullfilled"
+		echo
+	fi
+}
+
+pkg_setup() {
+	vdr-plugin_pkg_setup
+
+	extpatch_v_check
+}
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	rm -r "${S}"/documents/CVS
+}
+
+src_prepare() {
+	vdr-plugin_src_prepare
+
+	sed -i "${S}"/imlibrenderer/fbrenderer/fbrenderer.c \
+		-i "${S}"/imlibrenderer/dvbrenderer/mpeg2encoder.c \
+		-i "${S}"/imlibrenderer/fbrenderer/mpeg2decoder.c \
+		-i "${S}"/imlibrenderer/fbrenderer/mpeg2decoder.h \
+		-e "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:"
+
+	sed -i "${S}"/imlibrenderer/fbrenderer/mpeg2decoder.c \
+		-i "${S}"/imlibrenderer/dvbrenderer/mpeg2encoder.c \
+		-e "s:ffmpeg/swscale.h:libswscale/swscale.h:"
+}
+
+src_compile() {
+	vdr-plugin_src_compile
+
+	if use graphtft-fe; then
+		cd "${S}"/graphtft-fe
+		sed -i build.sh -e "s:qmake-qt4:qmake:"
+		./clean.sh
+		./build.sh || die "build.sh failed"
+	fi
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	insinto /usr/share/vdr/graphTFT/themes/DeepBlue/
+	doins -r "${WORKDIR}"/DeepBlue/*
+
+#	insinto /usr/share/vdr/graphTFT/themes/avp/
+#	doins -r "${WORKDIR}"/avp/*
+
+	dosym /usr/share/fonts/ttf-bitstream-vera /usr/share/vdr/graphTFT/fonts
+
+	dodoc "${S}"/documents/*
+
+	if use graphtft-fe; then
+		cd "${S}"/graphtft-fe && dobin graphtft-fe
+		doinit graphtft-fe
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin_pkg_postinst
+
+	echo
+	elog "Graphtft-fe user:"
+	elog "Edit /etc/conf.d/vdr.graphtft"
+	elog "/etc/init.d/graphtft-fe start"
+	echo
+}