Fix typo, discovered by Enrico in bug 281552. Remove cruft, fix RDEPEND

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

10 files changed, 16 insertions, 458 deletions

diff --git a/app-misc/lcd4linux/ChangeLog b/app-misc/lcd4linux/ChangeLog
index 816e15cec469..94a24730f020 100644
--- a/app-misc/lcd4linux/ChangeLog
+++ b/app-misc/lcd4linux/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/lcd4linux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.36 2009/05/16 09:00:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/ChangeLog,v 1.37 2009/08/17 16:09:34 rbu Exp $
+
+  17 Aug 2009; Robert Buchholz <rbu@gentoo.org>
+  -files/lcd4linux-0.10.0-gcc4-compat.patch,
+  -files/lcd4linux-0.10.0-kernel2.6.19.patch,
+  -files/lcd4linux-0.10.0-no-x86-asm.patch,
+  -files/lcd4linux-0.10.0-null-driver.patch, -files/lcd4linux-0.10.0.initd,
+  -lcd4linux-0.10.0-r1.ebuild, -lcd4linux-0.10.1_rc2-r1.ebuild,
+  lcd4linux-0.10.1_rc2-r2.ebuild:
+  Fix typo, discovered by Enrico in bug 281552
+  Remove cruft, fix RDEPEND
 
   16 May 2009; Robin H. Johnson <robbat2@gentoo.org>
   lcd4linux-0.10.0-r1.ebuild, lcd4linux-0.10.1_rc2-r1.ebuild,
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index abef1ff48559..1f7b8d53cef0 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,16 +1,8 @@
-AUX lcd4linux-0.10.0-gcc4-compat.patch 1066 RMD160 8755f513ecf6dd0416f3c502e11662aaae9789b0 SHA1 013aab5a49c87c9ce8cbf7abbcc8c3a215f4de5a SHA256 25056ba8c5260aabb2b7a985eb84acfb52f16edeec8773f15c6ef528081788a8
-AUX lcd4linux-0.10.0-kernel2.6.19.patch 412 RMD160 abf01325ffa51e0dbeb3b044c8c59659d1d5b4ea SHA1 fc50cc9e2a20beb18a43aa37959cb84566595ca7 SHA256 66b077e6a98aa679e31f5346d428734bf8d584edef0f0db015a0630cd161ec48
-AUX lcd4linux-0.10.0-no-x86-asm.patch 1533 RMD160 1fafd500673445cef40b94e5feac54f2979ec132 SHA1 47ebdaa777e3d8522ce6611e11d29c7f01c04849 SHA256 410862d5955f735827cdbd146a85b483623a5d1c07e700d8dcc1ebadb5bbf340
-AUX lcd4linux-0.10.0-null-driver.patch 260 RMD160 c6612e8c0329477d1f7efaa412ffdda1ca5733be SHA1 3daaf7a32a893874ec7c767077778b0b02a7a052 SHA256 06fd19970dc811935e010ae4d7465a17ab6fc033b0a4d1beba977256b89c7676
-AUX lcd4linux-0.10.0.initd 673 RMD160 4bce8d704ae7f778e9a1f1f16424f48de9d74298 SHA1 5e50656b1bf35e6901a7334ab6f1b034e432d7df SHA256 a122192b1834391a8fc4d5a33a18114e150cde193f96d1dfae8b2d6ea2953df4
 AUX lcd4linux-0.10.1_rc2-mpd.patch 9230 RMD160 98e6e7e36d06888566e65e2e12e2fef120520ecb SHA1 ede43c6bb493cf4512628bc6a7d0e3f09da6b092 SHA256 ee1294d4c53086b998f1ff3fa90987b5a58baa589850b77edab755ef836b1583
 AUX lcd4linux-0.10.1_rc2-nordtsc.patch 4703 RMD160 cdb4affb7d3ded92a7879e1cdbcdacd6bd9cfd39 SHA1 18627aa1b136649c03b0837c7b1e1aa967192b02 SHA256 f0520872c820003e78f90304c0e36511e53d11cf67732eb4debb44cc68697e34
 AUX lcd4linux-0.10.1_rc2-warnings.patch 2229 RMD160 e344704288d650d5ef7f334fb3ce2d3a5029e334 SHA1 fb4c9bba8b854e2d2a53ae222e6e2c554ec12ac8 SHA256 8960a45af139e2f2d226474c9d5f099ca70605bb72815b03d9ad72222be7b8d5
 AUX lcd4linux-0.10.1_rc2.initd 661 RMD160 e5b51ce6bb1e750d4480d564b04f7c3c50b060c3 SHA1 672b36d6593f7d9f586db0e55d4310ef6fa7ed3d SHA256 87351cb7d48cfbbf94da3432113debd5a74c5c87802c39af64b2fe61eb7f79b1
-DIST lcd4linux-0.10.0.tar.gz 294851 RMD160 98f810297de3d746d559998516b83a2939fc8568 SHA1 325d8549c83bb62e31492285001a1007d1f9960b SHA256 0b880d4baf612e5689d3b97d7c699df864cdb690b354eadd2a3d4e341511e909
 DIST lcd4linux-0.10.1-RC2.tar.gz 386188 RMD160 5f4465d20c26e43aea79150cad00141d63bb784d SHA1 90b6e6dbebc545c027ad0b97f74c2813357c1a4b SHA256 9e69ded08dc9a8c75f36a3c020e7aa96b90313d91b2f58add6d4dfff1f8861b0
-EBUILD lcd4linux-0.10.0-r1.ebuild 4826 RMD160 5de0f01822472e0db6ab897aa911ba2eccc233df SHA1 ec9bdb21f39e71b48611200860bd5be0bbff00f8 SHA256 56f45479ee37387112656f89551d766ff73d2ea4c009a60346752e3a05ce3b40
-EBUILD lcd4linux-0.10.1_rc2-r1.ebuild 5189 RMD160 e81c768a1bbe1da3efe617b5e0a1ba84cf1c6848 SHA1 4347e01beb739c128eb8337772665307df7662fd SHA256 d1896b5da4153390dae7316ea22fb3bf2ebfba7dc9bb3ebdcc61fb96ffc64602
-EBUILD lcd4linux-0.10.1_rc2-r2.ebuild 5274 RMD160 f0adff589c61d654c1f53cd3530d3dee7c60f1c0 SHA1 bc7493263fecb9d83a36239ab88f6dad81f448a0 SHA256 42027fcbb975323479e1407f653441e7a140b54e9868bb4f58e0b91fbf13ff68
-MISC ChangeLog 6717 RMD160 76eefdad39fcfe03f8ffd8887b5784473433c6d7 SHA1 e44b8f2eb9634c6775bb79cfdfd35cfe4f3b1819 SHA256 c78c30841e2461414ef57a20d2ddb54bafafc059da4bab3425411d9d71d83e28
+EBUILD lcd4linux-0.10.1_rc2-r2.ebuild 5291 RMD160 3dac9c580b20ec64e7db3d65ddcd98634c6ebe1f SHA1 c30e718279b733bcd8af96d2e83cd8cd089140f0 SHA256 08252cb8326018622f956c1258be4ba962d833459031397a8698b5cb539dff2b
+MISC ChangeLog 7146 RMD160 7823c4c6de07a278a5577fcd4855399f0c9c44f5 SHA1 552c65de5df123bca02fc9161004f8168a1346dc SHA256 dee60b4629dadb6f4e93d3167612b0f4968c86604805e919efe4e8e5e0231a2f
 MISC metadata.xml 643 RMD160 8aa56b2bc130bbcf2af2a2c145a0f4af75d9326f SHA1 a64de62d03807e81e70138e281645498f14763b5 SHA256 31e29e07063d19571b7d767916921d92cf4482fd060150d4d75a8fc12160c388
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
deleted file mode 100644
index ba6f27a4c79a..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.0-gcc4-compat.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-GCC4 fixes, see bug #147388.
-Patch from upstream SVN
-
---- a/trunk/drv_SimpleLCD.c (revision 547)
-+++ b/trunk/drv_SimpleLCD.c (revision 581)
-@@ -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
-===================================================================
---- a/trunk/lcd4linux_i2c.h (revision 562)
-+++ b/trunk/lcd4linux_i2c.h (revision 581)
-@@ -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/files/lcd4linux-0.10.0-kernel2.6.19.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch
deleted file mode 100644
index 9738014d3af8..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.0-kernel2.6.19.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/lcd4linux-0.10.0-no-x86-asm.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-no-x86-asm.patch
deleted file mode 100644
index cef3d2cacd7f..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.0-no-x86-asm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream patch

-

-"Fixing bug #1494773 (compiles only on i368/amd64 machines) by providing a dummy implementation for other archs "

-See http://sourceforge.net/tracker/index.php?func=detail&aid=1494773&group_id=1310&atid=101310

-

-===================================================================

---- ./udelay.h (revision 600)

-+++ ./udelay.h (revision 712)

-@@ -1,3 +1,3 @@

--/* $Id: lcd4linux-0.10.0-no-x86-asm.patch,v 1.1 2007/02/18 23:02:56 rbu Exp $

-+/* $Id: lcd4linux-0.10.0-no-x86-asm.patch,v 1.1 2007/02/18 23:02:56 rbu Exp $

-  *

-  * short delays 

-@@ -24,4 +24,7 @@

-  *

-  * $Log: not supported by cvs2svn $

-+ * Revision 1.12  2006/09/13 20:07:59  entropy

-+ * Fixing bug #1494773 (compiles only on i368/amd64 machines) by providing a dummy implementation for other archs

-+ *

-  * Revision 1.11  2005/12/12 09:08:08  reinelt

-  * finally removed old udelay code path; read timing values from config

-@@ -80,5 +83,12 @@

- static inline void rep_nop(void)

- {

-+# if defined(__i386) || defined(__i386__) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__)

-+    /* intel or amd64 arch, the "rep" and "nop" opcodes are available */

-     __asm__ __volatile__("rep; nop");

-+# else

-+    /* other Arch, maybe add core cooldown code here, too. */

-+    do {

-+    } while (0);

-+# endif

- }

- 

diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0-null-driver.patch b/app-misc/lcd4linux/files/lcd4linux-0.10.0-null-driver.patch
deleted file mode 100644
index f9be4e69e155..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.0-null-driver.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	2007-01-16 03:58:31.000000000 +0100
-+++ configure	2007-01-16 03:59:10.000000000 +0100
-@@ -6132,6 +6132,7 @@
- 
- if test "$NULL" = "yes"; then
-    DRIVERS="$DRIVERS drv_NULL.o"
-+   TEXT="yes"
- 
- cat >>confdefs.h <<\_ACEOF
- #define WITH_NULL 1
diff --git a/app-misc/lcd4linux/files/lcd4linux-0.10.0.initd b/app-misc/lcd4linux/files/lcd4linux-0.10.0.initd
deleted file mode 100644
index 02a051b71b3b..000000000000
--- a/app-misc/lcd4linux/files/lcd4linux-0.10.0.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/files/lcd4linux-0.10.0.initd,v 1.1 2007/02/18 23:02:56 rbu Exp $
-
-PIDFILE=/var/run/lcd4linux.pid
-DAEMON=/usr/bin/lcd4linux
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting lcd4linux"
-	start-stop-daemon --start --quiet --make-pidfile --pidfile ${PIDFILE} --exec ${DAEMON}
-	eend $? "Failed to start lcd4linux. Did you remember to set up /etc/lcd4linux.conf?"
-}
-
-stop() {
-	ebegin "Stopping lcd4linux"
-	start-stop-daemon --stop --quiet --oknodo --exec ${DAEMON} --pidfile ${PIDFILE}
-	eend $?
-}
-
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.0-r1.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.0-r1.ebuild
deleted file mode 100644
index a4259e01b9f7..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2009 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-r1.ebuild,v 1.3 2009/05/16 09:00:26 robbat2 Exp $
-
-inherit eutils
-
-DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
-HOMEPAGE="http://ssl.bulix.org/projects/${PN}"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="mysql"
-
-# The following array holds the USE_EXPANDed keywords
-IUSE_LCD_DEVICES=(beckmannegle bwct cfontz ncurses cwlinux
-		hd44780 lcdlinux lcdterm m50530 mtxorb
-		milfordbpk noritake null png ppm
-		routerboard serdisplib simplelcd t6963 trefon
-		usblcd X)
-
-# Iterate through the array and add the lcd_devices_* that we support
-NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
-index=0
-while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-	IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[$index]}"
-	let "index = ${index} + 1"
-done
-
-DEPEND="
-	mysql? ( virtual/mysql )
-
-	lcd_devices_bwct?     ( =virtual/libusb-0* )
-	lcd_devices_trefon?   ( =virtual/libusb-0* )
-	lcd_devices_usblcd?   ( =virtual/libusb-0* )
-	lcd_devices_ncurses?  ( sys-libs/ncurses )
-	lcd_devices_noritake? ( media-libs/gd )
-	lcd_devices_t6963?    ( media-libs/gd )
-	lcd_devices_png?      ( media-libs/libpng media-libs/gd )
-	lcd_devices_X?        ( x11-libs/libX11  media-libs/gd )
-	lcd_devices_serdisplib? ( dev-libs/serdisplib  media-libs/gd )"
-#	python support is b0rked, waiting for upstream release to fix
-# 	python? ( dev-lang/python )
-
-pkg_setup() {
-	elog "If you wish to compile only specific plugins, please use"
-	elog "the LCD4LINUX_PLUGINS environment variable. Plugins must be comma separated and can be either of:"
-	elog "apm cpuinfo diskstats dvb exec i2c_sensors imon isdn loadavg meminfo netdev pop3 ppp proc_stat sample seti statfs uname uptime wireless"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-kernel2.6.19.patch"
-	epatch "${FILESDIR}/${P}-gcc4-compat.patch"
-	epatch "${FILESDIR}/${P}-null-driver.patch"
-}
-
-src_compile() {
-	# This array contains the driver names required by configure --with-drivers=
-	# The positions must be the same as the corresponding use_expand flags
-	local DEVICE_DRIVERS=(BeckmannEgle BWCT CrystalFontz Curses Cwlinux
-		HD44780 LCDLinux LCDTerm M50530 MatrixOrbital
-		MilfordInstruments Noritake NULL PNG PPM
-		RouterBoard serdisplib SimpleLCD T6963 Trefon
-		USBLCD X11)
-
-	local myconf myp
-
-	# need to grab upstream's *.m4 and fix python building
-	# they didn't have python properly set up originally.
-	#myconf="${myconf} $(use_with python)"
-	myconf="${myconf} --without-python"
-
-	# plugins
-	if [ -n "$LCD4LINUX_PLUGINS" ]; then
-		myp="$LCD4LINUX_PLUGINS"
-		use mysql || myp="${myp},!mysql"
-		myp="${myp},!python"
-		#use python || myp="${myp},!python"
-		elog "Active plugins (overridden): ${myp}"
-	else
-		myp="all"
-		use mysql || myp="${myp},!mysql"
-		#use python || myp="${myp},!python"
-		myp="${myp},!python"
-		elog "Active plugins: ${myp}"
-	fi
-
-	# Generate comma separated list of drivers
-	local COMMA_DRIVERS
-	local FIRST_DRIVER
-	local index=0
-	local driver
-
-	while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-		if use "lcd_devices_${IUSE_LCD_DEVICES[$index]}" ; then
-			driver=${DEVICE_DRIVERS[$index]}
-			if [ -z ${COMMA_DRIVERS} ] ; then
-				# First in the list
-				COMMA_DRIVERS="${driver}"
-				FIRST_DRIVER="${driver}"
-			else
-				# Second, third, ... include a comma at the front
-				COMMA_DRIVERS="${COMMA_DRIVERS},${driver}"
-			fi
-		fi
-		let "index = ${index} + 1"
-	done
-
-	# activate at least one driver
-	if [ -z ${COMMA_DRIVERS} ] ; then
-		COMMA_DRIVERS="NULL"
-	fi
-
-	# avoid package brokenness
-	use lcd_devices_X && myconf="${myconf} --x-libraries=/usr/lib --x-include=/usr/include"
-	use lcd_devices_X || myconf="${myconf} --without-x"
-
-	econf \
-		--sysconfdir=/etc/lcd4linux \
-		--with-drivers="${COMMA_DRIVERS}" \
-		--with-plugins="${myp}" \
-		${myconf} \
-		|| die "econf failed"
-
-	sed -i.orig -e 's/-L -lX11/ -lX11 /g' Makefile || die "sed fixup failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	# upstream's makefile acts weird, and tries to recompile stuff
-	dobin lcd4linux
-
-	dodoc README* NEWS TODO CREDITS FAQ AUTHORS ChangeLog
-
-	newinitd "${FILESDIR}/${P}.initd" ${PN}
-
-	insinto /etc
-	insopts -o root -g root -m 0600
-	newins lcd4linux.conf.sample lcd4linux.conf
-}
-
-pkg_postinst() {
-	if use lcd_devices_lcdlinux; then
-		ewarn "To actually use the lcd-linux devices, you will need to install the lcd-linux kernel module."
-		ewarn "You can either do that yourself, see http://lcd-linux.sf.net or "
-		ewarn "checkout http://overlays.gentoo.org/dev/jokey/browser/trunk and emerge app-misc/lcd-linux"
-	fi
-	ewarn "If you are upgrading, please note that the default config file was moved to /etc/lcd4linux.conf"
-}
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r1.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r1.ebuild
deleted file mode 100644
index 9c0e57c6af2d..000000000000
--- a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r1.ebuild,v 1.5 2009/05/16 09:00:26 robbat2 Exp $
-
-inherit eutils multilib
-
-MY_P=${P/_rc/-RC}
-
-DESCRIPTION="Shows system and ISDN information on an external display or in a X11 window"
-HOMEPAGE="http://ssl.bulix.org/projects/${PN}"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="mysql python iconv mpd"
-
-# The following array holds the USE_EXPANDed keywords
-IUSE_LCD_DEVICES=(beckmannegle bwct cfontz ncurses cwlinux
-		ea232 g15 hd44780 hd44780i2c lcd2usb
-		lcdlinux lcdterm ledmatrix lph7508 m50530
-		mtxorb milfordbpk noritake null picolcd
-		png ppm routerboard serdisplib simplelcd
-		t6963 trefon usbhub usblcd wincor
-		X luise)
-
-# Iterate through the array and add the lcd_devices_* that we support
-NUM_DEVICES=${#IUSE_LCD_DEVICES[@]}
-index=0
-while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-	IUSE="${IUSE} lcd_devices_${IUSE_LCD_DEVICES[$index]}"
-	let "index = ${index} + 1"
-done
-
-DEPEND="
-	mysql?  ( virtual/mysql )
-	python? ( dev-lang/python )
-	iconv?  ( virtual/libiconv )
-	mpd?    ( media-libs/libmpd )
-
-	lcd_devices_bwct?     ( =virtual/libusb-0* )
-	lcd_devices_g15?      ( =virtual/libusb-0* )
-	lcd_devices_lcd2usb?  ( =virtual/libusb-0* )
-	lcd_devices_picolcd?  ( =virtual/libusb-0* )
-	lcd_devices_trefon?   ( =virtual/libusb-0* )
-	lcd_devices_usbhub?   ( =virtual/libusb-0* )
-	lcd_devices_usblcd?   ( =virtual/libusb-0* )
-	lcd_devices_luise?    ( dev-libs/luise-bin )
-	lcd_devices_ncurses?  ( sys-libs/ncurses )
-	lcd_devices_noritake? ( media-libs/gd )
-	lcd_devices_t6963?    ( media-libs/gd )
-	lcd_devices_png?      ( media-libs/libpng media-libs/gd )
-	lcd_devices_X?        ( x11-libs/libX11  media-libs/gd )
-	lcd_devices_serdisplib? ( dev-libs/serdisplib  media-libs/gd )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	echo
-	elog "If you wish to compile only specific plugins, please use"
-	elog "the LCD4LINUX_PLUGINS environment variable. Plugins must be comma separated and can be either of:"
-	elog "apm cpuinfo diskstats dvb exec file ic_sensors imon isdn kvv loadavg meminfo netdev pop3 ppp proc_stat seti statfs uname uptime wireless"
-	echo
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-warnings.patch"
-	epatch "${FILESDIR}/${P}-mpd.patch"
-}
-
-src_compile() {
-	# This array contains the driver names required by configure --with-drivers=
-	# The positions must be the same as the corresponding use_expand flags
-	local DEVICE_DRIVERS=(BeckmannEgle BWCT CrystalFontz Curses Cwlinux
-		EA232graphic G15 HD44780 HD44780-I2C LCD2USB
-		LCDLinux LCDTerm LEDMatrix LPH7508 M50530
-		MatrixOrbital MilfordInstruments Noritake NULL picoLCD
-		PNG PPM RouterBoard serdisplib SimpleLCD
-		T6963 Trefon USBHUB USBLCD WincorNixdorf
-		X11 LUIse)
-
-	local myconf myp
-
-	# plugins
-	if [ -n "$LCD4LINUX_PLUGINS" ]; then
-		myp="$LCD4LINUX_PLUGINS"
-	else
-		myp="all,!xmms"
-	fi
-	use iconv || myp="${myp},!iconv"
-	use mpd || myp="${myp},!mpd"
-	use mysql || myp="${myp},!mysql"
-	use python || myp="${myp},!python"
-	elog "Active plugins: ${myp}"
-
-	# Generate comma separated list of drivers
-	local COMMA_DRIVERS
-	local FIRST_DRIVER
-	local index=0
-	local driver
-
-	while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
-		if use "lcd_devices_${IUSE_LCD_DEVICES[$index]}" ; then
-			driver=${DEVICE_DRIVERS[$index]}
-			if [ -z ${COMMA_DRIVERS} ] ; then
-				# First in the list
-				COMMA_DRIVERS="${driver}"
-				FIRST_DRIVER="${driver}"
-			else
-				# Second, third, ... include a comma at the front
-				COMMA_DRIVERS="${COMMA_DRIVERS},${driver}"
-			fi
-		fi
-		let "index = ${index} + 1"
-	done
-
-	# activate at least one driver
-	if [ -z ${COMMA_DRIVERS} ] ; then
-		COMMA_DRIVERS="NULL"
-	fi
-
-	# workaround the build failing because of b0rked settings
-	if use lcd_devices_hd44780 && use lcd_devices_hd44780i2c ; then
-		echo
-		ewarn "Disabling hd44780 LCD_DEVICE as hd44780i2c is set!"
-		echo
-		COMMA_DRIVERS="${COMMA_DRIVERS},!HD44780"
-	fi
-
-	# avoid package brokenness
-	if use lcd_devices_X ; then
-		myconf="--x-libraries=/usr/$(get_libdir) --x-include=/usr/include"
-	else
-		myconf="--without-x"
-	fi
-
-	econf \
-		--sysconfdir=/etc/lcd4linux \
-		--with-drivers="${COMMA_DRIVERS}" \
-		--with-plugins="${myp}" \
-		$(use_with python) \
-		${myconf} \
-		|| die "econf failed"
-
-	sed -i.orig -e 's/-L -lX11/ -lX11 /g' Makefile || die "sed fixup failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc README ChangeLog
-
-	newinitd "${FILESDIR}/${P}.initd" ${PN}
-
-	insinto /etc
-	insopts -o root -g root -m 0600
-	newins lcd4linux.conf.sample lcd4linux.conf
-}
-
-pkg_postinst() {
-	if use lcd_devices_lcdlinux; then
-		echo
-		ewarn "To actually use the lcd-linux devices, you will need to install the lcd-linux kernel module."
-		ewarn "You can either do that yourself, see http://lcd-linux.sf.net or "
-		ewarn "checkout http://overlays.gentoo.org/dev/jokey/browser/trunk and emerge app-misc/lcd-linux"
-		echo
-	fi
-	ewarn "If you are upgrading, please note that the default config file was moved to /etc/lcd4linux.conf"
-}
diff --git a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild
index b5196e12274c..b2c516c1c0e8 100644
--- a/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild,v 1.6 2009/05/16 09:00:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcd4linux/lcd4linux-0.10.1_rc2-r2.ebuild,v 1.7 2009/08/17 16:09:34 rbu Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils multilib autotools
@@ -54,6 +54,7 @@ DEPEND="
 	lcd_devices_png?      ( media-libs/libpng media-libs/gd )
 	lcd_devices_X?        ( x11-libs/libX11  media-libs/gd )
 	lcd_devices_serdisplib? ( dev-libs/serdisplib  media-libs/gd )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -61,7 +62,7 @@ pkg_setup() {
 	echo
 	elog "If you wish to compile only specific plugins, please use"
 	elog "the LCD4LINUX_PLUGINS environment variable. Plugins must be comma separated and can be either of:"
-	elog "apm cpuinfo diskstats dvb exec file ic_sensors imon isdn kvv loadavg meminfo netdev pop3 ppp proc_stat seti statfs uname uptime wireless"
+	elog "apm cpuinfo diskstats dvb exec file i2c_sensors imon isdn kvv loadavg meminfo netdev pop3 ppp proc_stat seti statfs uname uptime wireless"
 	echo
 }