Version bumped. Added upstream Helmut Auer to maintainers.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

7 files changed, 124 insertions, 9 deletions

diff --git a/media-plugins/vdr-alcd/ChangeLog b/media-plugins/vdr-alcd/ChangeLog
index c7fa8e31ed5e..c3f2ab86504d 100644
--- a/media-plugins/vdr-alcd/ChangeLog
+++ b/media-plugins/vdr-alcd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-alcd
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-alcd/ChangeLog,v 1.2 2006/08/15 10:28:00 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-alcd/ChangeLog,v 1.3 2009/06/14 08:44:13 zzam Exp $
+
+*vdr-alcd-1.5.1 (14 Jun 2009)
+
+  14 Jun 2009; Matthias Schwarzott <zzam@gentoo.org> vdr-alcd-1.0.0.ebuild,
+  +vdr-alcd-1.5.1.ebuild, +files/vdr-alcd-1.5.1-gcc-4.4.diff,
+  +files/vdr-alcd-1.5.1-makefile-cleanup.diff, metadata.xml:
+  Version bumped. Added upstream Helmut Auer to maintainers.
 
   15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
   Assigned to Gentoo VDR Project.
diff --git a/media-plugins/vdr-alcd/Manifest b/media-plugins/vdr-alcd/Manifest
index f27a016c06cf..c9209bdefe7a 100644
--- a/media-plugins/vdr-alcd/Manifest
+++ b/media-plugins/vdr-alcd/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX vdr-alcd-1.5.1-gcc-4.4.diff 963 RMD160 b87a7bbdafdc5b5b7154b8da2b8891c6f59918c7 SHA1 6075b6c0d31c2ae4c37971fcd62a6200029da1dd SHA256 afb0353956f4a9cdf7b7a222928aa88cf579fde01ea80968485f5a99a1c054b9
+AUX vdr-alcd-1.5.1-makefile-cleanup.diff 1001 RMD160 3e4f051a86869960476b65f3c3d8ad852aa07efa SHA1 114244e1686fc05d88884c948fec28ef1d690a16 SHA256 fdd6e155f2b971e2f07a6f15750e56eb160199696e8dd235f5cad7d6b46e05ee
 DIST vdr-alcd-1.0.0.tgz 22425 RMD160 164f0785cc8cb9234befeecf941db65be4eee255 SHA1 0f75bcef7a3d59cc21c2353fd7d5b17291e39767 SHA256 7bd893b9b8e2e28eedd9a0d58e0b18232bb7eb654eff2ec1f6ec39edeab608a7
-EBUILD vdr-alcd-1.0.0.ebuild 467 RMD160 5a0599f7fb39ba3bfbd61d6840e659baf565f15d SHA1 0a64fe6eb5b0584f54ebc0399beba23b111f7d17 SHA256 be754352ef451b94f1ad0303631d3b7c134a03f734dc5ebab0f469b4d4059b64
-MISC ChangeLog 477 RMD160 3316022d79dc19895482f99448e4213fc748fd93 SHA1 80a60e18e0a0b30c029c0b0dfa4654271277edc1 SHA256 654f07b6b0039b2995b3c152a841fc73698a930d0e05fad5af3545a0797fac36
-MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+DIST vdr-alcd-1.5.1.tgz 40104 RMD160 eee8c228d86a36b1d66e01a6b911c499d58f5eb8 SHA1 babc0fd9cadbca54b8fa7e8b7c9243ee48d74b39 SHA256 9643d9f1214c33c8e5743e715b0e8c9a476e2df6f41f077bcf297ab03a33fe49
+EBUILD vdr-alcd-1.0.0.ebuild 488 RMD160 74cc802c8d57357451be0ee027591e5d84598c9d SHA1 f19d5cad78552f73abeae8b6a87d6bb8a314ddd4 SHA256 93e8a9e73d11321aec94ac17cc1f53f568002c0363bf448111d64e87d83519d2
+EBUILD vdr-alcd-1.5.1.ebuild 572 RMD160 3df2fd881d71b692836457d3bd9114a949746f2c SHA1 46609e3fc0f84e9bf3acc76442a0799e4d867393 SHA256 9cc473c85ae472de565d9c380d1bb119335a4db31a03998c31bb0aeb4107acf1
+MISC ChangeLog 769 RMD160 92466270bee077576b28b6d7dc1f1e1a268745fe SHA1 044178f7d5ad8d99c239306c24020048a2e77de8 SHA256 8046c3dcb477c20a5839221789d2d015cd069ca9fe3a11285cbbface3b07bb71
+MISC metadata.xml 494 RMD160 1c34bfba85e772b9ef716490ca4d1a1d5796ea8b SHA1 576bc6e35bf7e5489e5bb82b5f3cb2fdce4e8d5c SHA256 6c68dfc7043452ead2de52811ba06af2509b3ddb7e20721703228521b333c1b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko0uGYACgkQt2vP6XvVdOfG3ACg1PvRk1sd7ZpLstNkAEPr7Qse
+9D4An1W1ft436Lqd7iT7jEJ9Tlq3HluL
+=5jUS
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-gcc-4.4.diff b/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-gcc-4.4.diff
new file mode 100644
index 000000000000..a4465220534a
--- /dev/null
+++ b/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-gcc-4.4.diff
@@ -0,0 +1,22 @@
+Index: alcd-1.5.1/thread.c
+===================================================================
+--- alcd-1.5.1.orig/thread.c
++++ alcd-1.5.1/thread.c
+@@ -104,7 +104,7 @@ void cLCD::SetText( const char *szText )
+    // only proceed, if valid data
+    if( szText != NULL && strlen( szText ) > 0 ) {
+       // set channel name
+-      char *delim = strchr( szText, '|' );
++      const char *delim = strchr( szText, '|' );
+       if( delim ) {
+          char buffer[ BUFSIZE ];
+          int sLen = ( delim - szText ) >= BUFSIZE ? BUFSIZE : ( delim - szText );
+@@ -420,7 +420,7 @@ void cLCD::Replaying( const cControl *co
+                if( szFileName[i] == ')' )
+                   strncpy( (char *)szReplayMode, szFileName + 8, i - 8 );
+             }
+-            char *p = strstr( szFileName + i, " : " );
++            const char *p = strstr( szFileName + i, " : " );
+             if( p )
+                strncpy( szTemp, p + 3, sizeof(szTemp ));
+             else
diff --git a/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-makefile-cleanup.diff b/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-makefile-cleanup.diff
new file mode 100644
index 000000000000..ea1488e40b0f
--- /dev/null
+++ b/media-plugins/vdr-alcd/files/vdr-alcd-1.5.1-makefile-cleanup.diff
@@ -0,0 +1,44 @@
+Index: alcd-1.5.1/Makefile
+===================================================================
+--- alcd-1.5.1.orig/Makefile
++++ alcd-1.5.1/Makefile
+@@ -23,8 +23,8 @@ VDRINC = $(VDRDIR)/include
+ LIBDIR = ../../lib
+ TMPDIR = /tmp
+ 
+-CXX      = g++
+-CXXFLAGS = -O2 -Wall -Woverloaded-virtual -D_GNU_SOURCE
++CXX      ?= g++
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+ 
+ -include $(VDRDIR)/Make.config
+ 
+@@ -41,6 +41,8 @@ PACKAGE = vdr-$(ARCHIVE)
+ 
+ INCLUDES = -I$(VDRDIR)/include
+ 
++DEFINES += -D_GNU_SOURCE
++
+ ### Allow user defined options to overwrite defaults:
+ 
+ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+@@ -53,6 +55,10 @@ endif
+ 
+ OBJS = $(PLUGIN).o lcd.o thread.o setup.o
+ 
++### The main target:
++
++all: libvdr-$(PLUGIN).so i18n
++
+ ### Target directory for afp-tool binary
+ 
+ PREFIX = /usr
+@@ -100,8 +106,6 @@ i18n: $(I18Nmsgs)
+ 
+ ### Targets:
+ 
+-all: libvdr-$(PLUGIN).so i18n
+-
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+ 	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
diff --git a/media-plugins/vdr-alcd/metadata.xml b/media-plugins/vdr-alcd/metadata.xml
index d1b88e6872a7..36a8ab76a77e 100644
--- a/media-plugins/vdr-alcd/metadata.xml
+++ b/media-plugins/vdr-alcd/metadata.xml
@@ -3,10 +3,16 @@
 <pkgmetadata>
 <herd>media-tv</herd>
 <maintainer>
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
+  <email>vdr@gentoo.org</email>
+  <name>Gentoo VDR Project</name>
+</maintainer>
+<maintainer>
+  <email>vdr@helmutauer.de</email>
+  <name>Helmut Auer</name>
+  <description>Upstream maintainer</description>
 </maintainer>
 <longdescription lang="en">
+VDR plugin: Control the LCD of the Siemens Activy 300
 </longdescription>
 </pkgmetadata>
 
diff --git a/media-plugins/vdr-alcd/vdr-alcd-1.0.0.ebuild b/media-plugins/vdr-alcd/vdr-alcd-1.0.0.ebuild
index 9c66656542e9..5ccf96537bb4 100644
--- a/media-plugins/vdr-alcd/vdr-alcd-1.0.0.ebuild
+++ b/media-plugins/vdr-alcd/vdr-alcd-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-alcd/vdr-alcd-1.0.0.ebuild,v 1.1 2006/05/15 09:19:32 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-alcd/vdr-alcd-1.0.0.ebuild,v 1.2 2009/06/14 08:44:13 zzam Exp $
 
 IUSE=""
 inherit vdr-plugin
@@ -14,3 +14,5 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=media-video/vdr-1.2.6"
+RDEPEND="${DEPEND}"
+
diff --git a/media-plugins/vdr-alcd/vdr-alcd-1.5.1.ebuild b/media-plugins/vdr-alcd/vdr-alcd-1.5.1.ebuild
new file mode 100644
index 000000000000..22d823bb0521
--- /dev/null
+++ b/media-plugins/vdr-alcd/vdr-alcd-1.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-alcd/vdr-alcd-1.5.1.ebuild,v 1.1 2009/06/14 08:44:13 zzam Exp $
+
+IUSE=""
+inherit vdr-plugin
+
+DESCRIPTION="VDR plugin: Control Activy 300 LCD"
+HOMEPAGE="http://www.htpc-forum.de"
+SRC_URI="http://www.htpc-forum.de/download/${P}.tgz"
+
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=media-video/vdr-1.6.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=("${FILESDIR}/${P}-makefile-cleanup.diff"
+	"${FILESDIR}/${P}-gcc-4.4.diff")