Add imonlcd to support Antec iMON LCD modules (bug #232328), lcdproc init

  script should start after ntp-client (bug #234084), fix quoting.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64

6 files changed, 231 insertions, 22 deletions

diff --git a/app-misc/lcdproc/ChangeLog b/app-misc/lcdproc/ChangeLog
index 3ece6d3d7e94..75e9be83db6b 100644
--- a/app-misc/lcdproc/ChangeLog
+++ b/app-misc/lcdproc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/lcdproc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.63 2008/07/31 16:31:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.64 2008/09/12 23:58:55 rbu Exp $
+
+*lcdproc-0.5.2-r2 (12 Sep 2008)
+
+  12 Sep 2008; Robert Buchholz <rbu@gentoo.org>
+  +files/0.5.2-r2-lcdproc.initd, lcdproc-0.5.1-r4.ebuild,
+  lcdproc-0.5.2-r1.ebuild, +lcdproc-0.5.2-r2.ebuild:
+  Add imonlcd to support Antec iMON LCD modules (bug #232328), lcdproc init
+  script should start after ntp-client (bug #234084), fix quoting.
 
   31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 783ac003abfb..3cfaebf02623 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.5.1-LCDd.initd 645 RMD160 69b059023b665ecfcce9306dd9be2933da38b12a SHA1 85260492305266e661e022e902914c976782179c SHA256 782142cc26b433bbfe1ac1ae152a8ecf62985e78c03e674f699f76847e6465b6
 AUX 0.5.1-lcdproc.initd 482 RMD160 dcf3178518a8a218c865d8d389e9f7ca9ff8133e SHA1 982f8e76282508a7087547693e164690f933c4c2 SHA256 40a5ce0b7cc5fe3fe78d4c3ab37178c087cdc8e1c1922e91fd29f9bffac063fd
+AUX 0.5.2-r2-lcdproc.initd 498 RMD160 81dfa0a2795b401ff9a74b12a84a1877dec44598 SHA1 0c8f45fa1ad3a837f67e85ad1a4e4e7396936e85 SHA256 f537d05e9bfc63623cd3e22d3b9bf9e777ca2e726d13009ae0e571e58b52494a
 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-r2-patches.tar.gz 20140 RMD160 a87095f9e643fe9c9cf293db5b54443a42535148 SHA1 54c47f2837c43e670703022a5172a538dda6729b SHA256 c222fb0867bdbc510a4fed4d72e6c71c10d341997432bed84d713e6fac1d4b37
 DIST lcdproc-0.5.2.tar.gz 822695 RMD160 73c275cc00f06dc256267e87e1c3b1dcac172fb1 SHA1 924fca84eb5a07464a3d38df86d9a4427fd06dd7 SHA256 3261910dd9155229a2a6067c82ec4cca0d7900420f2d74c87a24b41b9b961036
-EBUILD lcdproc-0.5.1-r4.ebuild 5719 RMD160 7047bdf62bc803411408bae38b7919c025313da2 SHA1 ff944d0c6f3488b0a00f762665f6596e0434dd6e SHA256 05d37d2a105f89eb19343b7abb6226b8b8afe45ca34a747ddcd82e4112bbde75
-EBUILD lcdproc-0.5.2-r1.ebuild 5546 RMD160 65d8988d5a3f01f51db622b7c64aed0b6c5b50a3 SHA1 1bd9304af581d1f8ccbd2c4c324dc0007f8af59a SHA256 7b07d16767a7564bf6755d447b031724209def2334724bbd9d2cbe5df04e9802
-MISC ChangeLog 11005 RMD160 08c19bfd4ef42c04e706e42d032e6318106b4584 SHA1 db1259fd11a98950d152af1988f00d3c296cc0d4 SHA256 64b462be7d8f7284e95fb11d6e088c9da7a8d34c30f8fcb7a3a782cbf82033f6
+EBUILD lcdproc-0.5.1-r4.ebuild 5723 RMD160 600c6b11b5a7f5d9d7edc05ede1ef0d856b7e340 SHA1 38aa4bc1f668fe4f711dafbcf7e410cc4bb708d7 SHA256 bd33277d822537a8dd63bc7f30ac1b408b31f239fc7da13d7a64662cbe4ebd90
+EBUILD lcdproc-0.5.2-r1.ebuild 5543 RMD160 748945b18441cc712080fcb70800e59f9a87fb3f SHA1 1a0a8b036c889daa6874bacc2d4ee6b51f27d966 SHA256 8f63f468759d3f4c4e82ab7023ccedb1b7edca95e1ee66042532a6a1d8a55385
+EBUILD lcdproc-0.5.2-r2.ebuild 5629 RMD160 fd5c8ad4a99765d43282b4557fef84283c928b34 SHA1 2666a34c25e0977061b380ad63bc3af68b130b6b SHA256 4238bb1ac875fb567a7db502d3f80d01f7faeaf26bb0d81f0c3942cac0252179
+MISC ChangeLog 11341 RMD160 185ade8eaf29196f47386bd4b6683f3775fd0bf2 SHA1 680320e7262904be51ebbafe4d4f4fc5b362c08d SHA256 10bda2dc6cae72b001da2d7c542428d3d8de88bab8ab2b3eb8f62f2206d07743
 MISC metadata.xml 1016 RMD160 db1cc38cd46c80bcaddd5ffe66f4043233ec00f3 SHA1 df05ed4e2dd669eaec7e8ff0953a425b776f5e35 SHA256 a2bdee464f51135a155879f8cb7a3a055b3478759ed08c17a846fc935e8be211
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiR6QQACgkQOeoy/oIi7uw6NACfWlaVO7U8sCJ3esWFbuF36SeV
-EPcAnAo70PMm3h8/rOMljlK/HI6aCwLG
-=lLgm
------END PGP SIGNATURE-----
diff --git a/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd b/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd
new file mode 100644
index 000000000000..aa161a93991c
--- /dev/null
+++ b/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/files/0.5.2-r2-lcdproc.initd,v 1.1 2008/09/12 23:58:55 rbu Exp $
+
+depend(){
+	use LCDd
+	after ntp-client
+}
+
+start() {
+	ebegin "Starting lcdproc"
+	start-stop-daemon --start --background \
+		--exec /usr/bin/lcdproc
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping lcdproc"
+	start-stop-daemon --stop --exec /usr/bin/lcdproc
+	eend $?
+}
diff --git a/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild b/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild
index 3c53e83f5e56..4c046f9453f5 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
+# Copyright 1999-2008 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.6 2007/05/06 21:26:27 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.1-r4.ebuild,v 1.7 2008/09/12 23:58:55 rbu Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -135,12 +135,12 @@ src_compile() {
 
 	if use doc; then
 		ebegin "Creating user documentation"
-		cd ${S}/docs/lcdproc-user
+		cd "${S}"/docs/lcdproc-user
 		xmlto html lcdproc-user.docbook
 		eend $?
 
 		ebegin "Creating dev documentation"
-		cd ${S}/docs/lcdproc-dev
+		cd "${S}"/docs/lcdproc-dev
 		xmlto html lcdproc-dev.docbook
 		eend $?
 	fi
diff --git a/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
index 0760c06a7ab8..6041c44c0895 100644
--- a/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild,v 1.7 2007/08/14 21:08:27 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild,v 1.8 2008/09/12 23:58:55 rbu Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit eutils autotools multilib
@@ -131,12 +131,12 @@ src_compile() {
 
 	if use doc; then
 		ebegin "Creating user documentation"
-		cd ${S}/docs/lcdproc-user
+		cd "${S}"/docs/lcdproc-user
 		xmlto html lcdproc-user.docbook
 		eend $?
 
 		ebegin "Creating dev documentation"
-		cd ${S}/docs/lcdproc-dev
+		cd "${S}"/docs/lcdproc-dev
 		xmlto html lcdproc-dev.docbook
 		eend $?
 	fi
diff --git a/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild b/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..094048e47e06
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.2-r2.ebuild,v 1.1 2008/09/12 23:58:55 rbu Exp $
+
+WANT_AUTOMAKE="1.9"
+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
+	mirror://gentoo/${PF}-patches.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+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
+	cwlinux eyeboxone g15 graphlcd glk
+	hd44780 icpa106 imon imonlcd iowarrior
+	lb216 lcdm001 lcterm
+	md8800 ms6931 mtcs16209x mtxorb noritakevfd
+	pyramid sed1330 sed1520 serialvfd sli
+	stv5730 svga t6963 text tyan
+	ula200 xosd ea65 picolcd serialpos )
+
+# 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
+
+RDEPEND="
+	usb?      ( dev-libs/libusb )
+	lirc?     ( app-misc/lirc )
+	irman?    ( media-libs/libirman )
+
+	lcd_devices_graphlcd?  ( app-misc/graphlcd-base  app-misc/glcdprocdriver )
+	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-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_picolcd?  ( dev-libs/libusb )"
+DEPEND="${RDEPEND}
+	doc?      ( app-text/xmlto )"
+RDEPEND="${RDEPEND}
+	lcd_devices_g15?      ( app-misc/g15daemon )"
+
+pkg_setup() {
+	if [ -n "${LCDPROC_DRIVERS}" ] ; then
+		ewarn "Setting the drivers to compile via LCDPROC_DRIVERS is not supported anymore."
+		ewarn "Please use LCD_DEVICES now and see emerge -pv output for the options."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${WORKDIR}"/${PF}-patches/${PV}-imonlcd-0.3.patch
+
+	epatch "${WORKDIR}"/${PF}-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/"
+
+	eautoreconf
+}
+
+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=(curses bayrad CFontz CFontz633 CFontzPacket
+		CwLnx EyeboxOne g15 glcdlib glk
+		hd44780 icp_a106 imon imonlcd IOWarrior
+		lb216 lcdm001 lcterm
+		MD8800 ms6931 mtc_s16209x MtxOrb NoritakeVFD
+		pyramid sed1330 sed1520 serialVFD sli
+		stv5730 svga t6963 text tyan
+		ula200 xosd ea65 picolcd serialPOS)
+
+	# Generate comma separated list of drivers
+	COMMA_DRIVERS=""
+	FIRST_DRIVER=""
+	local index=0
+
+	while [ "${index}" -lt "${NUM_DEVICES}" ] ; do
+		if use "lcd_devices_${IUSE_LCD_DEVICES[${index}]}" ; then
+			append-driver "${DEVICE_DRIVERS[${index}]}"
+		fi
+		let "index = ${index} + 1"
+	done
+
+	# Append the not-lcd-drivers (input)
+	use lirc && append-driver "lirc"
+	use irman && append-driver "irman"
+	use joystick && append-driver "joy"
+
+	if [ -z "${COMMA_DRIVERS}" ] ; then
+		ewarn "You are compiling LCDd without support for any LCD drivers at all."
+	else
+		# Patch the config to contain a driver that is actually installed instead of the default
+		elog "Compiling the following drivers for LCDd: ${COMMA_DRIVERS}"
+		elog "Setting Driver=${FIRST_DRIVER} in LCDd.conf"
+		sed -i "44s:curses:${FIRST_DRIVER}:" LCDd.conf
+	fi
+
+	local ENABLEUSB
+	if use lcd_devices_cfontzpacket || use lcd_devices_cwlinux || use lcd_devices_pyramid; then
+		ENABLEUSB="--enable-libusb"
+	else
+		ENABLEUSB="$(use_enable usb libusb)"
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable nfs stat-nfs) \
+		$(use_enable samba stat-smbfs ) \
+		$(use_enable seamless-hbars) \
+		${ENABLEUSB} \
+		"--enable-drivers=${COMMA_DRIVERS}"  \
+		|| die "configure failed"
+
+	emake || die "make failed"
+
+	if use doc; then
+		ebegin "Creating user documentation"
+		cd "${S}"/docs/lcdproc-user
+		xmlto html lcdproc-user.docbook
+		eend $?
+
+		ebegin "Creating dev documentation"
+		cd "${S}"/docs/lcdproc-dev
+		xmlto html lcdproc-dev.docbook
+		eend $?
+	fi
+}
+
+append-driver() {
+	[[ -z $* ]] && return 0
+	if [ -z "${COMMA_DRIVERS}" ] ; then
+		# First in the list
+		COMMA_DRIVERS="$*"
+		FIRST_DRIVER="$*"
+	else
+		# Second, third, ... include a comma at the front
+		COMMA_DRIVERS="${COMMA_DRIVERS},$*"
+	fi
+	return 0
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# move example clients installed to /usr/bin
+	rm -f "${D}"/usr/bin/{tail,lcdmetar,iosock,fortune,x11amp}.pl
+	insinto /usr/share/lcdproc/clients
+	doins clients/examples/*.pl
+	doins clients/metar/
+
+	newinitd "${FILESDIR}/0.5.1-LCDd.initd" LCDd
+	newinitd "${FILESDIR}/0.5.2-r2-lcdproc.initd" lcdproc
+
+	dodoc README CREDITS ChangeLog INSTALL TODO
+	dodoc docs/README.* docs/*.txt
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/lcdproc-user
+		doins docs/lcdproc-user/*.html
+		insinto /usr/share/doc/${PF}/lcdproc-dev
+		doins docs/lcdproc-dev/*.html
+	fi
+}
+
+pkg_postinst() {
+	ewarn "IMPORTANT: Please update your /etc/LCDd.conf"
+	ewarn "As of lcdproc-0.5.1-r2, the DriverPath changed from /usr/share/lcdproc to /usr/$(get_libdir)/lcdproc ."
+}