cleanup for bug 335785

(Portage version: 2.1.8.3/cvs/Linux i686)

6 files changed, 10 insertions, 308 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index abf53b18097a..12cbcc63772d 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.24 2010/09/26 16:36:36 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.25 2010/12/01 19:12:32 hd_brummy Exp $
+
+  01 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff,
+  -files/vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff,
+  -vdr-graphtft-0.1.21_alpha-r1.ebuild,
+  -files/vdr-graphtft-0.1.21_alpha-gentoo.diff,
+  -files/gcc-4.3-missing_includes.diff:
+  cleanup for bug 335785
+
 
   26 Sep 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-graphtft-0.2.2-r1.ebuild, vdr-graphtft-0.3.2.24.ebuild:
diff --git a/media-plugins/vdr-graphtft/files/gcc-4.3-missing_includes.diff b/media-plugins/vdr-graphtft/files/gcc-4.3-missing_includes.diff
deleted file mode 100644
index c5124bd445c2..000000000000
--- a/media-plugins/vdr-graphtft/files/gcc-4.3-missing_includes.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur graphtft-0.1.18.alpha.orig/tcpchannel.c graphtft-0.1.18.alpha/tcpchannel.c
---- graphtft-0.1.18.alpha.orig/tcpchannel.c	2008-06-22 19:32:19.000000000 +0200
-+++ graphtft-0.1.18.alpha/tcpchannel.c	2008-06-22 19:32:59.000000000 +0200
-@@ -15,6 +15,7 @@
- #include <fcntl.h>
- #include <netdb.h>
- #include <errno.h>
-+#include <string.h>
- 
- #include "tcpchannel.h"
- #include "common.h"
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff
deleted file mode 100644
index 8de41953d1b4..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff
+++ /dev/null
@@ -1,71 +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 graphtft-0.1.16.alpha.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c graphtft-0.1.16.alpha/imlibrenderer/dvbrenderer/mpeg2encoder.c
---- graphtft-0.1.16.alpha.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c	2008-03-29 14:28:15.000000000 +0100
-+++ graphtft-0.1.16.alpha/imlibrenderer/dvbrenderer/mpeg2encoder.c	2008-03-29 14:30:07.000000000 +0100
-@@ -23,10 +23,10 @@
- 
- extern "C" 
- {
--#include <avcodec.h>
-+#include <libavcodec/avcodec.h>
- 
- #ifdef HAVE_SWSCALE
--#  include <swscale.h>
-+#  include <libswscale/swscale.h>
- #endif
- }
- 
-diff -Naur graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/fbrenderer.c graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/fbrenderer.c
---- graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/fbrenderer.c	2008-03-29 14:28:15.000000000 +0100
-+++ graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/fbrenderer.c	2008-03-29 14:30:33.000000000 +0100
-@@ -31,7 +31,7 @@
- #include <stdlib.h>
- 
- #include <fbrenderer.h>
--#include <avcodec.h>
-+#include <libavcodec/avcodec.h>
- #include <common.h>
- #include <setup.h>
- 
-diff -Naur graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/mpeg2decoder.c graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/mpeg2decoder.c
---- graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/mpeg2decoder.c	2008-03-29 14:28:15.000000000 +0100
-+++ graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/mpeg2decoder.c	2008-03-29 14:31:00.000000000 +0100
-@@ -23,10 +23,10 @@
- 
- extern "C" 
- {
--#include <avcodec.h>
-+#include <libavcodec/avcodec.h>
- 
- # ifdef HAVE_SWSCALE
--#  include <swscale.h>
-+#  include <libswscale/swscale.h>
- # endif
- }
- 
-diff -Naur graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/mpeg2decoder.h graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/mpeg2decoder.h
---- graphtft-0.1.16.alpha.orig/imlibrenderer/fbrenderer/mpeg2decoder.h	2008-03-29 14:28:15.000000000 +0100
-+++ graphtft-0.1.16.alpha/imlibrenderer/fbrenderer/mpeg2decoder.h	2008-03-29 14:31:14.000000000 +0100
-@@ -19,7 +19,7 @@
- 
- extern "C"
- {
--#include <avcodec.h>
-+#include <libavcodec/avcodec.h>
- }
- #include <vdr/plugin.h>
- #include <vdr/ringbuffer.h>
-diff -Naur graphtft-0.1.16.alpha.orig/Makefile graphtft-0.1.16.alpha/Makefile
---- graphtft-0.1.16.alpha.orig/Makefile	2008-03-29 14:28:15.000000000 +0100
-+++ graphtft-0.1.16.alpha/Makefile	2008-03-29 14:28:32.000000000 +0100
-@@ -11,7 +11,7 @@
- # You will need ffmpeg for dvb/fb-devices and for softmpeg, 
- # so install it and set path below:
- 
--FFMDIR = /usr/include/ffmpeg
-+FFMDIR = /usr/include
- 
- #
- # Install imlib2 and uncomment the lines
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff
deleted file mode 100644
index e071e6765bb5..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur graphtft-0.1.18.alpha.orig/Makefile graphtft-0.1.18.alpha/Makefile
---- graphtft-0.1.18.alpha.orig/Makefile	2008-06-22 19:12:45.000000000 +0200
-+++ graphtft-0.1.18.alpha/Makefile	2008-06-22 19:16:56.000000000 +0200
-@@ -122,6 +122,10 @@
-   HAVE_FFMPEG = 1
- endif
- 
-+ifdef HAVE_IMAGE_MAGICK
-+  INCLUDES += -I/usr/include/ImageMagick
-+endif
-+
- ifdef HAVE_GTOP
-   GTOP_INC = `pkg-config libgtop-2.0 --cflags`
-   GTOP_LIB = `pkg-config libgtop-2.0 --libs`
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.21_alpha-gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.21_alpha-gentoo.diff
deleted file mode 100644
index 85bf3d5a091d..000000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.21_alpha-gentoo.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -Naur graphtft-0.1.21.alpha.orig/dfbrenderer/dfbrenderer.c graphtft-0.1.21.alpha/dfbrenderer/dfbrenderer.c
---- graphtft-0.1.21.alpha.orig/dfbrenderer/dfbrenderer.c	2008-08-10 18:46:52.435184689 +0200
-+++ graphtft-0.1.21.alpha/dfbrenderer/dfbrenderer.c	2008-08-10 18:48:51.652846119 +0200
-@@ -383,7 +383,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);
-@@ -453,7 +453,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);
- 
-@@ -514,7 +514,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.21.alpha.orig/dspitems.c graphtft-0.1.21.alpha/dspitems.c
---- graphtft-0.1.21.alpha.orig/dspitems.c	2008-08-10 18:46:52.438517522 +0200
-+++ graphtft-0.1.21.alpha/dspitems.c	2008-08-10 18:52:55.997229669 +0200
-@@ -892,7 +892,7 @@
-       if (p[0] != '/')
-       {
-          p = string(GraphTFTSetup.PluginConfPath) 
--            + "/graphTFT/themes/" 
-+            + "/themes/" 
-             + string(theTheme->getDir()) 
-             + "/" + p;
-       }
-diff -Naur graphtft-0.1.21.alpha.orig/graphtft.c graphtft-0.1.21.alpha/graphtft.c
---- graphtft-0.1.21.alpha.orig/graphtft.c	2008-08-10 18:46:52.445181748 +0200
-+++ graphtft-0.1.21.alpha/graphtft.c	2008-08-10 18:51:27.951263711 +0200
-@@ -20,6 +20,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -260,14 +262,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);
-@@ -283,7 +278,7 @@
-    if (loadThemes() != 0)
-       return false;
- 
--   return display->Init(_dev, ConfigDirectory(), port);
-+   return display->Init(_dev, DATA_DIR, port);
- }
- 
- //***************************************************************************
-@@ -299,8 +294,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.21.alpha.orig/imlibrenderer/imlibrenderer.c graphtft-0.1.21.alpha/imlibrenderer/imlibrenderer.c
---- graphtft-0.1.21.alpha.orig/imlibrenderer/imlibrenderer.c	2008-08-10 18:46:52.515173335 +0200
-+++ graphtft-0.1.21.alpha/imlibrenderer/imlibrenderer.c	2008-08-10 18:52:21.979320235 +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
-@@ -136,7 +136,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.21_alpha-r1.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha-r1.ebuild
deleted file mode 100644
index d06b53d037d3..000000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha-r1.ebuild
+++ /dev/null
@@ -1,100 +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-r1.ebuild,v 1.3 2009/03/24 18:02:58 hd_brummy Exp $
-
-EAPI="2"
-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[graphtft]
-		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 )"
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}/${P}-gentoo.diff
-		${FILESDIR}/gcc-4.3-missing_includes.diff")
-
-S="${WORKDIR}/graphtft-${MY_PV}"
-
-src_prepare() {
-	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:"
-
-	vdr-plugin_src_prepare
-}
-
-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
-}