Fix IUSE_LCD_DRIVERS alignment (bug 462170), add additional drivers, add IUSE png and truetype.

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

3 files changed, 27 insertions, 16 deletions

diff --git a/app-misc/lcdproc/ChangeLog b/app-misc/lcdproc/ChangeLog
index a66ba0899fc0..bbbce7746d3d 100644
--- a/app-misc/lcdproc/ChangeLog
+++ b/app-misc/lcdproc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lcdproc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.75 2013/04/09 16:55:50 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.76 2013/04/18 21:10:22 xmw Exp $
+
+  18 Apr 2013; Michael Weber <xmw@gentoo.org> -lcdproc-0.5.6.ebuild,
+  +lcdproc-0.5.6-r1.ebuild, metadata.xml:
+  Fix IUSE_LCD_DRIVERS alignment (bug 462170), add additional drivers, add IUSE
+  png and truetype.
 
   09 Apr 2013; Tom Wijsman <TomWij@gentoo.org> lcdproc-0.5.6.ebuild:
   No PN variable in HOMEPAGE as per the dev manual.
diff --git a/app-misc/lcdproc/lcdproc-0.5.6.ebuild b/app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild
index 47fd72047e78..e1ee80354ebe 100644
--- a/app-misc/lcdproc/lcdproc-0.5.6.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.6.ebuild,v 1.2 2013/04/09 16:55:50 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.6-r1.ebuild,v 1.1 2013/04/18 21:10:22 xmw Exp $
 
-EAPI="5"
+EAPI=5
 inherit multilib versionator
 
 MY_PV=$(replace_version_separator 3 '-')
@@ -17,17 +17,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-IUSE="doc debug hid nfs samba seamless-hbars usb lirc irman joystick ftdi"
+IUSE="debug doc ftdi hid irman joystick lirc nfs png samba seamless-hbars truetype usb"
 
 # The following array holds the USE_EXPANDed keywords
-IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontz633 cfontzpacket
+IUSE_LCD_DEVICES=(ncurses bayrad cfontz cfontzpacket
 	cwlinux eyeboxone g15 graphlcd glk
 	hd44780 icpa106 imon imonlcd iowarrior
 	lb216 lcdm001 lcterm
 	md8800 mdm166a ms6931 mtcs16209x mtxorb noritakevfd
-	pyramid sed1330 sed1520 serialvfd sli
+	pyramid sdeclcd sed1330 sed1520 serialvfd sli
 	stv5730 SureElec svga t6963 text tyan
-	ula200 xosd ea65 picolcd serialpos
+	ula200 vlsys_m428 xosd ea65 picolcd serialpos
 	i2500vfd irtrans lis shuttlevfd )
 
 # Iterate through the array and add the lcd_devices_* that we support
@@ -41,13 +41,15 @@ done
 REQUIRED_USE="lcd_devices_mdm166a? ( hid )"
 
 RDEPEND="
-	usb?      ( virtual/libusb:0 )
 	ftdi?     ( dev-embedded/libftdi )
-	lirc?     ( app-misc/lirc )
-	irman?    ( media-libs/libirman )
 	hid?	  ( >=dev-libs/libhid-0.2.16 )
+	irman?    ( media-libs/libirman )
+	lirc?     ( app-misc/lirc )
+	png?      ( media-libs/libpng:0 )
+	truetype? ( media-libs/freetype:2 )
+	usb?      ( virtual/libusb:0 )
 
-	lcd_devices_graphlcd?  ( app-misc/graphlcd-base  app-misc/glcdprocdriver )
+	lcd_devices_graphlcd?  ( app-misc/graphlcd-base  app-misc/glcdprocdriver dev-libs/serdisplib )
 	lcd_devices_g15?       ( dev-libs/libg15  dev-libs/libg15render )
 	lcd_devices_ncurses?   ( sys-libs/ncurses )
 	lcd_devices_svga?      ( media-libs/svgalib )
@@ -81,15 +83,14 @@ src_prepare() {
 src_configure() {
 	# This array contains the driver names required by configure --with-drivers=
 	# The positions must be the same as the corresponding use_expand flags
-	# TODO: Unknown CFontz633 has been removed, check if this change was appropriate.
 	local DEVICE_DRIVERS=(curses bayrad CFontz CFontzPacket
-		CwLnx EyeboxOne g15 glcdlib glk
+		CwLnx EyeboxOne g15 glcd,glcdlib glk
 		hd44780 icp_a106 imon imonlcd IOWarrior
 		lb216 lcdm001 lcterm
 		MD8800 mdm166a ms6931 mtc_s16209x MtxOrb NoritakeVFD
-		pyramid sed1330 sed1520 serialVFD sli
+		pyramid sdeclcd sed1330 sed1520 serialVFD sli
 		stv5730 SureElec svga t6963 text tyan
-		ula200 xosd ea65 picolcd serialPOS
+		ula200 vlsys_m428 xosd ea65 picolcd serialPOS
 		i2500vfd irtrans lis shuttleVFD )
 
 	# Generate comma separated list of drivers
@@ -135,8 +136,10 @@ src_configure() {
 	econf --enable-extra-charmaps \
 		$(use_enable debug) \
 		$(use_enable nfs stat-nfs) \
+		$(use_enable png libpng) \
 		$(use_enable samba stat-smbfs ) \
 		$(use_enable seamless-hbars) \
+		$(use_enable truetype freetype) \
 		${EXTRA_CONF} \
 		"--enable-drivers=${COMMA_DRIVERS}"
 }
diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
index eb0469d4e816..e70b552e6107 100644
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@@ -3,7 +3,8 @@
 <pkgmetadata>
 <herd>lcd</herd>
 <maintainer>
-<email>maintainer-needed@gentoo.org</email>
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
 </maintainer>
 <longdescription lang="en">
   LCDproc is a piece of software that displays real-time system information
@@ -20,5 +21,7 @@
   <flag name='nfs'>Adds support for NFS file system</flag>
   <flag name='seamless-hbars'>Try to avoid gaps in horizontal bars</flag>
   <flag name='ftdi'>Enable support for FTDI connections in some selected LCD_DEVICES (currently hd44780)</flag>
+  <flag name='lcd_devices_sdeclcd'>Enable support for VLSYS M428 display</flag>
+  <flag name='lcd_devices_vlsys_m428'>Enable support for VLSYS M428 display</flag>
 </use>
 </pkgmetadata>