Version bump introducing new devices and some client fixes, Moved patches to distfiles and dropped 0.5.1-r3

Package-Manager: portage-2.1.2.2

12 files changed, 88 insertions, 631 deletions

diff --git a/app-misc/lcdproc/ChangeLog b/app-misc/lcdproc/ChangeLog
index 5cff0c413766..8b23266124af 100644
--- a/app-misc/lcdproc/ChangeLog
+++ b/app-misc/lcdproc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/lcdproc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.53 2007/05/01 10:34:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.54 2007/05/06 21:26:27 rbu Exp $
+
+*lcdproc-0.5.2 (06 May 2007)
+
+  06 May 2007; Robert Buchholz <rbu@gentoo.org>
+  -files/0.5.1-as-needed.patch, -files/0.5.1-nested-functions.patch,
+  -files/0.5.1-g15daemon-1.9.patch, -files/0.5.1-serialvfd-parallel.patch,
+  metadata.xml, -lcdproc-0.5.1-r3.ebuild, lcdproc-0.5.1-r4.ebuild,
+  +lcdproc-0.5.2.ebuild:
+  Version bump introducing new devices and some client fixes
+  Moved patches to distfiles and dropped 0.5.1-r3
 
   01 May 2007; Markus Rothe <corsair@gentoo.org> lcdproc-0.5.1-r4.ebuild:
   Stable on ppc64; bug #175120
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index d3ffe6580203..5c0b5c183e3b 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.4.5-LCDd.initd 555 RMD160 5d82e6aafaeab58588b379815f414626c036712e SHA1 2f1c64df8bf4a34fed4dac76766a60dcaa912aeb SHA256 b3dbc3e2d2d59fc49d6585ac8c0336e19eb470ce9a489816ec7a4d792c0b09c2
 MD5 ec67bd2648306d6aab4492b58a636502 files/0.4.5-LCDd.initd 555
 RMD160 5d82e6aafaeab58588b379815f414626c036712e files/0.4.5-LCDd.initd 555
@@ -10,54 +13,48 @@ AUX 0.5.1-LCDd.initd 645 RMD160 69b059023b665ecfcce9306dd9be2933da38b12a SHA1 85
 MD5 cce5adc33e6e671cede2f8f58337a6ac files/0.5.1-LCDd.initd 645
 RMD160 69b059023b665ecfcce9306dd9be2933da38b12a files/0.5.1-LCDd.initd 645
 SHA256 782142cc26b433bbfe1ac1ae152a8ecf62985e78c03e674f699f76847e6465b6 files/0.5.1-LCDd.initd 645
-AUX 0.5.1-as-needed.patch 2683 RMD160 efd047eae0615d50cc38a689637a5e71a85c93bf SHA1 56e7a18617c870bb1d84a3b09ab9ce370b9766cc SHA256 1ed27f3dd00031499a80d3d0e2ab35b0b35c2f90a6aa7530913c7f87acae70e0
-MD5 0af610c21e75fe504a3b9cdc3bd56560 files/0.5.1-as-needed.patch 2683
-RMD160 efd047eae0615d50cc38a689637a5e71a85c93bf files/0.5.1-as-needed.patch 2683
-SHA256 1ed27f3dd00031499a80d3d0e2ab35b0b35c2f90a6aa7530913c7f87acae70e0 files/0.5.1-as-needed.patch 2683
-AUX 0.5.1-g15daemon-1.9.patch 2090 RMD160 11f1b7a2848d988a523ee3785f6a9e41a79d6ad1 SHA1 1df6352c62eb60ef89dc0a4baca31262eb22b3b5 SHA256 5a455e15ef0ea17033d98e73933241e9e5de2b9daa00d2fbf59ee2cdf04c7b7c
-MD5 0690e644d92f6d41419cb7d1449d9f23 files/0.5.1-g15daemon-1.9.patch 2090
-RMD160 11f1b7a2848d988a523ee3785f6a9e41a79d6ad1 files/0.5.1-g15daemon-1.9.patch 2090
-SHA256 5a455e15ef0ea17033d98e73933241e9e5de2b9daa00d2fbf59ee2cdf04c7b7c files/0.5.1-g15daemon-1.9.patch 2090
 AUX 0.5.1-lcdproc.initd 480 RMD160 27bea68560caee6e23e2d1742eff5fe01627602a SHA1 b471457107dcea79be328a6856a1111af63debf6 SHA256 0db323adbebad0cac3dc9cb9fa28788546dc9b8b620e4e4f7332f5d98e77409f
 MD5 f7fa34302843a0cd4980466fc3dbda1a files/0.5.1-lcdproc.initd 480
 RMD160 27bea68560caee6e23e2d1742eff5fe01627602a files/0.5.1-lcdproc.initd 480
 SHA256 0db323adbebad0cac3dc9cb9fa28788546dc9b8b620e4e4f7332f5d98e77409f files/0.5.1-lcdproc.initd 480
-AUX 0.5.1-nested-functions.patch 4239 RMD160 57d9d252bd532bd3c81bcb23ca6924cebfd8e68d SHA1 8c68debf5087e10ad3c589831d4a9fd2779ff2e8 SHA256 17cc15a3ed6a749a47d1c745c630ff4b7d4debe96cd86c34621ba918b371b4a5
-MD5 9195ffee346db6c65bb71344112e81c9 files/0.5.1-nested-functions.patch 4239
-RMD160 57d9d252bd532bd3c81bcb23ca6924cebfd8e68d files/0.5.1-nested-functions.patch 4239
-SHA256 17cc15a3ed6a749a47d1c745c630ff4b7d4debe96cd86c34621ba918b371b4a5 files/0.5.1-nested-functions.patch 4239
-AUX 0.5.1-serialvfd-parallel.patch 9495 RMD160 32239e6dbaea8b2f5c4736f8fcd4e6646daa1b1a SHA1 21d4f4373f5790e8ba04bc5cff427f65c5590637 SHA256 a2410f993193338b1e490d8c272f8e447c8de740e3282c405676b40e88e366d5
-MD5 e1fc2b23bb01656e78748ec6ba0cd4ab files/0.5.1-serialvfd-parallel.patch 9495
-RMD160 32239e6dbaea8b2f5c4736f8fcd4e6646daa1b1a files/0.5.1-serialvfd-parallel.patch 9495
-SHA256 a2410f993193338b1e490d8c272f8e447c8de740e3282c405676b40e88e366d5 files/0.5.1-serialvfd-parallel.patch 9495
 DIST lcdproc-0.4.5.tar.bz2 291703 RMD160 07067bfb681a098494a105a290711d973ea0171a SHA1 9680b83d18da8569e8f58d6d0b7b0158f543c94d SHA256 8707767a1ddf85b7894f4f62d9af53121fefff4ab8182eb9491b49a6d56b8127
+DIST lcdproc-0.5.1-patches.tar.gz 5936 RMD160 c2dcf9e5f0e3b637c249b9b2252e27d9f51ac8ad SHA1 4f6bab3717b8c288c485b63f0c9bf0ddca39aa3b SHA256 5deb2d7ba524c3ebb1dba2ceb74a68839c1723b297d603de85e8c3046b57afce
 DIST lcdproc-0.5.1.tar.gz 800205 RMD160 2672f660afac8437a9b6a1791bff80466cdfde64 SHA1 9f2628a6e55f930d5eeaf99ed999ecf83e3ea78c SHA256 f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727
+DIST lcdproc-0.5.2-patches.tar.gz 6571 RMD160 31b4534ea0fe2d58b52bb1dda76f0b728abdb916 SHA1 3dee4d57366eac2603656557d7ff8a6beb27249d SHA256 b578bbb2e0e1adabfd8eda2101d9023652c8d3c112d7dc78fb77026d5f2db13d
+DIST lcdproc-0.5.2.tar.gz 822695 RMD160 73c275cc00f06dc256267e87e1c3b1dcac172fb1 SHA1 924fca84eb5a07464a3d38df86d9a4427fd06dd7 SHA256 3261910dd9155229a2a6067c82ec4cca0d7900420f2d74c87a24b41b9b961036
 EBUILD lcdproc-0.4.5.ebuild 2674 RMD160 cd6f848de9b5ebae191d83ccb9e8e58ff88de3b0 SHA1 5db2b5b1594efdc62254b75d0d38958e97737d30 SHA256 e7b9fa8ddb11969844c77546e751169fa04662eb47a6076a274e06bf171e1326
 MD5 ec8742dd9baf6c8a07c99fc99a76ec61 lcdproc-0.4.5.ebuild 2674
 RMD160 cd6f848de9b5ebae191d83ccb9e8e58ff88de3b0 lcdproc-0.4.5.ebuild 2674
 SHA256 e7b9fa8ddb11969844c77546e751169fa04662eb47a6076a274e06bf171e1326 lcdproc-0.4.5.ebuild 2674
-EBUILD lcdproc-0.5.1-r3.ebuild 5597 RMD160 5d26cb2572fb3c80ea23d21a6e6d700682b8d431 SHA1 79284ef0f5eac9715cc77c71a2a7382b79b83be8 SHA256 d2385b205a51aaaabc482bc7ca0f3357bedb9b32a6e1851cab6cfe3f79e69acd
-MD5 900ec07c26a722fdc96870d81a649ca4 lcdproc-0.5.1-r3.ebuild 5597
-RMD160 5d26cb2572fb3c80ea23d21a6e6d700682b8d431 lcdproc-0.5.1-r3.ebuild 5597
-SHA256 d2385b205a51aaaabc482bc7ca0f3357bedb9b32a6e1851cab6cfe3f79e69acd lcdproc-0.5.1-r3.ebuild 5597
-EBUILD lcdproc-0.5.1-r4.ebuild 5638 RMD160 47d0bff0512eef7018be8ef8cf7def840407f43c SHA1 03b7b62354bc4f7937f89596d00d7ef6ee444d12 SHA256 dfc3e490068282d45af1e340019138fa8c69cac37024aecca5fbfe1c76c9bc18
-MD5 57614888178e72bd5d305cf6e9ee06ea lcdproc-0.5.1-r4.ebuild 5638
-RMD160 47d0bff0512eef7018be8ef8cf7def840407f43c lcdproc-0.5.1-r4.ebuild 5638
-SHA256 dfc3e490068282d45af1e340019138fa8c69cac37024aecca5fbfe1c76c9bc18 lcdproc-0.5.1-r4.ebuild 5638
-MISC ChangeLog 9393 RMD160 bd1fc4c7d42ac18ddeff782c1de03574c34dd4bb SHA1 d56d53b300949d05e4d041d5e133dcfb49e0edcb SHA256 b78fa2ba27e6dbed2323999b208e25db2e20e4f76580d842938f4bc8f538962f
-MD5 6b253b013ea7aac107a3c9343dddf4e2 ChangeLog 9393
-RMD160 bd1fc4c7d42ac18ddeff782c1de03574c34dd4bb ChangeLog 9393
-SHA256 b78fa2ba27e6dbed2323999b208e25db2e20e4f76580d842938f4bc8f538962f ChangeLog 9393
-MISC metadata.xml 250 RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 SHA1 c212d5a20354a60471162a82c403f1a5235d1d9d SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a
-MD5 be4a34ac317e81ea820c84bc04b9c0d8 metadata.xml 250
-RMD160 4c12d132d61ab54f92cda9251bf9b6ea4b8e1b01 metadata.xml 250
-SHA256 9eb89a60b8762b32ed579ff3fb70443aba71cdc7ebd597e8714f6fafdf1b256a metadata.xml 250
+EBUILD lcdproc-0.5.1-r4.ebuild 5719 RMD160 7047bdf62bc803411408bae38b7919c025313da2 SHA1 ff944d0c6f3488b0a00f762665f6596e0434dd6e SHA256 05d37d2a105f89eb19343b7abb6226b8b8afe45ca34a747ddcd82e4112bbde75
+MD5 d01bc13080429183cdde0e61b71a36e9 lcdproc-0.5.1-r4.ebuild 5719
+RMD160 7047bdf62bc803411408bae38b7919c025313da2 lcdproc-0.5.1-r4.ebuild 5719
+SHA256 05d37d2a105f89eb19343b7abb6226b8b8afe45ca34a747ddcd82e4112bbde75 lcdproc-0.5.1-r4.ebuild 5719
+EBUILD lcdproc-0.5.2.ebuild 5497 RMD160 b8cbd4d979dc5373d6ba6df2c088bf0519aed4d5 SHA1 5bf8bccbd669468d56470d894cb55fcbd8082881 SHA256 3f901903e0413077c09e7c1a0cda608bb08315e31926c738978a3d2daa5ade49
+MD5 cc1db51d777b9d70178b9f6210ff709d lcdproc-0.5.2.ebuild 5497
+RMD160 b8cbd4d979dc5373d6ba6df2c088bf0519aed4d5 lcdproc-0.5.2.ebuild 5497
+SHA256 3f901903e0413077c09e7c1a0cda608bb08315e31926c738978a3d2daa5ade49 lcdproc-0.5.2.ebuild 5497
+MISC ChangeLog 9815 RMD160 bcd39b43103ef71a437e13397e54301debb2a364 SHA1 d46902b60028e820c5f1f931f071dcacf4f59e37 SHA256 6d629dd034d7e817d2be2e85a37097a515c7aa6b51f192cf7faac05b4ef4ca9c
+MD5 1dc2fc66f098a4897759076177ff3ac5 ChangeLog 9815
+RMD160 bcd39b43103ef71a437e13397e54301debb2a364 ChangeLog 9815
+SHA256 6d629dd034d7e817d2be2e85a37097a515c7aa6b51f192cf7faac05b4ef4ca9c ChangeLog 9815
+MISC metadata.xml 787 RMD160 2a0346bdf471c7ce023377de9ee86069597b9a82 SHA1 3e02cc8f38d5e809589fec3c68c5bf09dd7dc31c SHA256 544d5bcbaab12a5baf2da38ff75a495f005db82665f586f5a7e115be5561597f
+MD5 a0f2bbf7ffd04fe35292a525095da037 metadata.xml 787
+RMD160 2a0346bdf471c7ce023377de9ee86069597b9a82 metadata.xml 787
+SHA256 544d5bcbaab12a5baf2da38ff75a495f005db82665f586f5a7e115be5561597f metadata.xml 787
 MD5 dd73d1296a9e0c2b636f440d8ec7108c files/digest-lcdproc-0.4.5 244
 RMD160 8ac61a26eb229cd464fde4a99eae188c66cd7474 files/digest-lcdproc-0.4.5 244
 SHA256 ec3e28b7b2139bc95d6d832b07f789aa55db4f469147309e40a5c06ae587511a files/digest-lcdproc-0.4.5 244
-MD5 11d9d2dd9490ce4743643fba29935c3d files/digest-lcdproc-0.5.1-r3 241
-RMD160 a6283dd23a9e00ade61a9f86261e8b8f77b800c6 files/digest-lcdproc-0.5.1-r3 241
-SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/digest-lcdproc-0.5.1-r3 241
-MD5 11d9d2dd9490ce4743643fba29935c3d files/digest-lcdproc-0.5.1-r4 241
-RMD160 a6283dd23a9e00ade61a9f86261e8b8f77b800c6 files/digest-lcdproc-0.5.1-r4 241
-SHA256 9756a02fc35bbb6fd64b59252ad8f42b68c6994e8f45569438c739e4b48b4977 files/digest-lcdproc-0.5.1-r4 241
+MD5 afe5a861bc773b1c7694df1f74b01696 files/digest-lcdproc-0.5.1-r4 500
+RMD160 246219138b0d5eed1dd8d963d78520a5631a42c5 files/digest-lcdproc-0.5.1-r4 500
+SHA256 9dcf3a73383201e334b7cf09a8ac0327904d11306d5d0f45319f88eee615741e files/digest-lcdproc-0.5.1-r4 500
+MD5 fb73a73ae1fa446b99a8eb962aa79b45 files/digest-lcdproc-0.5.2 500
+RMD160 09ab18df14722b72e1ec1515ba29c83318bbe9da files/digest-lcdproc-0.5.2 500
+SHA256 a65cfcbf9eab9c2c383cfd1df4eb37b9b5ab7ce5460f81890bbcaaa9093983a2 files/digest-lcdproc-0.5.2 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGPkgNyZx3L/ph1soRAq9AAKD0nqVakVxWRJG5dZt+Fbk2XicfQwCeOBCl
+liVJs9EWZlp08BwiwzHZ1FU=
+=tqvm
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lcdproc/files/0.5.1-as-needed.patch b/app-misc/lcdproc/files/0.5.1-as-needed.patch
deleted file mode 100644
index bf84bb0b66f2..000000000000
--- a/app-misc/lcdproc/files/0.5.1-as-needed.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru --exclude=Makefile.in lcdproc-0.5.1-orig/clients/lcdexec/Makefile.am lcdproc-0.5.1/clients/lcdexec/Makefile.am
---- lcdproc-0.5.1-orig/clients/lcdexec/Makefile.am	2006-11-18 15:50:52.000000000 +0100
-+++ lcdproc-0.5.1/clients/lcdexec/Makefile.am	2006-11-18 16:02:48.000000000 +0100
-@@ -6,7 +6,7 @@
- 
- lcdexec_SOURCES = lcdexec.c menu.c menu.h
- 
--lcdexec_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a
-+lcdexec_LDADD = ../../shared/libLCDstuff.a @ldap_libs@  
- 
- AM_CPPFLAGS = -I$(top_srcdir) -DSYSCONFDIR=\"$(sysconfdir)\"
- 
-diff -ru --exclude=Makefile.in lcdproc-0.5.1-orig/clients/lcdproc/Makefile.am lcdproc-0.5.1/clients/lcdproc/Makefile.am
---- lcdproc-0.5.1-orig/clients/lcdproc/Makefile.am	2006-11-18 15:50:52.000000000 +0100
-+++ lcdproc-0.5.1/clients/lcdproc/Makefile.am	2006-11-18 16:04:31.000000000 +0100
-@@ -6,7 +6,7 @@
- 
- lcdproc_SOURCES = main.c main.h mode.c mode.h batt.c batt.h chrono.c chrono.h cpu.c cpu.h cpu_smp.c cpu_smp.h disk.c disk.h load.c load.h mem.c mem.h eyebox.c eyebox.h machine.h machine_Linux.c machine_OpenBSD.c machine_FreeBSD.c machine_NetBSD.c machine_Darwin.c machine_SunOS.c util.c util.h iface.c iface.h
- 
--lcdproc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a
-+lcdproc_LDADD = ../../shared/libLCDstuff.a @ldap_libs@ 
- 
- if DARWIN
- AM_LDFLAGS = -framework CoreFoundation -framework IOKit
-diff -ru --exclude=Makefile.in lcdproc-0.5.1-orig/clients/lcdvc/Makefile.am lcdproc-0.5.1/clients/lcdvc/Makefile.am
---- lcdproc-0.5.1-orig/clients/lcdvc/Makefile.am	2006-11-18 15:50:52.000000000 +0100
-+++ lcdproc-0.5.1/clients/lcdvc/Makefile.am	2006-11-18 16:05:05.000000000 +0100
-@@ -6,7 +6,7 @@
- 
- lcdvc_SOURCES = lcdvc.c lcdvc.h lcd_link.c lcd_link.h vc_link.c vc_link.h 
- 
--lcdvc_LDADD = @ldap_libs@ ../../shared/libLCDstuff.a
-+lcdvc_LDADD = ../../shared/libLCDstuff.a @ldap_libs@  
- 
- if DARWIN
- AM_LDFLAGS = -framework CoreFoundation -framework IOKit
-diff -ru --exclude=Makefile.in lcdproc-0.5.1-orig/server/Makefile.am lcdproc-0.5.1/server/Makefile.am
---- lcdproc-0.5.1-orig/server/Makefile.am	2006-11-18 15:50:52.000000000 +0100
-+++ lcdproc-0.5.1/server/Makefile.am	2006-11-18 16:07:07.000000000 +0100
-@@ -6,7 +6,7 @@
- 
- LCDd_SOURCES= client.c client.h clients.c clients.h input.c input.h main.c main.h menuitem.c menuitem.h menu.c menu.h menuscreens.c menuscreens.h parse.c parse.h render.c render.h screen.c screen.h screenlist.c screenlist.h serverscreens.c serverscreens.h sock.c sock.h widget.c widget.h drivers.c drivers.h driver.c driver.h
- 
--LDADD = @ldap_libs@ ../shared/libLCDstuff.a commands/libLCDcommands.a
-+LDADD = ../shared/libLCDstuff.a commands/libLCDcommands.a @ldap_libs@
- 
- if !DARWIN
- AM_LDFLAGS = -rdynamic -uget_args
diff --git a/app-misc/lcdproc/files/0.5.1-g15daemon-1.9.patch b/app-misc/lcdproc/files/0.5.1-g15daemon-1.9.patch
deleted file mode 100644
index 1be3d75b0fea..000000000000
--- a/app-misc/lcdproc/files/0.5.1-g15daemon-1.9.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Upstream patch by Anthony J. Mirabella for >=app-misc/g15daemon-1.9
-
-Included in >=0.5.1-r4
-
---- ./server/drivers/g15.c	2006/09/30 18:18:23	1.2
-+++ ./server/drivers/g15.c	2006/11/12 09:44:16	1.3
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <syslog.h>
- #include <sys/socket.h>
-+#include <sys/types.h>
- #include <libg15.h>
- #include <g15daemon_client.h>
- #include <libg15render.h>
-@@ -70,6 +71,7 @@
-    p->cellheight = G15_CELL_HEIGHT;
-    p->backlight_state = BACKLIGHT_ON;
-    p->g15screen_fd = 0;
-+   p->g15d_ver = g15daemon_version();
- 
-    if((p->g15screen_fd = new_g15_screen(G15_G15RBUF)) < 0)
-    {
-@@ -372,14 +374,35 @@
- MODULE_EXPORT const char * g15_get_key (Driver *drvthis)
- {
- 	PrivateData *p = drvthis->private_data;
--	
-+	int toread = 0;
- 	unsigned int key_state = 0;
--	
--	if(send(p->g15screen_fd, "k", 1, MSG_OOB)<1) /* request key status */
--        report(RPT_INFO, "%s: Error in send to g15daemon", drvthis->name);    
- 
--    	recv(p->g15screen_fd, &key_state , sizeof(key_state),0);
-+	if ((strncmp("1.2", p->g15d_ver, 3)))
-+	  {	/* other than g15daemon-1.2 (should be >=1.9) */
-+		fd_set fds;
-+		struct timeval tv;
-+		memset (&tv, 0, sizeof(struct timeval));
-+
-+		FD_ZERO(&fds);
-+		FD_SET(p->g15screen_fd, &fds);
- 	
-+		toread = select(FD_SETSIZE, &fds, NULL, NULL, &tv);
-+	  }
-+	else
-+	  {	/* g15daemon-1.2 */
-+		if(send(p->g15screen_fd, "k", 1, MSG_OOB)<1) /* request key status */
-+		  {
-+	 	  	report(RPT_INFO, "%s: Error in send to g15daemon", drvthis->name);
-+			return NULL;
-+		  }
-+		toread = 1;
-+	  }
-+	
-+	if (toread >= 1)
-+	  read(p->g15screen_fd, &key_state, sizeof(key_state));
-+	else
-+	  return NULL;
-+
- 	if (key_state & G15_KEY_G1)
- 		return "Escape";
- 	else if (key_state & G15_KEY_L1)
---- ./server/drivers/g15.h	2006/09/30 18:18:23	1.2
-+++ ./server/drivers/g15.h	2006/11/12 09:44:17	1.3
-@@ -32,6 +32,8 @@
- 	int cellwidth, cellheight;
- 	/* file descriptor for g15daemon socket */
- 	int g15screen_fd;
-+	/* g15daemon version for compatibility checks */
-+	const char *g15d_ver;
- 	/* canvas for LCD contents */
- 	g15canvas *canvas;
- 	g15canvas *backingstore;
diff --git a/app-misc/lcdproc/files/0.5.1-nested-functions.patch b/app-misc/lcdproc/files/0.5.1-nested-functions.patch
deleted file mode 100644
index c1e986a4b958..000000000000
--- a/app-misc/lcdproc/files/0.5.1-nested-functions.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-Upstream patches to avoid nested functions (which need exec. stack)
-Included in >=0.5.1-r2
-
---- ./server/parse.c	2006/04/27 15:11:00	1.21
-+++ ./server/parse.c	2006/12/09 20:52:44	1.22
-@@ -62,18 +62,6 @@
- 	int argpos = 0;
- 	CommandFunc function = NULL;
- 
--	void close_arg() {
--		if (argc >= MAX_ARGUMENTS-1) {
--			error = 1;
--		}
--		else {
--			argv[argc][argpos] = '\0';
--			argv[argc+1] = argv[argc] + argpos + 1;
--			argc++;
--			argpos = 0;
--		}
--	}
--
- 	debug( RPT_DEBUG, "%s( str=\"%.120s\", client=[%d] )", __FUNCTION__, str, c->sock );
- 
- 	/* We will create a list of strings that is shorter or equally long as
-@@ -105,7 +93,15 @@
- 			if (is_final(ch)) {
- 				if (quote)
- 					error = 2;
--				close_arg();
-+				if (argc >= MAX_ARGUMENTS-1) {
-+					error = 1;
-+				}
-+				else {
-+					argv[argc][argpos] = '\0';
-+					argv[argc+1] = argv[argc] + argpos + 1;
-+					argc++;
-+					argpos = 0;
-+				}
- 				state = ST_FINAL;
- 			}
- 			else if (ch == '\\') {
-@@ -131,7 +127,15 @@
- 			 	else {
- 			 		error = 2;
- 					/* alternative: argv[argc][argpos++] = ch; */
--			 		close_arg();
-+					if (argc >= MAX_ARGUMENTS-1) {
-+						error = 1;
-+					}
-+					else {
-+						argv[argc][argpos] = '\0';
-+						argv[argc+1] = argv[argc] + argpos + 1;
-+						argc++;
-+						argpos = 0;
-+					}
- 			 		state = ST_FINAL;
- 			 	}
- 			}
-@@ -140,11 +144,27 @@
- 			}	
- 			else if (is_closing_quote(ch, quote)) {
- 				quote = '\0';
--				close_arg();
-+				if (argc >= MAX_ARGUMENTS-1) {
-+					error = 1;
-+				}
-+				else {
-+					argv[argc][argpos] = '\0';
-+					argv[argc+1] = argv[argc] + argpos + 1;
-+					argc++;
-+					argpos = 0;
-+				}
- 				state = ST_WHITESPACE;
- 			}
- 			else if (is_whitespace(ch) && (quote == '\0')) {
--				close_arg();
-+				if (argc >= MAX_ARGUMENTS-1) {
-+					error = 1;
-+				}
-+				else {
-+					argv[argc][argpos] = '\0';
-+					argv[argc+1] = argv[argc] + argpos + 1;
-+					argc++;
-+					argpos = 0;
-+				}
- 				state = ST_WHITESPACE;
- 			}	
- 			else {
---- ./shared/configfile.c	2006/09/18 10:39:21	1.16
-+++ ./shared/configfile.c	2006/12/03 12:04:44	1.17
-@@ -49,7 +49,11 @@
- static key *find_key(section *s, const char *keyname, int skip);
- static key *add_key(section *s, const char *keyname, const char *value);
- static char get_next_char_f(FILE *f);
-+#if defined(LCDPROC_CONFIG_READ_STRING)
- static int process_config(section **current_section, char(*get_next_char)(), const char *source_descr, FILE *f);
-+#else
-+static int process_config(section **current_section, const char *source_descr, FILE *f);
-+#endif
- 
- 
- #ifdef WITH_LDAP_SUPPORT
-@@ -121,7 +125,11 @@
- 		return -1;
- 	}
- 
-+#if defined(LCDPROC_CONFIG_READ_STRING)
- 	result = process_config(&curr_section, get_next_char_f, filename, f);
-+#else
-+	result = process_config(&curr_section, filename, f);
-+#endif
- 
- 	fclose(f);
- 
-@@ -129,6 +137,7 @@
- }
- 
- 
-+#if defined(LCDPROC_CONFIG_READ_STRING)
- int config_read_string(const char *sectionname, const char *str)
- /* All the config parameters are placed in the given section in memory.*/
- {
-@@ -145,6 +154,7 @@
- 
- 	return process_config(&s, get_next_char, "command line", NULL);
- }
-+#endif
- 
- 
- /** Get string from configuration in memory.
-@@ -584,12 +594,14 @@
- }
- 
- 
-+#if defined(LCDPROC_CONFIG_READ_STRING)
- static char get_next_char_f(FILE *f)
- {
- 	int c = fgetc(f);
- 
- 	return((c == EOF) ? '\0' : c);
- }
-+#endif
- 
- 
- /* Parser states */
-@@ -614,10 +626,14 @@
- #define MAXVALUELENGTH		200
- 
- 
-+#if defined(LCDPROC_CONFIG_READ_STRING)
- static int process_config(section **current_section, char(*get_next_char)(), const char *source_descr, FILE *f)
-+#else
-+static int process_config(section **current_section, const char *source_descr, FILE *f)
-+#endif
- {
- 	int state = ST_INITIAL;
--	char ch;
-+	int ch;
- 	char sectionname[MAXSECTIONLABELLENGTH+1];
- 	int sectionname_pos = 0;
- 	char keyname[MAXKEYNAMELENGTH+1];
-@@ -629,11 +645,22 @@
- 	int line_nr = 1;
- 	int error = 0;
- 
-+#if !defined(LCDPROC_CONFIG_READ_STRING)
-+	if (f == NULL)
-+		return(0);
-+#endif
-+
- 	while (state != ST_END) {
- 
-+#if defined(LCDPROC_CONFIG_READ_STRING)
- 		ch = (f != NULL)
- 			? get_next_char(f)
- 			: get_next_char();
-+#else
-+		ch = fgetc(f);
-+		if (ch == EOF)
-+			ch = '\0';
-+#endif
- 
- 		/* Secretly keep count of the line numbers */
- 		if (ch == '\n')
\ No newline at end of file
diff --git a/app-misc/lcdproc/files/0.5.1-serialvfd-parallel.patch b/app-misc/lcdproc/files/0.5.1-serialvfd-parallel.patch
deleted file mode 100644
index 0708eb238ef5..000000000000
--- a/app-misc/lcdproc/files/0.5.1-serialvfd-parallel.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-This patch fixes compilation errors with hardware that does not have a parallel
-port. It was proposed by serialVFD driver author Stefan Herdler and accepted
-upstream for the next release.
-
-See Gentoo bug #151308 and
-  http://thread.gmane.org/gmane.comp.sysutils.lcdproc/11184/focus=11184
-
---- ../cvs/lcdproc/server/drivers/serialVFD.c	2006-11-11 18:03:47.000000000 +0100
-+++ ./server/drivers/serialVFD.c	2006-11-11 17:07:38.000000000 +0100
-@@ -126,7 +126,7 @@ serialVFD_init (Driver *drvthis)
- 	p->cellheight = DEFAULT_CELL_HEIGHT;
- 	p->ccmode = CCMODE_STANDARD;
- 	p->ISO_8859_1 = 1;
--	p->refresh_timer = 0;
-+	p->refresh_timer = 480;
- 	p->hw_brightness = 0;
- 
- 	debug(RPT_INFO, "%s(%p)", __FUNCTION__, drvthis );
-@@ -134,15 +134,17 @@ serialVFD_init (Driver *drvthis)
- /* Read config file */
- 
- 	p->use_parallel	= drvthis->config_get_bool( drvthis->name, "use_parallel", 0, 0 );
--	if (p->use_parallel) {
--		p->port	= drvthis->config_get_int( drvthis->name, "port", 0, LPTPORT );
--	}
--	else {
-+	
- 		/* Which device should be used */
- 		strncpy(p->device, drvthis->config_get_string(drvthis->name, "Device", 0, DEFAULT_DEVICE), sizeof(p->device));
- 		p->device[sizeof(p->device)-1] = '\0';
- 		report(RPT_INFO, "%s: using Device %s", drvthis->name, p->device);
- 
-+	if (p->use_parallel) {
-+		p->port	= drvthis->config_get_int( drvthis->name, "port", 0, LPTPORT );
-+	}
-+	else {
-+
- 		/* Which speed */
- 		tmp = drvthis->config_get_int (drvthis->name, "Speed", 0, DEFAULT_SPEED);
- 		if ((tmp != 1200) && (tmp != 2400) && (tmp != 9600) && (tmp != 19200) && (tmp != 115200)) {
-@@ -236,7 +238,7 @@ serialVFD_init (Driver *drvthis)
- 		report(RPT_ERR, "%s: unable to create framebuffer backing store.", drvthis->name);
- 		return -1;
- 	}
--	memset(p->backingstore, ' ', p->width * p->height);
-+	memset(p->backingstore, 0, p->width * p->height);
- 
- //setup displayspecific data
- 	serialVFD_load_display_data(drvthis);
-@@ -427,8 +429,7 @@ serialVFD_flush (Driver *drvthis)
- 		Port_Function[p->use_parallel].write_fkt (drvthis, &p->hw_cmd[p->hw_brightness][1],\
- 		p->hw_cmd[p->hw_brightness][0]); // restore brightness
- 
--		for (i = 0; i < (p->height * p->width); i++)
--			p->backingstore[i]=0; // clear Backing-store
-+		memset(p->backingstore, 0, p->width * p->height); // clear Backing-store
- 
- 		for(i=0;i<p->customchars;i++) // refresh all customcharacters
- 			custom_char_changed[i]=1;
-@@ -659,8 +660,7 @@ serialVFD_close (Driver *drvthis)
- {
- 	PrivateData *p = drvthis->private_data;
- 	if (p != NULL) {
--		if (p->fd >= 0)
--			close(p->fd);
-+		Port_Function[p->use_parallel].close_fkt (drvthis);
- 		if (p->framebuf)
- 			free(p->framebuf);
- 		if (p->backingstore)
---- ../cvs/lcdproc/server/drivers/serialVFD.h	2006-10-02 19:48:08.000000000 +0200
-+++ ./server/drivers/serialVFD.h	2006-11-12 17:17:04.000000000 +0100
-@@ -73,7 +73,7 @@ MODULE_EXPORT const char * serialVFD_get
- 
- typedef struct driver_private_data {
- 	int use_parallel;		// use parallel?
--	unsigned int port;		// Port in parallel mode
-+	unsigned short port;		// Port in parallel mode
- 	char device[200];		// Device in serial mode
- 	int fd;
- 	int speed;			// Speed in serial mode
-@@ -96,9 +96,9 @@ typedef struct driver_private_data {
- 	unsigned char charmap[128];
- 	int display_type;		// display type
- 	int last_custom;		// last custom character written
--	char custom_char[31][7]; 	// stored custom characters
--	char custom_char_store[31][7]; 	// custom characters backingstore
--	char hw_cmd[10][4]; 		// hardwarespecific commands
-+	unsigned char custom_char[31][7]; 	// stored custom characters
-+	unsigned char custom_char_store[31][7]; 	// custom characters backingstore
-+	unsigned char hw_cmd[10][4]; 		// hardwarespecific commands
- 	int usr_chr_dot_assignment[57];	// how to setup usercharacters
- 	unsigned int usr_chr_mapping[31];// where to place the usercharacters (0..30) in the asciicode
- 	int hbar_cc_offset;		// character offset of the bars
---- ../cvs/lcdproc/server/drivers/serialVFD_io.c	2006-10-02 19:48:08.000000000 +0200
-+++ ./server/drivers/serialVFD_io.c	2006-11-12 19:34:25.000000000 +0100
-@@ -33,6 +33,7 @@
- #include "serialVFD_io.h"
- #include "serialVFD.h"
- #include "lcd.h"
-+
- #define WR_on  0x10
- #define WR_off 0x11
- #define Busy   0x80
-@@ -41,30 +42,32 @@
- #define MAXBUSY 300
- 
- void
--serialVFD_write_serial (Driver *drvthis, char *dat, size_t length)
-+serialVFD_write_serial (Driver *drvthis, unsigned char *dat, size_t length)
- {
- 	PrivateData *p = drvthis->private_data;
- 	write (p->fd,dat,length);
- }
- 
- void
--serialVFD_write_parallel (Driver *drvthis, char *dat, size_t length)
-+serialVFD_write_parallel (Driver *drvthis, unsigned char *dat, size_t length)
- {
-+#ifdef HAVE_PCSTYLE_LPT_CONTROL
- 	PrivateData *p = drvthis->private_data;
- 	int i_para, j_para;
- 
- 	for(i_para = 0; i_para < length; i_para++) {
- 		port_out(p->port, dat[i_para]);
--		port_in(p->port+1);
-+//		port_in(p->port+1);
- 		port_out(p->port+2, WR_on);
- 		port_in(p->port+1);
- 		port_out(p->port+2, WR_off);
--
-+		port_in(p->port+1);
- 		for(j_para=0; j_para < MAXBUSY; j_para++) {
- 			if((port_in(p->port+1)) & Busy)
- 				break;
- 		}
- 	}
-+#endif
- }
- 
- int
-@@ -110,18 +113,37 @@ serialVFD_init_serial (Driver *drvthis)
- int
- serialVFD_init_parallel (Driver *drvthis)
- {
--	int ret=0;
- 	PrivateData *p = drvthis->private_data;
-+#ifdef HAVE_PCSTYLE_LPT_CONTROL
- 	debug( RPT_DEBUG, "%s: Opening parallelport at: 0x%X", __FUNCTION__, p->port);
--//	if(port_access_multiple(p->port,3)) return -1;
--	if(port_access(p->port) != 0) ret=-1;
--	if(port_access(p->port+1) != 0) ret=-1;
--	if(port_access(p->port+2) != 0) ret=-1;
--	if(ret == -1) {
--		report (RPT_ERR, "%s: port_access() of 0x%X failed (%s)\n", __FUNCTION__, p->port, strerror (errno));
-+	if(port_access_multiple(p->port,3)) {
-+		report (RPT_ERR, "%s: port_access_multiple() of 0x%X failed (%s)\n", __FUNCTION__, p->port, strerror (errno));
- 		return -1;
- 	}
- 	return 0;
-+#else
-+	report (RPT_ERR, "%s: LCDproc was compiled without PCstyle LPT support\n", __FUNCTION__);
-+	return -1;
-+#endif
-+}
-+
-+void
-+serialVFD_close_serial (Driver *drvthis)
-+{
-+	PrivateData *p = drvthis->private_data;
-+	if (p->fd >= 0)
-+		close(p->fd);
- }
- 
-+void
-+serialVFD_close_parallel (Driver *drvthis)
-+{
-+#ifdef HAVE_PCSTYLE_LPT_CONTROL
-+	PrivateData *p = drvthis->private_data;
- 
-+	debug( RPT_DEBUG, "%s: Closing parallelport at: 0x%X", __FUNCTION__, p->port);
-+	if(port_deny_multiple(p->port,3)) {
-+		report (RPT_ERR, "%s: port_deny_multiple() of 0x%X failed (%s)\n", __FUNCTION__, p->port, strerror (errno));
-+	}
-+#endif
-+}
---- ../cvs/lcdproc/server/drivers/serialVFD_io.h	2006-10-02 19:48:08.000000000 +0200
-+++ ./server/drivers/serialVFD_io.h	2006-11-11 16:47:29.000000000 +0100
-@@ -44,12 +44,15 @@
- 
- int serialVFD_init_serial (Driver *drvthis);
- int serialVFD_init_parallel (Driver *drvthis);
--void serialVFD_write_serial (Driver *drvthis, char *dat, size_t length);
--void serialVFD_write_parallel (Driver *drvthis, char *dat, size_t length);
-+void serialVFD_write_serial (Driver *drvthis, unsigned char *dat, size_t length);
-+void serialVFD_write_parallel (Driver *drvthis, unsigned char *dat, size_t length);
-+void serialVFD_close_serial (Driver *drvthis);
-+void serialVFD_close_parallel (Driver *drvthis);
- 
- typedef struct Port_fkt {
--	void (*write_fkt) (Driver *drvthis, char *dat, size_t length);
-+	void (*write_fkt) (Driver *drvthis, unsigned char *dat, size_t length);
- 	int (*init_fkt) (Driver *drvthis);
-+	void (*close_fkt) (Driver *drvthis);
- } Port_fkt;
- 
- 
-@@ -57,8 +60,8 @@ static const Port_fkt Port_Function[] = 
- 	// initialisation function
- 	// write function
- 
--	{serialVFD_write_serial, serialVFD_init_serial},
--	{serialVFD_write_parallel, serialVFD_init_parallel}
-+	{serialVFD_write_serial, serialVFD_init_serial, serialVFD_close_serial},
-+	{serialVFD_write_parallel, serialVFD_init_parallel, serialVFD_close_parallel}
- };
- 
- 
-
---- ../cvs/lcdproc/docs/lcdproc-user/drivers/serialVFD.docbook	2006-11-11 18:03:14.000000000 +0100
-+++ ./docs/lcdproc-user/drivers/serialVFD.docbook	2006-10-02 19:48:01.000000000 +0200
-@@ -394,7 +394,7 @@ optional
-     <arg choice="plain"><replaceable>CUSTOM-CHARACTERS</replaceable></arg>
-   </term>
-   <listitem><para>
--    Number of Custom-Characters [default: Display-<command>Type</command> dependent].
-+Number of Custom-Characters [default: Display-<command>Type</command> dependent].
-   </para></listitem>
- </varlistentry>
- 
-@@ -420,7 +420,7 @@ optional
-   </term>
-   <listitem>
-     <para>
--    Specifies the display type.[default: <literal>0</literal>]
-+    Specifies the display type.[default: 0]
-     The following type codes are available:
-     </para>
-     <informaltable>
-@@ -463,7 +463,7 @@ optional
-     <arg choice="plain"><replaceable>BRIGHTNESS</replaceable></arg>
-   </term>
-   <listitem><para>
--Set the initial brightness [default: <literal>1000</literal>; legal: <literal>0</literal> - <literal>1000</literal>]
-+Set the initial brightness [default: 1000; legal: 0 - 1000]
-  (4 steps 0-250, 251-500, 501-750, 751-1000)
-   </para></listitem>
- </varlistentry>
-@@ -474,7 +474,7 @@ Set the initial brightness [default: <li
-     <arg choice="plain"><replaceable>OFFBRIGHTNESS</replaceable></arg>
-   </term>
-   <listitem><para>
--Set the initial off-brightness [default: <literal>0</literal>; legal: <literal>0</literal> - <literal>1000</literal>].
-+Set the initial off-brightness [default: 0; legal: 0 - 1000].
-  This value is used when the display is normally
-  switched off in case LCDd is inactive.
-  (4 steps 0-250, 251-500, 501-750, 751-1000)
diff --git a/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r3 b/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r3
deleted file mode 100644
index 247c7eae1867..000000000000
--- a/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ad13d6cce7a7e068d85a66d30285af95 lcdproc-0.5.1.tar.gz 800205
-RMD160 2672f660afac8437a9b6a1791bff80466cdfde64 lcdproc-0.5.1.tar.gz 800205
-SHA256 f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727 lcdproc-0.5.1.tar.gz 800205
diff --git a/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r4 b/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r4
index 247c7eae1867..c8f661b94572 100644
--- a/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r4
+++ b/app-misc/lcdproc/files/digest-lcdproc-0.5.1-r4
@@ -1,3 +1,6 @@
+MD5 e0c881a1a8827337f3e4d0cc6542b362 lcdproc-0.5.1-patches.tar.gz 5936
+RMD160 c2dcf9e5f0e3b637c249b9b2252e27d9f51ac8ad lcdproc-0.5.1-patches.tar.gz 5936
+SHA256 5deb2d7ba524c3ebb1dba2ceb74a68839c1723b297d603de85e8c3046b57afce lcdproc-0.5.1-patches.tar.gz 5936
 MD5 ad13d6cce7a7e068d85a66d30285af95 lcdproc-0.5.1.tar.gz 800205
 RMD160 2672f660afac8437a9b6a1791bff80466cdfde64 lcdproc-0.5.1.tar.gz 800205
 SHA256 f459280eb4eeb70be584895364c97ffab22b888235b2351a31e1c87ca9710727 lcdproc-0.5.1.tar.gz 800205
diff --git a/app-misc/lcdproc/files/digest-lcdproc-0.5.2 b/app-misc/lcdproc/files/digest-lcdproc-0.5.2
new file mode 100644
index 000000000000..1e33e1898095
--- /dev/null
+++ b/app-misc/lcdproc/files/digest-lcdproc-0.5.2
@@ -0,0 +1,6 @@
+MD5 51b61ca030137f5514b3f16547c53411 lcdproc-0.5.2-patches.tar.gz 6571
+RMD160 31b4534ea0fe2d58b52bb1dda76f0b728abdb916 lcdproc-0.5.2-patches.tar.gz 6571
+SHA256 b578bbb2e0e1adabfd8eda2101d9023652c8d3c112d7dc78fb77026d5f2db13d lcdproc-0.5.2-patches.tar.gz 6571
+MD5 860f192d061d87dda6512b11b79daac2 lcdproc-0.5.2.tar.gz 822695
+RMD160 73c275cc00f06dc256267e87e1c3b1dcac172fb1 lcdproc-0.5.2.tar.gz 822695
+SHA256 3261910dd9155229a2a6067c82ec4cca0d7900420f2d74c87a24b41b9b961036 lcdproc-0.5.2.tar.gz 822695
diff --git a/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild b/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild
index 64f330e9c908..3c53e83f5e56 100644
--- a/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild,v 1.5 2007/05/01 10:34:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild,v 1.6 2007/05/06 21:26:27 rbu Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -8,7 +8,8 @@ inherit eutils autotools multilib
 
 DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
 HOMEPAGE="http://lcdproc.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-patches.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -68,10 +69,10 @@ src_unpack() {
 	sed -i "79s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf
 	einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
 
-	epatch "${FILESDIR}/${PV}-as-needed.patch"
-	epatch "${FILESDIR}/${PV}-serialvfd-parallel.patch"
-	epatch "${FILESDIR}/${PV}-nested-functions.patch"
-	epatch "${FILESDIR}/${PV}-g15daemon-1.9.patch"
+	epatch "${WORKDIR}/${P}-patches/${PV}-as-needed.patch"
+	epatch "${WORKDIR}/${P}-patches/${PV}-serialvfd-parallel.patch"
+	epatch "${WORKDIR}/${P}-patches/${PV}-nested-functions.patch"
+	epatch "${WORKDIR}/${P}-patches/${PV}-g15daemon-1.9.patch"
 	eautoreconf
 }
 
diff --git a/app-misc/lcdproc/lcdproc-0.5.1-r3.ebuild b/app-misc/lcdproc/lcdproc-0.5.2.ebuild
index 9e8db7051c1d..b79919916274 100644
--- a/app-misc/lcdproc/lcdproc-0.5.1-r3.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.2.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1-r3.ebuild,v 1.2 2007/03/20 23:46:40 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.2.ebuild,v 1.1 2007/05/06 21:26:27 rbu Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit eutils autotools multilib
+inherit eutils multilib
 
 DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
 HOMEPAGE="http://lcdproc.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-patches.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="doc debug ldap nfs samba seamless-hbars usb lirc irman joystick"
+IUSE="doc debug nfs samba seamless-hbars usb lirc irman joystick"
 
 # The following array holds the USE_EXPANDed keywords
 IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontz633 cfontzpacket
@@ -24,7 +23,7 @@ IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontz633 cfontzpacket
 	md8800 ms6931 mtcs16209x mtxorb noritakevfd
 	pyramid sed1330 sed1520 serialvfd sli
 	stv5730 svga t6963 text tyan
-	ula200 xosd)
+	ula200 xosd ea65 picolcd serialpos )
 
 # Iterate through the array and add the lcd_devices_* that we support
 NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
@@ -35,7 +34,6 @@ while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
 done
 
 RDEPEND="
-	ldap?     ( net-nds/openldap )
 	usb?      ( dev-libs/libusb )
 	lirc?     ( app-misc/lirc )
 	irman?    ( media-libs/libirman )
@@ -44,15 +42,16 @@ RDEPEND="
 	lcd_devices_g15?      ( dev-libs/libg15  >=dev-libs/libg15render-1.1.1 )
 	lcd_devices_ncurses?   ( sys-libs/ncurses )
 	lcd_devices_svga?     ( media-libs/svgalib )
-	lcd_devices_ula200?   ( dev-embedded/libftdi  dev-libs/libusb )
+	lcd_devices_ula200?   ( >=dev-embedded/libftdi-0.7  dev-libs/libusb )
 	lcd_devices_xosd?     ( x11-libs/xosd  x11-libs/libX11  x11-libs/libXext )
 	lcd_devices_cfontzpacket? ( dev-libs/libusb )
 	lcd_devices_cwlinux?    ( dev-libs/libusb )
-	lcd_devices_pyramid?  ( dev-libs/libusb )"
+	lcd_devices_pyramid?  ( dev-libs/libusb )
+	lcd_devices_picolcd?  ( dev-libs/libusb )"
 DEPEND="${RDEPEND}
 	doc?      ( app-text/xmlto )"
 RDEPEND="${RDEPEND}
-	lcd_devices_g15?      ( <app-misc/g15daemon-1.9.0 )"
+	lcd_devices_g15?      ( app-misc/g15daemon )"
 
 pkg_setup() {
 	if [ -n "${LCDPROC_DRIVERS}" ] ; then
@@ -65,13 +64,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${WORKDIR}/${P}-patches/${PV}-picolcd.patch"
+
 	sed -i "79s:server/drivers:/usr/$(get_libdir)/lcdproc:" LCDd.conf
 	einfo "Patching LCDd.conf to use DriverPath=/usr/$(get_libdir)/lcdproc/"
-
-	epatch "${FILESDIR}/${PV}-as-needed.patch"
-	epatch "${FILESDIR}/${PV}-serialvfd-parallel.patch"
-	epatch "${FILESDIR}/${PV}-nested-functions.patch"
-	eautoreconf
 }
 
 src_compile() {
@@ -84,7 +80,7 @@ src_compile() {
 		MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD
 		pyramid sed1330 sed1520 serialVFD sli
 		stv5730 svga t6963 text tyan
-		ula200 xosd)
+		ula200 xosd ea65 picolcd serialPOS)
 
 	# Generate comma separated list of drivers
 	COMMA_DRIVERS=""
@@ -121,7 +117,6 @@ src_compile() {
 
 	econf \
 		$(use_enable debug) \
-		$(use_enable ldap) \
 		$(use_enable nfs stat-nfs) \
 		$(use_enable samba stat-smbfs ) \
 		$(use_enable seamless-hbars) \
@@ -166,8 +161,8 @@ src_install() {
 	doins clients/examples/*.pl
 	doins clients/metar/
 
-	newinitd "${FILESDIR}/${PV}-LCDd.initd" LCDd
-	newinitd "${FILESDIR}/${PV}-lcdproc.initd" lcdproc
+	newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
+	newinitd "${FILESDIR}/0.5.1-lcdproc.initd" lcdproc
 
 	dodoc README CREDITS ChangeLog INSTALL TODO
 	dodoc docs/README.* docs/*.txt
diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
index dce4644a99be..e13b8755e258 100644
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@@ -3,7 +3,17 @@
 <pkgmetadata>
 	<herd>lcd</herd>
 	<maintainer>
-		<email>rob@thetruth.de</email>
+		<email>rbu@gentoo.org</email>
 		<name>Robert Buchholz</name>
 	</maintainer>
+	<longdescription lang="en">
+		LCDproc is a piece of software that displays real-time system
+		information from your Linux/*BSD box on a LCD. The server
+		supports several serial devices: Matrix Orbital, CrystalFontz,
+		Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI,
+		Cwlinux(.com) and PIC-an-LCD; and some devices connected to the
+		LPT port: HD44780, STV5730, T6963, SED1520 and SED1330. Various
+		clients are available that display things like CPU load, system
+		load, memory usage, uptime, and a lot more.
+	</longdescription>
 </pkgmetadata>