Fix bug #158390 and add new dependency to serdisp, thanks to Robert Buchholz

(Portage version: 2.1.2_rc3-r6)

4 files changed, 27 insertions, 41 deletions

diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index c28a5bd740d0..ca5386ac6966 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.19 2006/12/06 11:31:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.20 2006/12/19 17:54:25 jokey Exp $
+
+  18 Dec 2006; Markus Ullmann <jokey@gentoo.org>
+  files/lcd4linux-0.10.0-gcc4-compat.patch,
+  +files/lcd4linux-0.10.0-kernel2.6.19.patch, lcd4linux-0.10.0.ebuild:
+  Fix bug #158390 and add new dependency to serdisp, thanks to Robert Buchholz
 
   06 Dec 2006; Markus Ullmann <jokey@gentoo.org>
   +files/lcd4linux-0.10.0-gcc4-compat.patch, lcd4linux-0.9.11.ebuild,
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
index f5e3f6ce8d73..1149ae640eb2 100644
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch
@@ -3,23 +3,6 @@ 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: lcd4linux-0.10.0-gcc4-compat.patch,v $
-  * Revision 1.1  2006/12/06 11:31:16  jokey
-  * Fix for bug #147388 thanks to rbu for providing the patch and HOMEPAGE update
-  * (Portage version: 2.1.2_rc2-r5)
-  *
-+ * 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;
@@ -42,23 +25,6 @@ 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: lcd4linux-0.10.0-gcc4-compat.patch,v $
-  * Revision 1.1  2006/12/06 11:31:16  jokey
-  * Fix for bug #147388 thanks to rbu for providing the patch and HOMEPAGE update
-  * (Portage version: 2.1.2_rc2-r5)
-  *
-+ * 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.
   */
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch
new file mode 100644
index 000000000000..9738014d3af8
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch
@@ -0,0 +1,13 @@
+patch by Guillaume Lecerf <foxcore@gmail.com> 
+see http://sourceforge.net/mailarchive/message.php?msg_id=37594448
+
+--- lcd4linux-0.10.0.orig/plugin_wireless.c	2006-12-04 18:11:41.000000000 +0100
++++ lcd4linux-0.10.0/plugin_wireless.c	2006-12-04 18:12:01.000000000 +0100
+@@ -92,6 +92,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <net/if_arp.h>
++#include <linux/if.h>
+ #include <linux/wireless.h>
+ #include <math.h>
+ 
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
index f6318cb76185..7651003453b2 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.0.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/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild,v 1.5 2006/12/06 11:31:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.0.ebuild,v 1.6 2006/12/19 17:54:25 jokey Exp $
 
 inherit eutils
 
@@ -12,12 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 # contains x86 asm, upstream is working on a portable version
 KEYWORDS="~x86"
-IUSE="kde png X usb mysql python"
+IUSE="kde png serdisp X usb mysql python"
 
 DEPEND="png? ( media-libs/libpng
 	media-libs/gd )
 	X? ( x11-libs/libX11 )
 	usb? ( dev-libs/libusb )
+	serdisp? ( dev-libs/serdisplib )
 	mysql? ( virtual/mysql )"
 #		python? ( dev-lang/python )
 # mpd is needed soon
@@ -32,6 +33,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-kernel2.6.19.patch"
 	epatch "${FILESDIR}/${P}-gcc4-compat.patch"
 }
 
@@ -61,9 +63,10 @@ src_compile() {
 		einfo "Active drivers (overridden): ${myd}"
 	else
 		myd="all"
-		use usb || myd="${myd},!USBLCD"
-		use png || myd="${myd},!PNG"
-		use X || myd="${myd},!X11"
+		use serdisp || myd="${myd},!serdisplib"
+		use usb     || myd="${myd},!USBLCD"
+		use png     || myd="${myd},!PNG"
+		use X       || myd="${myd},!X11"
 		einfo "Active drivers: ${myd}"
 	fi
 
@@ -113,4 +116,3 @@ src_install() {
 	insopts -o root -g root -m 0600
 	newins lcd4linux.conf.sample lcd4linux.conf
 }
-