QA fixes, thanks to Robert Buchholz

(Portage version: 2.1.2_pre1-r1)

3 files changed, 23 insertions, 19 deletions

diff --git a/app-misc/lcdproc/ChangeLog b/app-misc/lcdproc/ChangeLog
index eaf83812ce37..962cf33f4d8e 100644
--- a/app-misc/lcdproc/ChangeLog
+++ b/app-misc/lcdproc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.32 2006/09/22 14:12:58 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.33 2006/09/25 16:36:46 jokey Exp $
+
+  25 Sep 2006; <jokey@gentoo.org> lcdproc-0.4.5.ebuild,
+  lcdproc-0.5.0-r1.ebuild:
+  QA fixes, thanks to Robert Buchholz
 
 *lcdproc-0.5.0-r1 (22 Sep 2006)
 
diff --git a/app-misc/lcdproc/lcdproc-0.4.5.ebuild b/app-misc/lcdproc/lcdproc-0.4.5.ebuild
index 69c47420b6ca..e9dcff9cdf38 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.12 2006/09/22 14:12:58 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.4.5.ebuild,v 1.13 2006/09/25 16:36:46 jokey Exp $
 
 DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
 HOMEPAGE="http://lcdproc.org/"
@@ -9,6 +9,7 @@ SRC_URI="mirror://sourceforge/lcdproc/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+
 IUSE="doc ncurses samba svga"
 
 DEPEND=">=sys-apps/baselayout-1.6.4
@@ -16,9 +17,11 @@ DEPEND=">=sys-apps/baselayout-1.6.4
 	doc? ( >=app-text/docbook-sgml-utils-0.6.11-r2 )
 	ncurses? ( >=sys-libs/ncurses-5.3 )
 	svga? ( >=media-libs/svgalib-1.4.3 )"
+RDEPEND=${DEPEND}
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}
+	cd "${S}"
 
 	sed -i "889s:-O3:${CFLAGS}:" configure
 }
@@ -91,7 +94,6 @@ src_install() {
 	doins LCDd.conf
 	doins scripts/lcdproc.conf
 
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${PV}-LCDd LCDd
-	doexe ${FILESDIR}/lcdproc
+	newinitd "${FILESDIR}/${PV}-LCDd" LCDd
+	newinitd "${FILESDIR}/lcdproc" lcdproc
 }
diff --git a/app-misc/lcdproc/lcdproc-0.5.0-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.0-r1.ebuild
index 0b7edbf8ba26..093177e7e7c4 100644
--- a/app-misc/lcdproc/lcdproc-0.5.0-r1.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.0-r1.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.5.0-r1.ebuild,v 1.1 2006/09/22 14:12:58 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.5.0-r1.ebuild,v 1.2 2006/09/25 16:36:46 jokey Exp $
 
 inherit flag-o-matic
 
@@ -29,6 +29,7 @@ DEPEND="sys-apps/sed
 	svga?     ( media-libs/svgalib )
 	ula200?   ( dev-embedded/libftdi dev-libs/libusb )
 	xosd?     ( x11-libs/xosd ) "
+RDEPEND=${DEPEND}
 
 USE_DRIVERS="curses glcdlib irman lirc svga ula200 xosd"
 EXTRA_DRIVERS="bayrad CFontz CFontz633 CFontzPacket CwLnx \
@@ -93,8 +94,7 @@ pkg_setup() {
 	use xosd     && LCDPROC_DRIVERS="${LCDPROC_DRIVERS} xosd"
 
 	for driver in ${ALL_DRIVERS}; do
-		has ${driver} ${LCDPROC_DRIVERS} \
-		&& einfo $driver ;
+		has ${driver} ${LCDPROC_DRIVERS} && einfo $driver
 	done
 	echo
 
@@ -149,20 +149,19 @@ src_install() {
 	dobin clients/lcdproc/lcdproc clients/lcdexec/lcdexec
 
 	insinto /usr/share/lcdproc/drivers
-		doins server/drivers/*.so
+	doins server/drivers/*.so
 
 	insinto /usr/share/lcdproc/clients
-		doins clients/examples/*.pl
-		doins clients/metar/lcdmetar.pl
-		doins clients/headlines/lcdheadlines
+	doins clients/examples/*.pl
+	doins clients/metar/lcdmetar.pl
+	doins clients/headlines/lcdheadlines
 
 	insinto /etc
-		doins LCDd.conf
-		doins scripts/lcdproc.conf
+	doins LCDd.conf
+	doins scripts/lcdproc.conf
 
-	exeinto /etc/init.d
-		newexe ${FILESDIR}/${PV}-LCDd LCDd
-		doexe ${FILESDIR}/lcdproc
+	newinitd "${FILESDIR}/${PV}-LCDd" LCDd
+	newinitd "${FILESDIR}/lcdproc" lcdproc
 
 	doman docs/*.1 docs/*.8
 	dodoc README CREDITS ChangeLog INSTALL
@@ -172,5 +171,4 @@ src_install() {
 		insinto /usr/share/doc/${PF}/lcdproc-user
 		doins docs/lcdproc-user/*.html
 	fi
-
 }