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

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index c28a5bd740d046c7d05b5f5522443f3ca2635136..ca5386ac6966ecc70a9682390dfc9c86b43ee689 100644 (file)
--- 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/Manifest b/app-misc/lcd4linux/Manifest
index 4fed42364924586f14bbe1e5833aa6045ed4464d..caa39cbe01a78cf99cd115eb03a38bc278a11aee 100644 (file)
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,28 +1,32 @@
 -----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.10.0-gcc4-compat.patch 1062 RMD160 9d1cfbd4bdcab36712e91054ffe738efb154f75e SHA1 00486e55acb1c7e8bf223ec812cd41f90463f5fe SHA256 4e10734eb528a0b1f29bb2860c5ecbfdf09eeb955f7905e960bfbbda92efce4a
+MD5 ee1bd63f943879b8a0d38273fc12922d files/lcd4linux-0.10.0-gcc4-compat.patch 1062
+RMD160 9d1cfbd4bdcab36712e91054ffe738efb154f75e files/lcd4linux-0.10.0-gcc4-compat.patch 1062
+SHA256 4e10734eb528a0b1f29bb2860c5ecbfdf09eeb955f7905e960bfbbda92efce4a files/lcd4linux-0.10.0-gcc4-compat.patch 1062
+AUX lcd4linux-0.10.0-kernel2.6.19.patch 412 RMD160 abf01325ffa51e0dbeb3b044c8c59659d1d5b4ea SHA1 fc50cc9e2a20beb18a43aa37959cb84566595ca7 SHA256 66b077e6a98aa679e31f5346d428734bf8d584edef0f0db015a0630cd161ec48
+MD5 caf89e4008f3326f1b5528e2ca4752fb files/lcd4linux-0.10.0-kernel2.6.19.patch 412
+RMD160 abf01325ffa51e0dbeb3b044c8c59659d1d5b4ea files/lcd4linux-0.10.0-kernel2.6.19.patch 412
+SHA256 66b077e6a98aa679e31f5346d428734bf8d584edef0f0db015a0630cd161ec48 files/lcd4linux-0.10.0-kernel2.6.19.patch 412
 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 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.10.0.ebuild 3003 RMD160 2d6a5bdf381532160b261023f008304f71d593b3 SHA1 b7828dae1097210ef52638a9f855fad63b6c720c SHA256 4410080a972c9927950e67fefee178929db629410b05d3963e34cc80c496170f
+MD5 18c0612cedcfbfd4aed21e1bbd60514c lcd4linux-0.10.0.ebuild 3003
+RMD160 2d6a5bdf381532160b261023f008304f71d593b3 lcd4linux-0.10.0.ebuild 3003
+SHA256 4410080a972c9927950e67fefee178929db629410b05d3963e34cc80c496170f lcd4linux-0.10.0.ebuild 3003
 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 ChangeLog 3594 RMD160 e9c76030a47ad99aac55b13daf02e7da9d6b316f SHA1 4f73a16cb38ce6ad71e265fb77079953ee4f9227 SHA256 639afecee7a3a811337bb141a335aefa4c6aaa07d0b83bee1eeb4ba34f7c160c
+MD5 34a9cd09e150acacec83b370a9ac1244 ChangeLog 3594
+RMD160 e9c76030a47ad99aac55b13daf02e7da9d6b316f ChangeLog 3594
+SHA256 639afecee7a3a811337bb141a335aefa4c6aaa07d0b83bee1eeb4ba34f7c160c ChangeLog 3594
 MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a
 MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
@@ -34,9 +38,9 @@ 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)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFdqoRz974XjDVpbkRAnHPAJ4xp8jOYfFmpLwF4IzuH+xBpWUNygCguEnQ
-yfspWR5u6X2CcRJfI140Epw=
-=sKbF
+iD8DBQFFiCdaz974XjDVpbkRAoMaAJ4+rmFsC2oOcvFBHBlirUOXYkrUQACfYATu
+8n0cZmLnPsuBCs3V5hox9H4=
+=fT3r
 -----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
index bde3b620908f402886d0e87043dce55f2615b85d..1149ae640eb21c7cac88efdd6ef0d87cb4865548 100644 (file)
--- 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,19 +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: 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;
@@ -38,19 +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: 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.
   */

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 (file)
index 0000000..9738014
--- /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 f6318cb76185d6ce9704293b44315a7fb60ce117..7651003453b20e74387db1fed2b8ee88f24d7dad 100644 (file)
--- 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
 }
-