Fix for bug #147388 thanks to rbu for providing the patch and HOMEPAGE update

Package-Manager: portage-2.1.2_rc2-r5

5 files changed, 108 insertions, 21 deletions

diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index 79342ce02311..c28a5bd740d0 100644
--- a/app-misc/lcd4linux/ChangeLog
+++ b/app-misc/lcd4linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lcd4linux
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.18 2006/11/23 15:42:47 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.19 2006/12/06 11:31:16 jokey Exp $
+
+  06 Dec 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/lcd4linux-0.10.0-gcc4-compat.patch, lcd4linux-0.9.11.ebuild,
+  lcd4linux-0.10.0.ebuild:
+  Fix for bug #147388 thanks to rbu for providing the patch and HOMEPAGE update
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> lcd4linux-0.10.0.ebuild:
   dev-db/mysql => virtual/mysql
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 2667f53ad6b1..4fed42364924 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,21 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX lcd4linux-0.10.0-gcc4-compat.patch 2340 RMD160 950c6136274023768254a2c4f99eb81ad3151052 SHA1 458de2a09d4a7d0e4caa7a88d6af43d2cc6b3e8d SHA256 0d895a2e0e1b79936047763f5b44c532034e17249a7d2ad599fde8d60bec75d3
+MD5 14eda3a02aa51ce2db5e016cc565a7a3 files/lcd4linux-0.10.0-gcc4-compat.patch 2340
+RMD160 950c6136274023768254a2c4f99eb81ad3151052 files/lcd4linux-0.10.0-gcc4-compat.patch 2340
+SHA256 0d895a2e0e1b79936047763f5b44c532034e17249a7d2ad599fde8d60bec75d3 files/lcd4linux-0.10.0-gcc4-compat.patch 2340
 AUX lcd4linux-0.9.11-modular-x.patch 511 RMD160 eea3d8d972e4c8d51f0bd2a386fde2ce1f1b2a81 SHA1 62b23be4a3a9c84709b1f5e35fa382cab17bc5e5 SHA256 170c44c963a14d73974f910e6fd3b58c3cb7adbae1155b5b494f0c8253894c10
 MD5 6ede29698c02eb80e3d9561bfa951681 files/lcd4linux-0.9.11-modular-x.patch 511
 RMD160 eea3d8d972e4c8d51f0bd2a386fde2ce1f1b2a81 files/lcd4linux-0.9.11-modular-x.patch 511
 SHA256 170c44c963a14d73974f910e6fd3b58c3cb7adbae1155b5b494f0c8253894c10 files/lcd4linux-0.9.11-modular-x.patch 511
 DIST lcd4linux-0.10.0.tar.gz 294851 RMD160 98f810297de3d746d559998516b83a2939fc8568 SHA1 325d8549c83bb62e31492285001a1007d1f9960b SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909
 DIST lcd4linux-0.9.11.tar.gz 218557 RMD160 55257d7c5951938ce7a1b878935139e436514ef0 SHA1 9dec2d2b8d236adba59d531f1167fab295f0c1b0 SHA256 7d90fd3fbd5907c1db56f78b88eddaf80cef9b2012214ad3118f9b6f72c35627
-EBUILD lcd4linux-0.10.0.ebuild 2779 RMD160 2296f78d0ef794f91413ba51a0116cc242e15ac9 SHA1 71b3bdc34b1746d1fcbeca1bc75ff8b4343575d7 SHA256 0e05cb55757bf249208bb07f7a6a682a3f3ee4de060ac93840e9b65a455525fc
-MD5 fe89b4f6ff9f7203d74f929c3f657c7c lcd4linux-0.10.0.ebuild 2779
-RMD160 2296f78d0ef794f91413ba51a0116cc242e15ac9 lcd4linux-0.10.0.ebuild 2779
-SHA256 0e05cb55757bf249208bb07f7a6a682a3f3ee4de060ac93840e9b65a455525fc lcd4linux-0.10.0.ebuild 2779
-EBUILD lcd4linux-0.9.11.ebuild 1588 RMD160 684c977006a5968259562348f93f4dd319c2bbd5 SHA1 e339b60f166ee2191d67644685d3e1e3f9aa2412 SHA256 912bb5b842dbe8c2770e1b35301a5f31facbe4565e6c1ca0cfefdcc47da282af
-MD5 e9bd2a2f5f85ac93b7dde4145ff46cb0 lcd4linux-0.9.11.ebuild 1588
-RMD160 684c977006a5968259562348f93f4dd319c2bbd5 lcd4linux-0.9.11.ebuild 1588
-SHA256 912bb5b842dbe8c2770e1b35301a5f31facbe4565e6c1ca0cfefdcc47da282af lcd4linux-0.9.11.ebuild 1588
-MISC ChangeLog 3122 RMD160 460ae42d3b89bac83ba796ff02b9b31f27c59224 SHA1 c3d73f2228cbb0b39ebd354538544ae27262646f SHA256 7ea43989e09d61e21f777ada231c22e0103754a71b1895a8f8c649add624c522
-MD5 00b9f12ba8baae9ea04110b43ff0326b ChangeLog 3122
-RMD160 460ae42d3b89bac83ba796ff02b9b31f27c59224 ChangeLog 3122
-SHA256 7ea43989e09d61e21f777ada231c22e0103754a71b1895a8f8c649add624c522 ChangeLog 3122
+EBUILD lcd4linux-0.10.0.ebuild 2860 RMD160 9000e2422ed9b1cb2c69c5b53d9cf78dfcb2574b SHA1 67d8edcd3a92d42f20c04fe0e740681f8c24a701 SHA256 cb4c0e46d5d322a4e2284a1fe3ff7234b0c10677a0a6523d2f9b30c8daa83495
+MD5 fe42a836ba0a86165098c0093c25f4c9 lcd4linux-0.10.0.ebuild 2860
+RMD160 9000e2422ed9b1cb2c69c5b53d9cf78dfcb2574b lcd4linux-0.10.0.ebuild 2860
+SHA256 cb4c0e46d5d322a4e2284a1fe3ff7234b0c10677a0a6523d2f9b30c8daa83495 lcd4linux-0.10.0.ebuild 2860
+EBUILD lcd4linux-0.9.11.ebuild 1595 RMD160 0b3242de520bfb55da8a4449cd6d763a5421e27f SHA1 1e8ac030489ff68ba95ab8755a68d4d470a2d36a SHA256 4cc86a3b8cff9bf3159e5be4d2f60bf253ba88e8b68d2e18f62de808561972a4
+MD5 4bd6a99c5ba204df69ff59638ad2898b lcd4linux-0.9.11.ebuild 1595
+RMD160 0b3242de520bfb55da8a4449cd6d763a5421e27f lcd4linux-0.9.11.ebuild 1595
+SHA256 4cc86a3b8cff9bf3159e5be4d2f60bf253ba88e8b68d2e18f62de808561972a4 lcd4linux-0.9.11.ebuild 1595
+MISC ChangeLog 3350 RMD160 7223fccaa9d285c2b76f7173c2d532b1e0d3285f SHA1 6cbbf8c9250c20bb11ed7c0fbb59df9434782cdc SHA256 8dd1f540d4cde75581fe280bea26892ec628f26cf3eb714c804aa55a976f551b
+MD5 37962a7d0250d36607f5364738051faf ChangeLog 3350
+RMD160 7223fccaa9d285c2b76f7173c2d532b1e0d3285f ChangeLog 3350
+SHA256 8dd1f540d4cde75581fe280bea26892ec628f26cf3eb714c804aa55a976f551b ChangeLog 3350
 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a
 MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
@@ -26,3 +33,10 @@ SHA256 4c83e624811751fc7f8241bb9f0a7b904460fa18841ebce93b464c7858988afd files/di
 MD5 13ed5c0953ded79c7f0bec71639165d3 files/digest-lcd4linux-0.9.11 250
 RMD160 eda6875e2399a5a0dbd6e524ad54dc9eff4d64a5 files/digest-lcd4linux-0.9.11 250
 SHA256 35fd2911bf35973aa9b05f59c3b40d7637d4d89eb9ce4630fab451816619ce9d files/digest-lcd4linux-0.9.11 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFdqoRz974XjDVpbkRAnHPAJ4xp8jOYfFmpLwF4IzuH+xBpWUNygCguEnQ
+yfspWR5u6X2CcRJfI140Epw=
+=sKbF
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch
new file mode 100644
index 000000000000..bde3b620908f
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch
@@ -0,0 +1,60 @@
+GCC4 fixes, see bug #147388.
+Patch from upstream SVN
+
+--- /trunk/drv_SimpleLCD.c (revision 547)
++++ /trunk/drv_SimpleLCD.c (revision 581)
+@@ -1,3 +1,3 @@
+-/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $
++/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $
+  * 
+  * driver for a simple serial terminal.
+@@ -23,4 +23,7 @@
+  *
+  * $Log: not supported by cvs2svn $
++ * Revision 1.5  2005/07/06 04:40:18  reinelt
++ * GCC-4 fixes
++ *
+  * Revision 1.4  2005/05/08 04:32:44  reinelt
+  * CodingStyle added and applied
+@@ -199,4 +202,5 @@
+ {
+     int rows = -1, cols = -1;
++    int value;
+     unsigned int flags = 0;
+     char *s;
+@@ -210,7 +214,8 @@
+     }
+ 
+-    cfg_number(section, "BarCharValue", 0, 0, 255, &flags);
+-    bar_char = flags;
+-    cfg_number(section, "Options", 0, 0, 0xffff, &flags);
++    cfg_number(section, "BarCharValue", 0, 0, 255, &value);
++    bar_char = value;
++    cfg_number(section, "Options", 0, 0, 0xffff, &value);
++    flags = value;
+     if (drv_generic_serial_open(section, Name, flags) < 0)
+ 	return -1;
+Index: /trunk/lcd4linux_i2c.h
+===================================================================
+--- /trunk/lcd4linux_i2c.h (revision 562)
++++ /trunk/lcd4linux_i2c.h (revision 581)
+@@ -1,3 +1,3 @@
+-/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $
++/* $Id: lcd4linux-0.10.0-gcc4-compat.patch,v 1.1 2006/12/06 11:31:16 jokey Exp $
+  *
+  * user space i2c sturctures and defines, taken from the official kernel i2c 
+@@ -33,4 +33,7 @@
+  *
+  * $Log: not supported by cvs2svn $
++ * Revision 1.3  2005/07/06 04:40:18  reinelt
++ * GCC-4 fixes
++ *
+  * Revision 1.2  2005/06/01 12:09:13  reinelt
+  * removed ^M from lcd4linux_i2c.h; indent.sh run
+@@ -79,5 +82,5 @@
+ /* Transfer num messages.
+  */
+-extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num);
++extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num);
+ 
+ /*
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
index 1a80bc8b1004..f6318cb76185 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild,v 1.4 2006/11/23 15:42:47 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild,v 1.5 2006/12/06 11:31:16 jokey Exp $
 
-#inherit eutils
+inherit eutils
 
 DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
 HOMEPAGE="http://ssl.bulix.org/projects/lcd4linux/"
@@ -15,10 +15,10 @@ KEYWORDS="~x86"
 IUSE="kde png X usb mysql python"
 
 DEPEND="png? ( media-libs/libpng
-			   media-libs/gd )
-		X? ( x11-libs/libX11 )
-		usb? ( dev-libs/libusb )
-		mysql? ( virtual/mysql )"
+	media-libs/gd )
+	X? ( x11-libs/libX11 )
+	usb? ( dev-libs/libusb )
+	mysql? ( virtual/mysql )"
 #		python? ( dev-lang/python )
 # mpd is needed soon
 # python is broken
@@ -28,6 +28,13 @@ pkg_preinst() {
 	einfo "the LCD4LINUX_PLUGINS and LCD4LINUX_DRIVERS environment variables."
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc4-compat.patch"
+}
+
 src_compile() {
 	local myconf myp myd
 
@@ -106,3 +113,4 @@ src_install() {
 	insopts -o root -g root -m 0600
 	newins lcd4linux.conf.sample lcd4linux.conf
 }
+
diff --git a/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild b/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
index 5a90ed169454..d60e8643220a 100644
--- a/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild,v 1.11 2006/10/31 22:20:25 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.9.11.ebuild,v 1.12 2006/12/06 11:31:16 jokey Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 inherit eutils autotools
 
 DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
-HOMEPAGE="http://lcd4linux.sourceforge.net/"
+HOMEPAGE="http://ssl.bulix.org/projects/lcd4linux/"
 SRC_URI="mirror://sourceforge/lcd4linux/${P}.tar.gz"
 
 LICENSE="GPL-2"