complet cleanup, newer versions on main tree

svn path=/testing/; revision=524

8 files changed, 0 insertions, 375 deletions

diff --git a/media-plugins/vdr-graphtft/files/confd b/media-plugins/vdr-graphtft/files/confd
deleted file mode 100644
index 6d8b1ab..0000000
--- a/media-plugins/vdr-graphtft/files/confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/conf.d/vdr.graphtft
-# $Header: $
-
-####### Global config for Graphtft ####################
-
-#
-# set the DIR of the Framebuffer Device
-#   allowed values: device names
-#   default: /dev/fb0
-#GRAPHTFT_DEVICE=/dev/fb0
-
-# directFB
\ No newline at end of file
diff --git a/media-plugins/vdr-graphtft/files/digest-vdr-graphtft-0.1.7_alpha b/media-plugins/vdr-graphtft/files/digest-vdr-graphtft-0.1.7_alpha
deleted file mode 100644
index e180ca6..0000000
--- a/media-plugins/vdr-graphtft/files/digest-vdr-graphtft-0.1.7_alpha
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7aaae863b9d05221ccafd1bcd13ee613 DeepBlue-horchi-0.0.5.tar.bz2 1637211
-RMD160 21dee077ad21e32956399eb6e5a99ea72e78d963 DeepBlue-horchi-0.0.5.tar.bz2 1637211
-SHA256 4197ffd5dec0aabf9b7a3ad6ac4147e9f241d3159b6cf7717c543fecfc01e4b5 DeepBlue-horchi-0.0.5.tar.bz2 1637211
-MD5 bcc58cec593228d5a67dfd4f83f30e92 vdr-graphtft-0.1.7.alpha.tar.bz2 100586
-RMD160 e2ce7625ac53403fc3e11dc6b75c70f77c723642 vdr-graphtft-0.1.7.alpha.tar.bz2 100586
-SHA256 67c3741ebfaf2a4136b0b28ccaf8165880d6c65edcf7aecfbe231d483ce711cb vdr-graphtft-0.1.7.alpha.tar.bz2 100586
diff --git a/media-plugins/vdr-graphtft/files/digest-vdr-graphtft-0.1.8_alpha b/media-plugins/vdr-graphtft/files/digest-vdr-graphtft-0.1.8_alpha
deleted file mode 100644
index 1cdcaeb..0000000
--- a/media-plugins/vdr-graphtft/files/digest-vdr-graphtft-0.1.8_alpha
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7aaae863b9d05221ccafd1bcd13ee613 DeepBlue-horchi-0.0.5.tar.bz2 1637211
-RMD160 21dee077ad21e32956399eb6e5a99ea72e78d963 DeepBlue-horchi-0.0.5.tar.bz2 1637211
-SHA256 4197ffd5dec0aabf9b7a3ad6ac4147e9f241d3159b6cf7717c543fecfc01e4b5 DeepBlue-horchi-0.0.5.tar.bz2 1637211
-MD5 c7f1f71d0ef0897dbde3363b84be2e21 vdr-graphtft-0.1.8.alpha.tar.bz2 226267
-RMD160 909e7708dcea323fb414224f5e66e78b357fc5f5 vdr-graphtft-0.1.8.alpha.tar.bz2 226267
-SHA256 41fb9a9170088fffb7e49e498da2bfe77535491212a916bc1ec25e5de0f1280a vdr-graphtft-0.1.8.alpha.tar.bz2 226267
diff --git a/media-plugins/vdr-graphtft/files/rc-addon.sh b/media-plugins/vdr-graphtft/files/rc-addon.sh
deleted file mode 100644
index c92d374..0000000
--- a/media-plugins/vdr-graphtft/files/rc-addon.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Header: $
-#
-# rc-addon-script for plugin graphtft
-#
-# Joerg Bornkessel <hd_brummy@g.o>
-
-plugin_pre_vdr_start() {
-	: ${GRAPHTFT_DEVICE:=/dev/fb0}
-	
-	add_plugin_param "-d ${GRAPHTFT_DEVICE}"
-}
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.7_alpha-gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.7_alpha-gentoo.diff
deleted file mode 100644
index 284df80..0000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.7_alpha-gentoo.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: graphtft-0.1.7.alpha/graphtft.c
-===================================================================
---- graphtft-0.1.7.alpha.orig/graphtft.c
-+++ graphtft-0.1.7.alpha/graphtft.c
-@@ -20,6 +20,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -250,14 +252,9 @@ bool cPluginGraphTFT::Start()
- 
- #endif
- 
--   // try to get the config dir
--
--   if (!ConfigDirectory())
--      return false;
--
-    // init 
- 
--   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
-+   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
-    RegisterI18n(Phrases);
-    display = new cGraphTFTDisplay();
- 
-@@ -269,7 +266,7 @@ bool cPluginGraphTFT::Start()
-    if (loadThemes() != 0)
-       return false;
- 
--   return display->Init(_dev, ConfigDirectory(), port);
-+   return display->Init(_dev, DATA_DIR, port);
- }
- 
- //***************************************************************************
-@@ -283,8 +280,8 @@ int cPluginGraphTFT::loadThemes()
- 
-    // 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");
-    free(buffer);
- 
-Index: graphtft-0.1.7.alpha/dfbrenderer/dfbrenderer.c
-===================================================================
---- graphtft-0.1.7.alpha.orig/dfbrenderer/dfbrenderer.c
-+++ graphtft-0.1.7.alpha/dfbrenderer/dfbrenderer.c
-@@ -330,7 +330,7 @@ void DFbRenderer::image(const char* fnam
-       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);
-       }
- 
-       d(4,"creating imageprovider for %s\n", fpath);
-@@ -380,7 +380,7 @@ int DFbRenderer::charWidthOf(const char*
- 
-    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);
- 
-       d(4,"creating font for %s\n", fpath);
- 
-@@ -433,7 +433,7 @@ int DFbRenderer::text(const char *text, 
- 
-    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);
- 
-       d(4,"creating font for %s\n", fpath);
- 
-Index: graphtft-0.1.7.alpha/imlibrenderer/imlibrenderer.c
-===================================================================
---- graphtft-0.1.7.alpha.orig/imlibrenderer/imlibrenderer.c
-+++ graphtft-0.1.7.alpha/imlibrenderer/imlibrenderer.c
-@@ -53,7 +53,7 @@ ImlibRenderer::ImlibRenderer(int x, int 
-  
-    // 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
-@@ -132,7 +132,7 @@ void ImlibRenderer::image(const char* fn
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    // #TODO for speed insert a check if file exists 
-    // before load
-
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.8_alpha-gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.8_alpha-gentoo.diff
deleted file mode 100644
index ea7ed5d..0000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.8_alpha-gentoo.diff
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Naur graphtft-0.1.8.alpha.orig/dfbrenderer/dfbrenderer.c graphtft-0.1.8.alpha/dfbrenderer/dfbrenderer.c
---- graphtft-0.1.8.alpha.orig/dfbrenderer/dfbrenderer.c	2007-09-30 18:50:04.606386652 +0200
-+++ graphtft-0.1.8.alpha/dfbrenderer/dfbrenderer.c	2007-09-30 18:54:23.998559219 +0200
-@@ -331,7 +331,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);
-       }
- 
-       d(4,"creating imageprovider for %s\n", fpath);
-@@ -381,7 +381,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);
- 
-       d(4,"creating font for %s\n", fpath);
- 
-@@ -434,7 +434,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);
- 
-       d(4,"creating font for %s\n", fpath);
- 
-diff -Naur graphtft-0.1.8.alpha.orig/graphtft.c graphtft-0.1.8.alpha/graphtft.c
---- graphtft-0.1.8.alpha.orig/graphtft.c	2007-09-30 18:50:04.719712196 +0200
-+++ graphtft-0.1.8.alpha/graphtft.c	2007-09-30 18:52:58.611094371 +0200
-@@ -20,6 +20,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -255,14 +257,9 @@
- 
- #endif
- 
--   // try to get the config dir
--
--   if (!ConfigDirectory())
--      return false;
--
-    // init 
- 
--   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
-+   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
-    RegisterI18n(Phrases);
-    display = new cGraphTFTDisplay();
- 
-@@ -274,7 +271,7 @@
-    if (loadThemes() != 0)
-       return false;
- 
--   return display->Init(_dev, ConfigDirectory(), port);
-+   return display->Init(_dev, DATA_DIR, port);
- }
- 
- //***************************************************************************
-@@ -288,8 +285,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");
-    free(buffer);
- 
-diff -Naur graphtft-0.1.8.alpha.orig/imlibrenderer/imlibrenderer.c graphtft-0.1.8.alpha/imlibrenderer/imlibrenderer.c
---- graphtft-0.1.8.alpha.orig/imlibrenderer/imlibrenderer.c	2007-09-30 18:50:04.759709448 +0200
-+++ graphtft-0.1.8.alpha/imlibrenderer/imlibrenderer.c	2007-09-30 18:55:09.985398648 +0200
-@@ -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 --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.7_alpha.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.7_alpha.ebuild
deleted file mode 100644
index f9add1e..0000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.7_alpha.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 (german)"
-SRC_URI="http://www.jwendel.de/vdr/${MY_P}.tar.bz2
-		http://www.jwendel.de/vdr/DeepBlue-horchi-0.0.5.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-IUSE="" #IUSE="directfb" <-- fix me later
-
-DEPEND=">=media-video/vdr-1.4.7
-		media-fonts/ttf-bitstream-vera
-		media-libs/imlib2
-		media-gfx/imagemagick
-		gnome-base/libgtop
-		>=media-video/ffmpeg-0.4.8"
-#		directfb? ( dev-libs/DirectFB 
-#		media-libs/libsoftmpeg )" # fix/test me later
-
-PATCHES="${FILESDIR}/${P}-gentoo.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 themes/DeepBlue.theme -e "s:Enigma:Vera:"
-	sed -i Makefile -e "s:WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-
-	if has_version ">=media-video/ffmpeg-0.4.9_p20070525" ; then
-		sed -i Makefile -e "s:#HAVE_SWSCALE:HAVE_SWSCALE:"
-	fi
-
-#	use directfb && sed -i Makefile \
-#		-e "s:HAVE_IMLIB = 1:#HAVE_IMLIB = 1:" \
-#		-e "s:#HAVE_DFB = 1:HAVE_DFB = 1:" \
-#		-e "s:#HAVE_SOFTMPEG = 1:HAVE_SOFTMPEG = 1:" \
-#		-e "s:HAVE_FFMPEG = 1:#HAVE_FFMPEG = 1:"  # fix/test me later
-}
-
-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/*
-}
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.8_alpha.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.8_alpha.ebuild
deleted file mode 100644
index 88d7357..0000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.8_alpha.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 (german)"
-SRC_URI="http://www.jwendel.de/vdr/${MY_P}.tar.bz2
-		http://www.jwendel.de/vdr/DeepBlue-horchi-0.0.5.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-IUSE="directfb"
-
-DEPEND=">=media-video/vdr-1.4.7
-		media-fonts/ttf-bitstream-vera
-		media-libs/imlib2
-		media-gfx/imagemagick
-		gnome-base/libgtop
-		>=media-video/ffmpeg-0.4.8
-		directfb? ( dev-libs/DirectFB )"
-
-PATCHES="${FILESDIR}/${P}-gentoo.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 themes/DeepBlue.theme -e "s:Enigma:Vera:"
-	sed -i Makefile -e "s:WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-
-	if has_version ">=media-video/ffmpeg-0.4.9_p20070525" ; then
-		sed -i Makefile -e "s:#HAVE_SWSCALE:HAVE_SWSCALE:"
-	fi
-
-	use directfb && sed -i Makefile \
-		-e "s:#HAVE_DFB = 1:HAVE_DFB = 1:"
-}
-
-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/*
-}