versions bump

Package-Manager: portage-2.1.4.4

5 files changed, 240 insertions, 11 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index 9d6cb54f209b..ee684ea99c69 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-graphtft
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.8 2008/08/01 19:47:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.9 2008/08/10 18:26:55 hd_brummy Exp $
+
+*vdr-graphtft-0.1.21_alpha (10 Aug 2008)
+
+  10 Aug 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/vdr-graphtft-0.1.21_alpha-gentoo.diff,
+  vdr-graphtft-0.1.18_alpha.ebuild, +vdr-graphtft-0.1.21_alpha.ebuild:
+  versions bump
 
   01 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
index 0df5abb884d0..e0d8f33e3ae1 100644
--- a/media-plugins/vdr-graphtft/Manifest
+++ b/media-plugins/vdr-graphtft/Manifest
@@ -8,15 +8,20 @@ AUX rc-addon.sh 319 RMD160 1d0638b87fa0c352efb6a0dcc4cedb9f45fbb29a SHA1 926fb7e
 AUX vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff 2651 RMD160 c9449b8ef2dc1d806fbcfd7ef7e95fd1defcc7a9 SHA1 316ac3e328fe4bedc9bb5dc419c9c0b2f554e8be SHA256 1d68415dd3ffafbd3735102ac2407f5b22a7361209869b6fc780d35aa27f0424
 AUX vdr-graphtft-0.1.18_alpha-gentoo.diff 3937 RMD160 4f97eaa37391286819a1483835b6a0fc4980994a SHA1 afdcdbef95c174093d2d08ff6d81ec2263034f20 SHA256 25b9ba6c4f6da4218ed27f7ee0cb35da4e268d844557882ed8f42dba14892ada
 AUX vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff 461 RMD160 4c36203c70182be9b910c801223ff3637584d059 SHA1 f17143aa4552d49aea9c72eaa25b832a040f356d SHA256 ef5eed0e2bb6518cb0b65d90dc43ba3e47a1c339159fe02ce361c9f5ac5ef4e9
+AUX vdr-graphtft-0.1.21_alpha-gentoo.diff 3908 RMD160 0b9e265ef93d8c3ace03fe5b4f5b1e182dd7ab62 SHA1 d12b8d58b36d489a8f758f3e9c48c72a46c1c9af SHA256 7b1dfb3895e11baacea28f4447eb1b2a4146c4fbe42865ac5ec1c0328870095f
 DIST DeepBlue-horchi-0.0.6.tar.bz2 1660439 RMD160 8ac510b9a65f8f4becef94519cf77f083709e96e SHA1 108321c1fc2d9e4e4aae650d9b6e842dfd5d6788 SHA256 75ca7ea853ae9fc3a30b656ab0f6599bc09c10d371b76990156ad9491ad2c8ee
+DIST DeepBlue-horchi-0.0.8.tar.bz2 1769355 RMD160 2b0db7c41d8c6a5cd08f2002a109e79070e39abf SHA1 9791631ed3e5cb64624331acbd90fd9df0cab848 SHA256 3eed407992789c63a9c776d8320e2c9fd238847916ef77fe2ac2719fa66a787c
 DIST vdr-graphtft-0.1.18.alpha.tar.bz2 243724 RMD160 dbb1c86f945a64eb352dadb3e4e96f677d9b53d4 SHA1 7b92bcdcd3a101d0f0321859735c2cf1308a020f SHA256 8b77a0b7809b32899646a94e03277933340d697c7268ac5c347a89cde212eadf
-EBUILD vdr-graphtft-0.1.18_alpha.ebuild 2712 RMD160 f7a8705c72b5108842ce3c06b9176f3816a0e7fb SHA1 8bb5452cb21e4bc386debd2debf4d35d0e7afc6e SHA256 26e14801d3e75c68196e66bb4ea45f67e6e0732d3b9239f434be79ef4d1be249
-MISC ChangeLog 2230 RMD160 b652674e8477c03c0d463a67d3ae21baaa2795c6 SHA1 7862cc7da9f24114feeba52e704e4fbee64e8a09 SHA256 4f0e7daacc316de60fcffbbd0e81d8838e8c624e5f4b48be84355fb6a672aa05
+DIST vdr-graphtft-0.1.21.alpha.tar.bz2 153233 RMD160 105c95c2f6365a3b6b27b874da5cc44133343e0e SHA1 fbd2657759828ef61b39011579049e0f85693218 SHA256 8d2566c86216c42079be3a11f082cdb87670b4eaa75d487f6a8d56d576eaff5f
+EBUILD vdr-graphtft-0.1.18_alpha.ebuild 2703 RMD160 0eb90e4a2238a90f4081832d97f79b2e950d4ae3 SHA1 3ea5213544a747448b05b0b9821e1de2f57ba683 SHA256 c79c17ba1c87d2bf505e127586f22f59ac549401fa4ddccb89c7eda51a12bac9
+EBUILD vdr-graphtft-0.1.21_alpha.ebuild 2712 RMD160 e29479e3073fba4f911ce9cd539f3a67ddaad034 SHA1 9f19bb48f113ad593e611d83e5f859ecbf75f9a4 SHA256 b795457d22709ee5dfaba1cb2aabd549a29036d4d9b7bfbcade732d3317e6970
+MISC ChangeLog 2466 RMD160 efb125afbd25c54a3d9b72fc2ae631b4293f42b5 SHA1 849af67640ab187d32908a26dcff16391f51d575 SHA256 b3b31a3331390a1b37d908bf08187ba64f8bb428190ef973ef3e63c64e70f1e1
 MISC metadata.xml 348 RMD160 fe6f19f0be6387b23866a60b6dc37107d67205e5 SHA1 2b729da31705bf0b2b8ef09b265a373672510bca SHA256 85f62a664d65de9f6958acd1eb88a458bb0aa8ab9ab4f96765959c24f1102388
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkiTaDkACgkQoeSe8B0zEfz/KgCeO7ZncuiFzgkK/LmDr0UYVUTL
-BsYAn3qDSVA+gGL4IkmQZgGtLcTFKH/2
-=t9yM
+iD8DBQFInzMBdn07HTTCgIoRAmzDAJoDyAFa9CnOn3MxAYFfutJaD5pIHACZAX6D
+3s7xG7Khl3HoQz+P7BwTTE4=
+=M3rJ
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..85bf3d5a091d
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.1.21_alpha-gentoo.diff
@@ -0,0 +1,111 @@
+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.18_alpha.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild
index e837884e7c96..195802862803 100644
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.18_alpha.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2008/07/28 21:15:44 carlo Exp $
+# $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
 
@@ -61,9 +61,7 @@ src_unpack() {
 		epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff"
 	fi
 
-	if has_version ">=media-gfx/imagemagick-6.4" ; then
-		epatch "${FILESDIR}/${P}-imagemagick-6.4-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:"
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
new file mode 100644
index 000000000000..452e3f21aa29
--- /dev/null
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.1.21_alpha.ebuild
@@ -0,0 +1,108 @@
+# 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.21_alpha.ebuild,v 1.1 2008/08/10 18:26:55 hd_brummy Exp $
+
+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.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 )"
+
+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
+
+	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
+}