Adding new init.d script for 0.5.0 to fix bug #148513

(Portage version: 2.1.2_pre1)

6 files changed, 235 insertions, 3 deletions

diff --git a/app-misc/lcdproc/ChangeLog b/app-misc/lcdproc/ChangeLog
index 7005d6f635db..eaf83812ce37 100644
--- a/app-misc/lcdproc/ChangeLog
+++ b/app-misc/lcdproc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/lcdproc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.31 2006/09/20 12:10:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.32 2006/09/22 14:12:58 jokey Exp $
+
+*lcdproc-0.5.0-r1 (22 Sep 2006)
+
+  22 Sep 2006; <jokey@gentoo.org> +files/0.5.0-LCDd, +files/0.4.5-LCDd,
+  -files/LCDd, lcdproc-0.4.5.ebuild, -lcdproc-0.5.0.ebuild,
+  +lcdproc-0.5.0-r1.ebuild:
+  Adding new init.d script for 0.5.0 to fix bug #148513
 
   20 Sep 2006; Markus Rothe <corsair@gentoo.org> lcdproc-0.5.0.ebuild:
   Added ~ppc64; bug #148072
diff --git a/app-misc/lcdproc/files/0.4.5-LCDd b/app-misc/lcdproc/files/0.4.5-LCDd
new file mode 100644
index 000000000000..9b153edc6204
--- /dev/null
+++ b/app-misc/lcdproc/files/0.4.5-LCDd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/files/0.4.5-LCDd,v 1.1 2006/09/22 14:12:58 jokey Exp $
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting LCDd"
+	start-stop-daemon --start --quiet -m --pidfile /var/run/LCDd.pid \
+		--background --exec /usr/sbin/LCDd -- -s -f -c /etc/LCDd.conf
+	sleep 1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping LCDd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/LCDd.pid
+	eend $?
+}
diff --git a/app-misc/lcdproc/files/0.5.0-LCDd b/app-misc/lcdproc/files/0.5.0-LCDd
new file mode 100644
index 000000000000..daefa4aaaa35
--- /dev/null
+++ b/app-misc/lcdproc/files/0.5.0-LCDd
@@ -0,0 +1,24 @@
+#!/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.0-LCDd,v 1.1 2006/09/22 14:12:58 jokey Exp $
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting LCDd"
+	start-stop-daemon --start --quiet -m --pidfile /var/run/LCDd.pid \
+		--background --exec /usr/sbin/LCDd -- -s 1 -f 1 \
+		|| ( eerror "Failed to start LCDd. Did you remember to set a driver in /etc/LCDd.conf? See syslog for details." \
+			&& return 1 )
+	sleep 1
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping LCDd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/LCDd.pid
+	eend $?
+}
diff --git a/app-misc/lcdproc/files/digest-lcdproc-0.5.0-r1 b/app-misc/lcdproc/files/digest-lcdproc-0.5.0-r1
new file mode 100644
index 000000000000..6fd0b99fd06c
--- /dev/null
+++ b/app-misc/lcdproc/files/digest-lcdproc-0.5.0-r1
@@ -0,0 +1,3 @@
+MD5 4b67e421c19063fa322611a849ab5b80 lcdproc-0.5.0.tar.gz 711118
+RMD160 44153db5fe24cc45aa1b7a4be8afb87a9cd58062 lcdproc-0.5.0.tar.gz 711118
+SHA256 a7567f3f68517008e68d15b33630f36ba539540fbb361a2f9c440ce2ceb8393b lcdproc-0.5.0.tar.gz 711118
diff --git a/app-misc/lcdproc/lcdproc-0.4.5.ebuild b/app-misc/lcdproc/lcdproc-0.4.5.ebuild
index 5852ff36ba63..69c47420b6ca 100644
--- a/app-misc/lcdproc/lcdproc-0.4.5.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.4.5.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/lcdproc/lcdproc-0.4.5.ebuild,v 1.11 2006/07/08 08:06:03 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.4.5.ebuild,v 1.12 2006/09/22 14:12:58 jokey Exp $
 
 DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
 HOMEPAGE="http://lcdproc.org/"
@@ -92,6 +92,6 @@ src_install() {
 	doins scripts/lcdproc.conf
 
 	exeinto /etc/init.d
-	doexe ${FILESDIR}/LCDd
+	newexe ${FILESDIR}/${PV}-LCDd LCDd
 	doexe ${FILESDIR}/lcdproc
 }
diff --git a/app-misc/lcdproc/lcdproc-0.5.0-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..0b7edbf8ba26
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.5.0-r1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.0-r1.ebuild,v 1.1 2006/09/22 14:12:58 jokey Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
+HOMEPAGE="http://lcdproc.org/"
+SRC_URI="mirror://sourceforge/lcdproc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc64 ~x86"
+
+# general use keywords in first line, drivers in line 2
+IUSE="doc debug ldap nfs samba usb
+	graphlcd irman lirc ncurses svga ula200 xosd"
+
+DEPEND="sys-apps/sed
+	>=sys-kernel/linux-headers-2.6.11
+	doc?      ( app-text/docbook-sgml-utils )
+	ldap?     ( net-nds/openldap )
+	usb?      ( dev-libs/libusb )
+
+	graphlcd? ( app-misc/graphlcd-base )
+	irman?    ( media-libs/libirman )
+	lirc?     ( app-misc/lirc )
+	ncurses?  ( sys-libs/ncurses )
+	svga?     ( media-libs/svgalib )
+	ula200?   ( dev-embedded/libftdi dev-libs/libusb )
+	xosd?     ( x11-libs/xosd ) "
+
+USE_DRIVERS="curses glcdlib irman lirc svga ula200 xosd"
+EXTRA_DRIVERS="bayrad CFontz CFontz633 CFontzPacket CwLnx \
+	glk hd44780 icp_a106 imon IOWarrior joy lb216 lcdm001 \
+	lcterm ms6931 mtc_s16209x MtxOrb NoritakeVFD pyramid sed1330 \
+	sed1520 serialVFD sli stv5730 t6963 text tyan "
+ALL_DRIVERS="${USE_DRIVERS} ${EXTRA_DRIVERS}"
+
+
+# compatibility with 1.4-ebuild format
+LCDPROC_DRIVERS=${LCDPROC_DRIVERS//,/ }
+
+# if no drivers or all are set, select the defaults
+has all ${LCDPROC_DRIVERS} \
+	&& LCDPROC_DRIVERS="${EXTRA_DRIVERS}"
+[ -z "${LCDPROC_DRIVERS}" ] \
+	&& LCDPROC_DRIVERS="${EXTRA_DRIVERS}"
+has none ${LCDPROC_DRIVERS} \
+	&& LCDPROC_DRIVERS=""
+
+pkg_setup() {
+
+	echo
+	einfo "If you are updating from lcdproc-0.4, note that the setup of drivers has changed:"
+	einfo "The drivers curses, glcdlib, irman, lirc, svga, ula200 and xosd are controlled by use flags."
+	einfo "All other drivers are built by default, or in respect to the env variable"
+	einfo "LCDPROC_DRIVERS which can be a space separated list. Example:"
+	einfo "     LCDPROC_DRIVERS=\"text CFontz\" emerge lcdproc"
+	einfo "You can also set this variable in your make.conf."
+	echo
+	einfo "Possible choices for LCDPROC_DRIVERS are:"
+	einfo "     bayrad CFontz CFontz633 CFontzPacket CwLnx glk hd44780 "
+	einfo "     icp_a106 imon IOWarrior joy lb216 lcdm001 lcterm "
+	einfo "     ms6931 mtc_s16209x MtxOrb NoritakeVFD pyramid sed1330 "
+	einfo "     sed1520 serialVFD sli stv5730 t6963 text tyan"
+	einfo "   'all' if you want to include all drivers (default)."
+	einfo "   'none' will not include any extra drivers."
+	echo
+
+	local FILTERED_DRIVERS
+	for driver in ${LCDPROC_DRIVERS}; do
+		if has ${driver} ${EXTRA_DRIVERS} ; then
+				FILTERED_DRIVERS="${FILTERED_DRIVERS} ${driver}"
+			else
+				eerror "The extra driver '${driver}' is not available or has to be enabled by a USE flag."
+				eerror "Please check your LCDPROC_DRIVERS-variable!"
+				echo
+		fi
+	done
+	LCDPROC_DRIVERS="${FILTERED_DRIVERS}"
+
+	einfo "The following drivers will be built: "
+	echo
+
+	# add use-flag specific drivers to LCDPROC_DRIVERS
+	use graphlcd && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} glcdlib"
+	use irman    && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} irman"
+	use lirc     && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} lirc"
+	use ncurses  && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} curses"
+	use svga     && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} svga"
+	use ula200   && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} ula200"
+	use xosd     && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} xosd"
+
+	for driver in ${ALL_DRIVERS}; do
+		has ${driver} ${LCDPROC_DRIVERS} \
+		&& einfo $driver ;
+	done
+	echo
+
+	has glcdlib ${LCDPROC_DRIVERS} || has all ${LCDPROC_DRIVERS} \
+		&& ewarn "Support for glcdlib might not work if you do not manually install" \
+		&& ewarn "GLCDprocDriver from http://www.muresan.de/graphlcd/lcdproc/"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-LCDd-conf-driver-path.patch"
+}
+
+src_compile() {
+	# avoid executable stack as mentioned
+	# in http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
+	append-ldflags -Wl,-z,noexecstack
+
+	# convert space separated LCDPROC_DRIVERS to comma separated COMMA_DRIVERS
+	local COMMA_DRIVERS
+	for driver in ${LCDPROC_DRIVERS}; do
+	    if [ -z "${COMMA_DRIVERS}" ] ; then
+			COMMA_DRIVERS="${driver}"
+		else
+			COMMA_DRIVERS="${COMMA_DRIVERS},${driver}"
+		fi
+	done
+
+	# CPPFLAGS to get CF-635 working
+	append-flags -DSEAMLESS_HBARS -DCFONTZ633_WRITE_DELAY=50
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable ldap) \
+		$(use_enable nfs stat-nfs) \
+		$(use_enable samba stat-smbfs ) \
+		$(use_enable usb libusb) \
+		"--enable-drivers=${COMMA_DRIVERS}"  \
+		|| die "configure failed"
+
+	if use doc; then
+		cd ${S}/docs/lcdproc-user
+		docbook2html lcdproc-user.docbook
+	fi
+
+	emake || die "make failed"
+}
+
+src_install() {
+	dosbin server/LCDd
+	dobin clients/lcdproc/lcdproc clients/lcdexec/lcdexec
+
+	insinto /usr/share/lcdproc/drivers
+		doins server/drivers/*.so
+
+	insinto /usr/share/lcdproc/clients
+		doins clients/examples/*.pl
+		doins clients/metar/lcdmetar.pl
+		doins clients/headlines/lcdheadlines
+
+	insinto /etc
+		doins LCDd.conf
+		doins scripts/lcdproc.conf
+
+	exeinto /etc/init.d
+		newexe ${FILESDIR}/${PV}-LCDd LCDd
+		doexe ${FILESDIR}/lcdproc
+
+	doman docs/*.1 docs/*.8
+	dodoc README CREDITS ChangeLog INSTALL
+	dodoc docs/README.* docs/*.txt
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/lcdproc-user
+		doins docs/lcdproc-user/*.html
+	fi
+
+}