version bump, 0.1.2* removed no more needed block to gentoo.de ebuild

(Portage version: 2.0.54)

6 files changed, 237 insertions, 21 deletions

diff --git a/media-plugins/vdr-graphlcd/ChangeLog b/media-plugins/vdr-graphlcd/ChangeLog
index bd7bd2cb6786..6655790cd796 100644
--- a/media-plugins/vdr-graphlcd/ChangeLog
+++ b/media-plugins/vdr-graphlcd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-graphlcd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.5 2006/02/28 20:06:44 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/ChangeLog,v 1.6 2006/03/03 16:56:08 hd_brummy Exp $
+
+*vdr-graphlcd-0.1.3 (03 Mar 2006)
+
+  03 Mar 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/0.1.3/radiotext-lcr-service.diff,
+  vdr-graphlcd-0.1.2_pre6-r1.ebuild, +vdr-graphlcd-0.1.3.ebuild:
+  version bump, 0.1.2* removed no more needed block to gentoo.de ebuild
 
   28 Feb 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
   files/0.1.2/radiotext-lcr-service.diff:
diff --git a/media-plugins/vdr-graphlcd/Manifest b/media-plugins/vdr-graphlcd/Manifest
index aa6c1f2f4a05..ab16f2896c8d 100644
--- a/media-plugins/vdr-graphlcd/Manifest
+++ b/media-plugins/vdr-graphlcd/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ed86b618c99d4eb165d38aeebd98e6e0 ChangeLog 1101
 MD5 9edde30be18467eead751bd619a887bd files/0.1.2/radiotext-lcr-service.diff 3429
+MD5 f9dbceea60471cbeb4538f2a36152e16 files/0.1.3/radiotext-lcr-service.diff 4307
 MD5 b52e340ed185e77044523dcee028aae6 files/confd 681
 MD5 c06ef00216c435d94502bd44c0cf7e51 files/digest-vdr-graphlcd-0.1.2_pre6-r1 72
+MD5 c341490e02e23c9bbb495fec8d01d4f0 files/digest-vdr-graphlcd-0.1.3 67
 MD5 517fd6e47ab25170f56df5a2a07510e6 files/rc-addon.sh 453
 MD5 363fe851c7edc1284983ea5393b8c2a9 metadata.xml 403
-MD5 697cc942cd5927ccc84fbf7025f5219a vdr-graphlcd-0.1.2_pre6-r1.ebuild 2527
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-Comment: no further Information
-
-iD8DBQFEBK1odn07HTTCgIoRAqB0AJ9kAFR5QjLgrzKi73gpo0SaonAZxwCeL149
-+cYFJidf0WaAncn6kBSHG10=
-=HHk5
------END PGP SIGNATURE-----
+MD5 8c23756d331def0a4c58d288cea0ed6f vdr-graphlcd-0.1.2_pre6-r1.ebuild 2369
+MD5 5aca20a97f732251ab30bbb5ae5b3d15 vdr-graphlcd-0.1.3.ebuild 2281
diff --git a/media-plugins/vdr-graphlcd/files/0.1.3/radiotext-lcr-service.diff b/media-plugins/vdr-graphlcd/files/0.1.3/radiotext-lcr-service.diff
new file mode 100644
index 000000000000..1b5d1f9c3c38
--- /dev/null
+++ b/media-plugins/vdr-graphlcd/files/0.1.3/radiotext-lcr-service.diff
@@ -0,0 +1,138 @@
+diff -Naur graphlcd-0.1.3.orig/state.c graphlcd-0.1.3/state.c
+--- graphlcd-0.1.3.orig/state.c	2006-01-15 18:25:47.000000000 +0100
++++ graphlcd-0.1.3/state.c	2006-03-03 17:25:38.914590500 +0100
+@@ -16,6 +16,7 @@
+ 
+ #include <vdr/eitscan.h>
+ #include <vdr/i18n.h>
++#include <vdr/plugin.h>
+ 
+ #include "compat.h"
+ 
+@@ -619,7 +620,10 @@
+ void cGraphLCDState::SetChannel(int ChannelNumber)
+ {
+ 	char tmp[16];
+-
++// patch start (http://www.vdr-portal.de/board/thread.php?postid=415431#post415431)
++   if (ChannelNumber == 0)
++       return;
++// patch end
+ 	mutex.Lock();
+ 
+ 	channel.number = ChannelNumber;
+@@ -638,6 +642,8 @@
+ 
+ void cGraphLCDState::GetProgramme()
+ {
++    bool ptitle = false;
++
+ 	mutex.Lock();
+ #if VDRVERSNUM < 10300
+ 	const cEventInfo * present = NULL, * following = NULL;
+@@ -654,9 +660,11 @@
+ 				{
+ 					event.presentTime = present->GetTime();
+ 					event.presentTitle = "";
+-					if (!isempty(present->GetTitle()))
++					if (!isempty(present->GetTitle())) {
+ 						event.presentTitle = present->GetTitle();
+ 					event.presentSubtitle = "";
++					ptitle = true;
++					}
+ 					if (!isempty(present->GetSubtitle()))
+ 						event.presentSubtitle = present->GetSubtitle();
+ 				}
+@@ -688,9 +696,11 @@
+ 				{
+ 					event.presentTime = present->StartTime();
+ 					event.presentTitle = "";
+-					if (!isempty(present->Title()))
++					if (!isempty(present->Title())) {
+ 						event.presentTitle = present->Title();
+ 					event.presentSubtitle = "";
++					ptitle = true;
++					}
+ 					if (!isempty(present->ShortText()))
+ 						event.presentSubtitle = present->ShortText();
+ 				}
+@@ -708,6 +718,54 @@
+ 		}
+ 	}
+ #endif
++
++#if VDRVERSNUM >= 10330
++   { // get&display Radiotext
++       cPlugin *p;
++       p = cPluginManager::CallFirstService("RadioTextService-v1.0", NULL);
++       if (p) {
++           RadioTextService_v1_0 rtext;
++           if (cPluginManager::CallFirstService("RadioTextService-v1.0", &rtext)) {
++               if (rtext.rds_info == 2 && strstr(rtext.rds_title, "---") == NULL) {
++                   char rtpinfo[2][65], rtstr[140];
++                   strcpy(rtpinfo[0], rtext.rds_title);
++                   strcpy(rtpinfo[1], rtext.rds_artist);
++                   sprintf(rtstr, "%02d:%02d  %s | %s", rtext.title_start->tm_hour, rtext.title_start->tm_min, trimright(rtpinfo[0]), trimright(rtpinfo[1]));
++                       ptitle ? event.presentSubtitle = rtstr : event.presentTitle = rtstr;
++               }
++               else if (rtext.rds_info > 0) {
++                   char rtstr[65];
++                   strcpy(rtstr, rtext.rds_text);
++                   ptitle ? event.presentSubtitle = trimright(rtstr) : event.presentTitle = trimright(rtstr);
++               }
++           }
++       }
++   }
++#endif
++
++#if VDRVERSNUM >= 10330
++   { // get&display LcrData
++       cPlugin *p;
++       p = cPluginManager::CallFirstService("LcrService-v1.0", NULL);
++       if (p)
++       {
++           LcrService_v1_0 lcrData;
++           if (cPluginManager::CallFirstService("LcrService-v1.0", &lcrData))
++           {
++               if ( strstr( lcrData.destination, "---" ) == NULL )
++               {
++                   char lcrStringParts[3][25], lcrString[100];
++                   strcpy( lcrStringParts[0], (const char *)lcrData.destination );
++                   strcpy( lcrStringParts[1], (const char *)lcrData.price );
++                   strcpy( lcrStringParts[2], (const char *)lcrData.pulse );
++                   sprintf(lcrString, "%s | %s", trimright(lcrStringParts[1]), trimright(lcrStringParts[2]));
++                   event.presentTitle = trimright(lcrStringParts[0]);
++                   event.presentSubtitle = trimright(lcrString);
++               }
++           }
++       }
++   }
++#endif
+ 	mutex.Unlock();
+ }
+ 
+diff -Naur graphlcd-0.1.3.orig/state.h graphlcd-0.1.3/state.h
+--- graphlcd-0.1.3.orig/state.h	2006-01-15 18:19:59.000000000 +0100
++++ graphlcd-0.1.3/state.h	2006-03-03 17:13:36.801461250 +0100
+@@ -127,4 +127,21 @@
+ 	tVolumeState GetVolumeState();
+ };
+ 
++// Radiotext
++struct RadioTextService_v1_0 {
++  int rds_info;
++  int rds_pty;
++  char *rds_text;
++  char *rds_title;
++  char *rds_artist;
++  struct tm *title_start;
++};
++
++// LcrData
++struct LcrService_v1_0 {
++  cString destination;
++  cString price;
++  cString pulse;
++};
++
+ #endif
diff --git a/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.3 b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.3
new file mode 100644
index 000000000000..cb0e79c87c1e
--- /dev/null
+++ b/media-plugins/vdr-graphlcd/files/digest-vdr-graphlcd-0.1.3
@@ -0,0 +1 @@
+MD5 c4f048e12e61540281682c59bcc28fb2 vdr-graphlcd-0.1.3.tgz 244387
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild
index 07cdc33a181b..c3f84b421bf9 100644
--- a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild,v 1.4 2006/02/28 00:27:45 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.2_pre6-r1.ebuild,v 1.5 2006/03/03 16:56:08 hd_brummy Exp $
 
 inherit eutils vdr-plugin
 
@@ -19,11 +19,7 @@ IUSE="truetype"
 S=${WORKDIR}/${VDRPLUGIN}-${MY_PV}
 
 DEPEND=">=media-video/vdr-1.2.6
-		>=app-misc/graphlcd-base-${PV}
-		!sys-apps/graphlcd-base"
-
-# DO NOT remove "!sys-apps/graphlcd-base" from DEPEND !!!
-# It will fix a conflict with ebuilds in Gentoo.de OVERLAY CVS
+		>=app-misc/graphlcd-base-${PV}"
 
 PATCHES="${FILESDIR}/0.1.2/*"
 
@@ -31,8 +27,6 @@ src_unpack() {
 
 	vdr-plugin_src_unpack
 
-	cd ${S}
-
 	sed -i "s:/usr/local:/usr:" Makefile
 }
 
diff --git a/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3.ebuild b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3.ebuild
new file mode 100644
index 000000000000..b865cb1ccd65
--- /dev/null
+++ b/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphlcd/vdr-graphlcd-0.1.3.ebuild,v 1.1 2006/03/03 16:56:08 hd_brummy Exp $
+
+inherit eutils vdr-plugin
+
+DESCRIPTION="VDR Graphical LCD Plugin"
+HOMEPAGE="http://graphlcd.berlios.de/"
+SRC_URI="http://download.berlios.de/graphlcd/${P}.tgz"
+
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="truetype"
+
+DEPEND=">=media-video/vdr-1.2.6
+		>=app-misc/graphlcd-base-${PV}"
+
+PATCHES="${FILESDIR}/0.1.3/*"
+
+src_unpack() {
+
+	vdr-plugin_src_unpack
+
+	sed -i "s:/usr/local:/usr:" Makefile
+}
+
+src_install() {
+
+	vdr-plugin_src_install
+
+	insopts -m0644 -ovdr -gvdr
+
+	insinto /usr/share/vdr/${VDRPLUGIN}/logos
+	doins -r ${VDRPLUGIN}/logos/*
+
+	insinto /usr/share/vdr/${VDRPLUGIN}/fonts
+	doins ${VDRPLUGIN}/fonts/*.fnt
+
+	if use truetype; then
+		for font in /usr/share/fonts/corefonts/*.ttf; do
+			einfo ${font}
+			dosym ${font} /usr/share/vdr/graphlcd/fonts
+		done
+	fi
+
+	insinto /etc/vdr/plugins/${VDRPLUGIN}
+	doins ${VDRPLUGIN}/logonames.alias.*
+	doins ${VDRPLUGIN}/fonts.conf.*
+
+	dosym /usr/share/vdr/${VDRPLUGIN}/fonts /etc/vdr/plugins/${VDRPLUGIN}/fonts
+	dosym /usr/share/vdr/${VDRPLUGIN}/logos /etc/vdr/plugins/${VDRPLUGIN}/logos
+	dosym /etc/graphlcd.conf /etc/vdr/plugins/${VDRPLUGIN}/graphlcd.conf
+
+	if has_version ">=media-video/vdr-1.3.2" ; then
+		dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.3 /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias
+	else
+		dosym /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias.1.2 /etc/vdr/plugins/${VDRPLUGIN}/logonames.alias
+	fi
+}
+
+pkg_preinst() {
+
+	if [[ -e /etc/vdr/plugins/graphlcd/fonts ]] && [[ ! -L /etc/vdr/plugins/graphlcd/fonts ]] \
+	|| [[ -e /etc/vdr/plugins/graphlcd/logos ]] && [[ ! -L /etc/vdr/plugins/graphlcd/logos ]] ;then
+
+		einfo "Remove wrong DIR in /etc/vdr/plugins/graphlcd from prior install"
+		einfo "Press CTRL+C to abbort"
+		epause
+		rmdir -R /etc/vdrplugins/graphlcd/{fonts,logos}
+	fi
+}
+
+pkg_postinst() {
+
+	vdr-plugin_pkg_postinst
+
+	einfo "Add additional options in /etc/conf.d/vdr.graphlcd"
+	einfo
+	einfo "Please copy or link one of the supplied fonts.conf.*"
+	einfo "files in /etc/vdr/plugins/graphlcd/ to"
+	einfo "/etc/vdr/plugins/graphlcd/fonts.conf"
+}
+