General cleanup, and quote fixing.

Package-Manager: portage-2.1.3.12

8 files changed, 138 insertions, 137 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index b27f2ba4bc44..f1896c61468a 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.152 2007/10/11 19:35:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.153 2007/10/13 09:20:15 zzam Exp $
+
+  13 Oct 2007; Matthias Schwarzott <zzam@gentoo.org> lirc-0.8.0-r8.ebuild,
+  lirc-0.8.1.ebuild, lirc-0.8.2_pre2.ebuild, lirc-0.8.2.ebuild,
+  lirc-0.8.2-r1.ebuild, lirc-0.8.2-r2.ebuild:
+  General cleanup, and quote fixing.
 
 *lirc-0.8.2-r2 (11 Oct 2007)
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index ebe79295c205..294c1b718822 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX irexec-confd 280 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 SHA1 c6decc19a273d98d451de137a2ffbe16d5df28ae SHA256 c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79
 MD5 6abeb719007a883ff202cd75ffe922e8 files/irexec-confd 280
 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 files/irexec-confd 280
@@ -98,34 +101,34 @@ DIST lirc-0.8.0.tar.bz2 514359 RMD160 045c95754820e77891bd0b3baa269ad3f04cba8c S
 DIST lirc-0.8.1.tar.bz2 604524 RMD160 effba27a6aaa4a39d206d9d9e7cccc72edcd5fb5 SHA1 c26297b90bd0609c52d6f31062c3ecc13cb945f0 SHA256 86ea19a768e8b8a9ac19daf403ac8b017f7a20d2764e6e78267099094e4f9a1b
 DIST lirc-0.8.2.tar.bz2 634331 RMD160 e806608f8644a1d1f66689a40b2ed27b4cf43bd9 SHA1 84025603692836106714a2895e6201f6eb60ab37 SHA256 717e62ee763bad9c1ffc25dd096a8845d252eaa050f16f67c6fe3506194e7f62
 DIST lirc-0.8.2pre2.tar.bz2 620341 RMD160 fceef5aeec5a1fc8c3a0225ed165be3798ebeae9 SHA1 9bb041ddcc85effbba01e3a97d2d43c9516e5130 SHA256 c4fddca1f61234fbfd2517acadfbe85d99470d90132bf800bb324a9025b57f6a
-EBUILD lirc-0.8.0-r8.ebuild 8325 RMD160 368c7375606e358409c2d5f02091add70e0e225b SHA1 7330ce7698c2a9b347b05fc6e13f6d7bad3e2396 SHA256 964f1069739b06a0786927089a8eaa916dd4acaa7a4d9f0db57ce5b7b3078869
-MD5 68268c54cacede918e0b18a0add22208 lirc-0.8.0-r8.ebuild 8325
-RMD160 368c7375606e358409c2d5f02091add70e0e225b lirc-0.8.0-r8.ebuild 8325
-SHA256 964f1069739b06a0786927089a8eaa916dd4acaa7a4d9f0db57ce5b7b3078869 lirc-0.8.0-r8.ebuild 8325
-EBUILD lirc-0.8.1.ebuild 7634 RMD160 37ccdf5b6a048bce96748f34e0b3b9126bbc3f50 SHA1 2b408f090686f55f010f14bfe16fb6d915542bc3 SHA256 b2b83df6d2515f19bcd57d022d990d101a346b8087005079fac3c984ed490873
-MD5 3bb6975f0891c872d1a93a5c2b9a7df1 lirc-0.8.1.ebuild 7634
-RMD160 37ccdf5b6a048bce96748f34e0b3b9126bbc3f50 lirc-0.8.1.ebuild 7634
-SHA256 b2b83df6d2515f19bcd57d022d990d101a346b8087005079fac3c984ed490873 lirc-0.8.1.ebuild 7634
-EBUILD lirc-0.8.2-r1.ebuild 7790 RMD160 f9736092eb4c4db2dfa7ca8ec7bedf07c3a5a253 SHA1 bfdf9d925fdfd68bcb233df78db2325c1d3aa2c3 SHA256 4b59e3bd074bd53b7e2658995871d1ffdf676519dba8cfc85e949e004012b4b8
-MD5 8cd49a6a51e74702ef49f88ecbf6eda9 lirc-0.8.2-r1.ebuild 7790
-RMD160 f9736092eb4c4db2dfa7ca8ec7bedf07c3a5a253 lirc-0.8.2-r1.ebuild 7790
-SHA256 4b59e3bd074bd53b7e2658995871d1ffdf676519dba8cfc85e949e004012b4b8 lirc-0.8.2-r1.ebuild 7790
-EBUILD lirc-0.8.2-r2.ebuild 7788 RMD160 96c614ab23d1c58699c3656464671883d1c041c0 SHA1 907870f6b7e0220f2ef371841218070d8fe0bb4e SHA256 740c4f996548083e88fb4721175cab444fb1bc06480a44fc8e3511c65929232c
-MD5 274bd48e09e68418704283a5db8a1be4 lirc-0.8.2-r2.ebuild 7788
-RMD160 96c614ab23d1c58699c3656464671883d1c041c0 lirc-0.8.2-r2.ebuild 7788
-SHA256 740c4f996548083e88fb4721175cab444fb1bc06480a44fc8e3511c65929232c lirc-0.8.2-r2.ebuild 7788
-EBUILD lirc-0.8.2.ebuild 7726 RMD160 292e5e190b6887cc4e6c3ad3582dec6b2323dda3 SHA1 57ce31333eb3934df22f71bece0c10ee032dec83 SHA256 9fc16a02a8fb7d8908bc28d62c044a43d5566be24005da988843342df83fe037
-MD5 6f2a562abbdf7738b467abb0977f6537 lirc-0.8.2.ebuild 7726
-RMD160 292e5e190b6887cc4e6c3ad3582dec6b2323dda3 lirc-0.8.2.ebuild 7726
-SHA256 9fc16a02a8fb7d8908bc28d62c044a43d5566be24005da988843342df83fe037 lirc-0.8.2.ebuild 7726
-EBUILD lirc-0.8.2_pre2.ebuild 7745 RMD160 2d63764827fc860f005c4498b1ff1709965db2d8 SHA1 a0cb294e925f228d56738288609f8f34543e0ea8 SHA256 af936bdb32b53239bb8d3ba955b8c25c7afb231ae056fdf7dc12e1a0101bc6b7
-MD5 fb4948861726364f93146946993e56fd lirc-0.8.2_pre2.ebuild 7745
-RMD160 2d63764827fc860f005c4498b1ff1709965db2d8 lirc-0.8.2_pre2.ebuild 7745
-SHA256 af936bdb32b53239bb8d3ba955b8c25c7afb231ae056fdf7dc12e1a0101bc6b7 lirc-0.8.2_pre2.ebuild 7745
-MISC ChangeLog 23448 RMD160 4a979e3780c90b4d8043b43354a536c3f7a4c1e8 SHA1 414d2a961ee731f1d7e903e0d0666575aa27fb33 SHA256 f9097bbd679a1a08cc9a08905a08fc6fb47bd0c5bab2a4c20f5f6b5ecd5a48e4
-MD5 e29a2d8055b736c34a47be2f9af6fd2d ChangeLog 23448
-RMD160 4a979e3780c90b4d8043b43354a536c3f7a4c1e8 ChangeLog 23448
-SHA256 f9097bbd679a1a08cc9a08905a08fc6fb47bd0c5bab2a4c20f5f6b5ecd5a48e4 ChangeLog 23448
+EBUILD lirc-0.8.0-r8.ebuild 8359 RMD160 edd6722efa42aca85aeeb69c3f06f9c63f6881f2 SHA1 b832bc32f721c506fe04b1a2c037ecd480e5d6de SHA256 daf67f5c1b420a4080180d9009a2121f74acdb9cbc0e42b5806c1f5d8964a87e
+MD5 94a65db28e001dd527440064d6c50199 lirc-0.8.0-r8.ebuild 8359
+RMD160 edd6722efa42aca85aeeb69c3f06f9c63f6881f2 lirc-0.8.0-r8.ebuild 8359
+SHA256 daf67f5c1b420a4080180d9009a2121f74acdb9cbc0e42b5806c1f5d8964a87e lirc-0.8.0-r8.ebuild 8359
+EBUILD lirc-0.8.1.ebuild 7647 RMD160 a7684d11027410ba97ed42d1656f2285f195d10f SHA1 511cb592ec15bc02ca5d5912831b3cdbe812f4df SHA256 5037b921220e2c1fcd5fe67d13382ea41dddb866ef766092f4b8fa8d97651f3c
+MD5 ada38b8afdd50ff7e8aa877d4ad6f7e0 lirc-0.8.1.ebuild 7647
+RMD160 a7684d11027410ba97ed42d1656f2285f195d10f lirc-0.8.1.ebuild 7647
+SHA256 5037b921220e2c1fcd5fe67d13382ea41dddb866ef766092f4b8fa8d97651f3c lirc-0.8.1.ebuild 7647
+EBUILD lirc-0.8.2-r1.ebuild 7813 RMD160 4a547180cbe1b1573a3745945ab5c3291ca496af SHA1 d54869d12a9f643e78d549a7f7d509e86e385672 SHA256 da638782d508cabf082173d70c11f98c90ebe2e6f0c37a1b77422fd505f96833
+MD5 b3e2096d9a88e2a9e754e6139b2c2fe9 lirc-0.8.2-r1.ebuild 7813
+RMD160 4a547180cbe1b1573a3745945ab5c3291ca496af lirc-0.8.2-r1.ebuild 7813
+SHA256 da638782d508cabf082173d70c11f98c90ebe2e6f0c37a1b77422fd505f96833 lirc-0.8.2-r1.ebuild 7813
+EBUILD lirc-0.8.2-r2.ebuild 7806 RMD160 6d986bc0351fe12e5ea3deedcbe4c44d6e3b22c7 SHA1 4215f57acb5ff69f74f68ef94ed3a4c62cc1b4ec SHA256 3b909b7ac91b3ad9ecafe8f22e63e80eeae2d6af1e6aec29e1ac5c54ca33ca50
+MD5 4d31fe21009375f31ce6a3fc6fa1fd0e lirc-0.8.2-r2.ebuild 7806
+RMD160 6d986bc0351fe12e5ea3deedcbe4c44d6e3b22c7 lirc-0.8.2-r2.ebuild 7806
+SHA256 3b909b7ac91b3ad9ecafe8f22e63e80eeae2d6af1e6aec29e1ac5c54ca33ca50 lirc-0.8.2-r2.ebuild 7806
+EBUILD lirc-0.8.2.ebuild 7745 RMD160 ee45ee28db7b3391b9db6d829fe6aefdb971bb41 SHA1 a71643683333b048e87b217496d2bafcdf7d3172 SHA256 e0e8d9a1722f45d89451336d8261f570da9d906e5dc0700d521d40bb37b10327
+MD5 4bba6e2a72b3f5780d6ad5154d2bd77f lirc-0.8.2.ebuild 7745
+RMD160 ee45ee28db7b3391b9db6d829fe6aefdb971bb41 lirc-0.8.2.ebuild 7745
+SHA256 e0e8d9a1722f45d89451336d8261f570da9d906e5dc0700d521d40bb37b10327 lirc-0.8.2.ebuild 7745
+EBUILD lirc-0.8.2_pre2.ebuild 7764 RMD160 de1734a35e24949fd66600311c51136f2a2a4750 SHA1 b9dcd264f24c4231e3ffc94de18288f896382679 SHA256 a7b7218e318f537a812ae38127a19f158b9f3fa7d57b83e51d9a785fbcbb2783
+MD5 8a0be78248519d97d5010a847b1b1c57 lirc-0.8.2_pre2.ebuild 7764
+RMD160 de1734a35e24949fd66600311c51136f2a2a4750 lirc-0.8.2_pre2.ebuild 7764
+SHA256 a7b7218e318f537a812ae38127a19f158b9f3fa7d57b83e51d9a785fbcbb2783 lirc-0.8.2_pre2.ebuild 7764
+MISC ChangeLog 23671 RMD160 10b93906114852b43f4e08ac54d6f87aec486394 SHA1 37adb5eea5b28eadf03377bcf9a558d4b78d3f95 SHA256 fa66c7a00ecda2e1c5a1b63d62b30bd231fb058923001760c569005708ef9b3e
+MD5 70773a91c941096a90a09d17dd2635c5 ChangeLog 23671
+RMD160 10b93906114852b43f4e08ac54d6f87aec486394 ChangeLog 23671
+SHA256 fa66c7a00ecda2e1c5a1b63d62b30bd231fb058923001760c569005708ef9b3e ChangeLog 23671
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
 MD5 dcc0143f6508e9fd068845f98b7bb403 metadata.xml 162
 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af metadata.xml 162
@@ -148,3 +151,10 @@ SHA256 65c4eb9a309cecdbe32e8c7b884eb2759c4b43f79803a26fbe5f4428e78fb3ae files/di
 MD5 cec1b53dce7002d7bc8ef3c9d42b1f3c files/digest-lirc-0.8.2_pre2 247
 RMD160 0ed56503665fd4cdeb764c4afb8f1405325ec86c files/digest-lirc-0.8.2_pre2 247
 SHA256 85178d370b86564aebac9b79c8215c97625e85dc187208f93b64f3c9cea0552c files/digest-lirc-0.8.2_pre2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHEI3ht2vP6XvVdOcRAkO5AJ492s7HWJjnXSGmi9xPGskqlZmB/wCbBxF9
+X6KwWeDGhPOS5Rt3FE/mFxY=
+=y254
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/lirc-0.8.0-r8.ebuild b/app-misc/lirc/lirc-0.8.0-r8.ebuild
index cda46b175ac9..aea1b8e4ac69 100644
--- a/app-misc/lirc/lirc-0.8.0-r8.ebuild
+++ b/app-misc/lirc/lirc-0.8.0-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r8.ebuild,v 1.14 2007/07/22 09:54:11 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.0-r8.ebuild,v 1.15 2007/10/13 09:20:15 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -14,7 +14,7 @@ IUSE="debug doc X hardware-carrier transmitter"
 KEYWORDS="amd64 ppc ppc64 x86"
 SRC_URI="mirror://sourceforge/lirc/${P/_pre/pre}.tar.bz2"
 
-S=${WORKDIR}/${P/_pre/pre}
+S="${WORKDIR}/${P/_pre/pre}"
 
 IUSE_LIRC_DEVICES_DIRECT="
 	all userspace act200l act220l
@@ -80,7 +80,8 @@ for dev in ${IUSE_LIRC_DEVICES}; do
 done
 
 add_device() {
-	: $(( lirc_device_count++ ))
+	: ${lirc_device_count:=0}
+	((lirc_device_count++))
 
 	if [[ ${lirc_device_count} -eq 2 ]]; then
 		ewarn
@@ -94,10 +95,8 @@ add_device() {
 	fi
 
 	local dev="${1}"
-	local desc="device ${dev}"
-	if [[ -n "${2}" ]]; then
-		desc="${2}"
-	fi
+	local desc="${2}"
+	[[ -z ${desc} ]] && desc="device ${dev}"
 
 	elog "Compiling support for ${desc}"
 	MY_OPTS="${MY_OPTS} --with-driver=${dev}"
@@ -108,17 +107,14 @@ pkg_setup() {
 
 	# set default configure options
 	MY_OPTS=""
-	lirc_driver_count=0
-
 	LIRC_DRIVER_DEVICE="/dev/lirc/0"
 
-	local dev
-
 	if use lirc_devices_all; then
 		# compile in drivers for a lot of devices
 		add_device all "a lot of devices"
 	else
 		# compile in only requested drivers
+		local dev
 		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
 			if use lirc_devices_${dev}; then
 				add_device ${dev}
@@ -219,34 +215,34 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Apply kernel compatibility patches
-	epatch ${FILESDIR}/${P}-kernel-2.6.16.diff
-	epatch ${FILESDIR}/${P}-kernel-2.6.17.diff
-	epatch ${FILESDIR}/${P}-kernel-2.6.18.diff
-	epatch ${FILESDIR}/${P}-kernel-2.6.19.diff
+	epatch "${FILESDIR}"/${P}-kernel-2.6.16.diff
+	epatch "${FILESDIR}"/${P}-kernel-2.6.17.diff
+	epatch "${FILESDIR}"/${P}-kernel-2.6.18.diff
+	epatch "${FILESDIR}"/${P}-kernel-2.6.19.diff
 
 	# Fix an overflow when opening too many client-connections
-	epatch ${FILESDIR}/${P}-too-many-connections-overflow.diff
+	epatch "${FILESDIR}"/${P}-too-many-connections-overflow.diff
 
 	# Fix a sandbox violation while checking which cc to use for Kernel 2.6.19
 	# and newer
-	epatch ${FILESDIR}/${P}-sandbox-fix.diff
+	epatch "${FILESDIR}"/${P}-sandbox-fix.diff
 
 	# Work with udev-094 and greater
-	epatch ${FILESDIR}/${PN}-udev-094.diff
+	epatch "${FILESDIR}"/${PN}-udev-094.diff
 
 	# Bugfix for i2c-driver in combination with newer ivtv and Kernel 2.6.17
-	epatch ${FILESDIR}/${P}-i2c-kernel-2.6.17.diff
+	epatch "${FILESDIR}"/${P}-i2c-kernel-2.6.17.diff
 
 	# Wrong config-filename for LIRC_DEVICES=pixelview_bt878
-	epatch ${FILESDIR}/${P}-conf-pixelview_bt878.diff
+	epatch "${FILESDIR}"/${P}-conf-pixelview_bt878.diff
 
 	# Apply patches needed for some special device-types
-	[[ ${NEED_XBOX_PATCH:-0} == 1 ]] && epatch ${FILESDIR}/lirc-0.8.0pre4-xbox-remote.diff
-	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${P}-imon-pad2keys.patch
-	use lirc_devices_remote_wonder_plus && epatch ${FILESDIR}/lirc-remotewonderplus.patch
+	[[ ${NEED_XBOX_PATCH:-0} == 1 ]] && epatch "${FILESDIR}"/lirc-0.8.0pre4-xbox-remote.diff
+	use lirc_devices_imon_pad2keys && epatch "${FILESDIR}"/${P}-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-remotewonderplus.patch
 
 	# remove parallel driver on SMP systems
 	if linux_chkconfig_present SMP ; then
@@ -264,20 +260,20 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd ${FILESDIR}/lircd lircd
-	newinitd ${FILESDIR}/lircmd lircmd
-	newconfd ${FILESDIR}/lircd.conf lircd
+	newinitd "${FILESDIR}"/lircd lircd
+	newinitd "${FILESDIR}"/lircmd lircmd
+	newconfd "${FILESDIR}"/lircd.conf lircd
 
 	insinto /etc/modules.d/
-	newins ${FILESDIR}/modulesd.lirc lirc
+	newins "${FILESDIR}"/modulesd.lirc lirc
 
-	newinitd ${FILESDIR}/irexec-initd irexec
-	newconfd ${FILESDIR}/irexec-confd irexec
+	newinitd "${FILESDIR}"/irexec-initd irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
 
 	insinto /etc/udev/rules.d/;
-	newins ${S}/contrib/lirc.rules 10-lirc.rules
+	newins "${S}"/contrib/lirc.rules 10-lirc.rules
 
 	if use doc ; then
 		dohtml doc/html/*.html
diff --git a/app-misc/lirc/lirc-0.8.1.ebuild b/app-misc/lirc/lirc-0.8.1.ebuild
index 3be984e47769..dc10e48eaaa1 100644
--- a/app-misc/lirc/lirc-0.8.1.ebuild
+++ b/app-misc/lirc/lirc-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.1.ebuild,v 1.12 2007/07/12 03:35:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.1.ebuild,v 1.13 2007/10/13 09:20:15 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -80,6 +80,7 @@ for dev in ${IUSE_LIRC_DEVICES}; do
 done
 
 add_device() {
+	: ${lirc_device_count:=0}
 	((lirc_device_count++))
 
 	if [[ ${lirc_device_count} -eq 2 ]]; then
@@ -94,10 +95,8 @@ add_device() {
 	fi
 
 	local dev="${1}"
-	local desc="device ${dev}"
-	if [[ -n "${2}" ]]; then
-		desc="${2}"
-	fi
+	local desc="${2}"
+	[[ -z ${desc} ]] && desc="device ${dev}"
 
 	elog "Compiling support for ${desc}"
 	MY_OPTS="${MY_OPTS} --with-driver=${dev}"
@@ -108,17 +107,14 @@ pkg_setup() {
 
 	# set default configure options
 	MY_OPTS=""
-	lirc_driver_count=0
-
 	LIRC_DRIVER_DEVICE="/dev/lirc/0"
 
-	local dev
-
 	if use lirc_devices_all; then
 		# compile in drivers for a lot of devices
 		add_device all "a lot of devices"
 	else
 		# compile in only requested drivers
+		local dev
 		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
 			if use lirc_devices_${dev}; then
 				add_device ${dev}
@@ -221,16 +217,16 @@ src_unpack() {
 
 	# Fix a sandbox violation while checking which cc to use for Kernel 2.6.19
 	# and newer
-	epatch ${FILESDIR}/${PN}-0.8.0-sandbox-fix.diff
-	epatch ${FILESDIR}/${P}-kernel-2.6.20.diff
+	epatch "${FILESDIR}"/${PN}-0.8.0-sandbox-fix.diff
+	epatch "${FILESDIR}"/${P}-kernel-2.6.20.diff
 
 	# Rip out dos CRLF
 	edos2unix contrib/lirc.rules
 
 	# Apply patches needed for some special device-types
-	epatch ${FILESDIR}/lirc-0.8.1-atiusb-xbox.diff
-	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${PN}-0.8.1-imon-pad2keys.patch
-	use lirc_devices_remote_wonder_plus && epatch ${FILESDIR}/lirc-remotewonderplus.patch
+	epatch "${FILESDIR}"/lirc-0.8.1-atiusb-xbox.diff
+	use lirc_devices_imon_pad2keys && epatch "${FILESDIR}"/${PN}-0.8.1-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-remotewonderplus.patch
 
 	# remove parallel driver on SMP systems
 	if linux_chkconfig_present SMP ; then
@@ -250,18 +246,18 @@ src_unpack() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd ${FILESDIR}/lircd lircd
-	newinitd ${FILESDIR}/lircmd lircmd
-	newconfd ${FILESDIR}/lircd.conf lircd
+	newinitd "${FILESDIR}"/lircd lircd
+	newinitd "${FILESDIR}"/lircmd lircmd
+	newconfd "${FILESDIR}"/lircd.conf lircd
 
 	insinto /etc/modules.d/
-	newins ${FILESDIR}/modulesd.lirc lirc
+	newins "${FILESDIR}"/modulesd.lirc lirc
 
-	newinitd ${FILESDIR}/irexec-initd irexec
-	newconfd ${FILESDIR}/irexec-confd irexec
+	newinitd "${FILESDIR}"/irexec-initd irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
 
 	insinto /etc/udev/rules.d/;
-	newins ${S}/contrib/lirc.rules 10-lirc.rules
+	newins "${S}"/contrib/lirc.rules 10-lirc.rules
 
 	if use doc ; then
 		dohtml doc/html/*.html
diff --git a/app-misc/lirc/lirc-0.8.2-r1.ebuild b/app-misc/lirc/lirc-0.8.2-r1.ebuild
index 2f7f57d95cfd..343e9a130a78 100644
--- a/app-misc/lirc/lirc-0.8.2-r1.ebuild
+++ b/app-misc/lirc/lirc-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2-r1.ebuild,v 1.5 2007/09/01 08:12:58 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2-r1.ebuild,v 1.6 2007/10/13 09:20:15 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="debug doc X hardware-carrier transmitter"
 
-S=${WORKDIR}/${P/_pre/pre}
+S="${WORKDIR}/${P/_pre/pre}"
 
 RDEPEND="
 	X? (
@@ -90,6 +90,7 @@ for dev in ${IUSE_LIRC_DEVICES}; do
 done
 
 add_device() {
+	: ${lirc_device_count:=0}
 	((lirc_device_count++))
 
 	if [[ ${lirc_device_count} -eq 2 ]]; then
@@ -118,17 +119,14 @@ pkg_setup() {
 
 	# set default configure options
 	MY_OPTS=""
-	lirc_driver_count=0
-
 	LIRC_DRIVER_DEVICE="/dev/lirc/0"
 
-	local dev
-
 	if use lirc_devices_all; then
 		# compile in drivers for a lot of devices
 		add_device all "a lot of devices"
 	else
 		# compile in only requested drivers
+		local dev
 		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
 			if use lirc_devices_${dev}; then
 				add_device ${dev}
@@ -233,8 +231,8 @@ src_unpack() {
 	edos2unix contrib/lirc.rules
 
 	# Apply patches needed for some special device-types
-	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${PN}-0.8.1-imon-pad2keys.patch
-	use lirc_devices_remote_wonder_plus && epatch ${FILESDIR}/lirc-remotewonderplus.patch
+	use lirc_devices_imon_pad2keys && epatch "${FILESDIR}"/${PN}-0.8.1-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-remotewonderplus.patch
 
 	# bug 187822
 	epatch "${FILESDIR}/lirc-0.8.2-kernel-2.6.22.patch"
@@ -257,18 +255,18 @@ src_unpack() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd ${FILESDIR}/lircd lircd
-	newinitd ${FILESDIR}/lircmd lircmd
-	newconfd ${FILESDIR}/lircd.conf lircd
+	newinitd "${FILESDIR}"/lircd lircd
+	newinitd "${FILESDIR}"/lircmd lircmd
+	newconfd "${FILESDIR}"/lircd.conf lircd
 
 	insinto /etc/modules.d/
-	newins ${FILESDIR}/modulesd.lirc lirc
+	newins "${FILESDIR}"/modulesd.lirc lirc
 
-	newinitd ${FILESDIR}/irexec-initd irexec
-	newconfd ${FILESDIR}/irexec-confd irexec
+	newinitd "${FILESDIR}"/irexec-initd irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
 
 	insinto /etc/udev/rules.d/;
-	newins ${S}/contrib/lirc.rules 10-lirc.rules
+	newins "${S}"/contrib/lirc.rules 10-lirc.rules
 
 	if use doc ; then
 		dohtml doc/html/*.html
diff --git a/app-misc/lirc/lirc-0.8.2-r2.ebuild b/app-misc/lirc/lirc-0.8.2-r2.ebuild
index 3deda78ab3a6..686f9f33f820 100644
--- a/app-misc/lirc/lirc-0.8.2-r2.ebuild
+++ b/app-misc/lirc/lirc-0.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2-r2.ebuild,v 1.2 2007/10/13 01:02:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2-r2.ebuild,v 1.3 2007/10/13 09:20:15 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc X hardware-carrier transmitter"
 
-S=${WORKDIR}/${P/_pre/pre}
+S="${WORKDIR}/${P/_pre/pre}"
 
 RDEPEND="
 	X? (
@@ -90,6 +90,7 @@ for dev in ${IUSE_LIRC_DEVICES}; do
 done
 
 add_device() {
+	: ${lirc_device_count:=0}
 	((lirc_device_count++))
 
 	if [[ ${lirc_device_count} -eq 2 ]]; then
@@ -118,17 +119,14 @@ pkg_setup() {
 
 	# set default configure options
 	MY_OPTS=""
-	lirc_driver_count=0
-
 	LIRC_DRIVER_DEVICE="/dev/lirc0"
 
-	local dev
-
 	if use lirc_devices_all; then
 		# compile in drivers for a lot of devices
 		add_device all "a lot of devices"
 	else
 		# compile in only requested drivers
+		local dev
 		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
 			if use lirc_devices_${dev}; then
 				add_device ${dev}
@@ -233,8 +231,8 @@ src_unpack() {
 	edos2unix contrib/lirc.rules
 
 	# Apply patches needed for some special device-types
-	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${PN}-0.8.1-imon-pad2keys.patch
-	use lirc_devices_remote_wonder_plus && epatch ${FILESDIR}/lirc-remotewonderplus.patch
+	use lirc_devices_imon_pad2keys && epatch "${FILESDIR}"/${PN}-0.8.1-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-remotewonderplus.patch
 
 	# Bug 187822
 	epatch "${FILESDIR}/lirc-0.8.2-kernel-2.6.22.patch"
@@ -260,15 +258,15 @@ src_unpack() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd ${FILESDIR}/lircd lircd
-	newinitd ${FILESDIR}/lircmd lircmd
-	newconfd ${FILESDIR}/lircd.conf lircd
+	newinitd "${FILESDIR}"/lircd lircd
+	newinitd "${FILESDIR}"/lircmd lircmd
+	newconfd "${FILESDIR}"/lircd.conf lircd
 
 	insinto /etc/modules.d/
-	newins ${FILESDIR}/modulesd.lirc lirc
+	newins "${FILESDIR}"/modulesd.lirc lirc
 
-	newinitd ${FILESDIR}/irexec-initd irexec
-	newconfd ${FILESDIR}/irexec-confd irexec
+	newinitd "${FILESDIR}"/irexec-initd irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
 
 	if use doc ; then
 		dohtml doc/html/*.html
diff --git a/app-misc/lirc/lirc-0.8.2.ebuild b/app-misc/lirc/lirc-0.8.2.ebuild
index 3c48180ec9fc..76233a0d4501 100644
--- a/app-misc/lirc/lirc-0.8.2.ebuild
+++ b/app-misc/lirc/lirc-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2.ebuild,v 1.2 2007/07/12 03:35:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2.ebuild,v 1.3 2007/10/13 09:20:15 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -90,6 +90,7 @@ for dev in ${IUSE_LIRC_DEVICES}; do
 done
 
 add_device() {
+	: ${lirc_device_count:=0}
 	((lirc_device_count++))
 
 	if [[ ${lirc_device_count} -eq 2 ]]; then
@@ -118,17 +119,15 @@ pkg_setup() {
 
 	# set default configure options
 	MY_OPTS=""
-	lirc_driver_count=0
-
 	LIRC_DRIVER_DEVICE="/dev/lirc/0"
 
-	local dev
 
 	if use lirc_devices_all; then
 		# compile in drivers for a lot of devices
 		add_device all "a lot of devices"
 	else
 		# compile in only requested drivers
+		local dev
 		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
 			if use lirc_devices_${dev}; then
 				add_device ${dev}
@@ -233,8 +232,8 @@ src_unpack() {
 	edos2unix contrib/lirc.rules
 
 	# Apply patches needed for some special device-types
-	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${PN}-0.8.1-imon-pad2keys.patch
-	use lirc_devices_remote_wonder_plus && epatch ${FILESDIR}/lirc-remotewonderplus.patch
+	use lirc_devices_imon_pad2keys && epatch "${FILESDIR}"/${PN}-0.8.1-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-remotewonderplus.patch
 
 	# remove parallel driver on SMP systems
 	if linux_chkconfig_present SMP ; then
@@ -254,18 +253,18 @@ src_unpack() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd ${FILESDIR}/lircd lircd
-	newinitd ${FILESDIR}/lircmd lircmd
-	newconfd ${FILESDIR}/lircd.conf lircd
+	newinitd "${FILESDIR}"/lircd lircd
+	newinitd "${FILESDIR}"/lircmd lircmd
+	newconfd "${FILESDIR}"/lircd.conf lircd
 
 	insinto /etc/modules.d/
-	newins ${FILESDIR}/modulesd.lirc lirc
+	newins "${FILESDIR}"/modulesd.lirc lirc
 
-	newinitd ${FILESDIR}/irexec-initd irexec
-	newconfd ${FILESDIR}/irexec-confd irexec
+	newinitd "${FILESDIR}"/irexec-initd irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
 
 	insinto /etc/udev/rules.d/;
-	newins ${S}/contrib/lirc.rules 10-lirc.rules
+	newins "${S}"/contrib/lirc.rules 10-lirc.rules
 
 	if use doc ; then
 		dohtml doc/html/*.html
diff --git a/app-misc/lirc/lirc-0.8.2_pre2.ebuild b/app-misc/lirc/lirc-0.8.2_pre2.ebuild
index a5ecd3311a9a..8642a52d2fe0 100644
--- a/app-misc/lirc/lirc-0.8.2_pre2.ebuild
+++ b/app-misc/lirc/lirc-0.8.2_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2_pre2.ebuild,v 1.3 2007/07/12 03:35:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.2_pre2.ebuild,v 1.4 2007/10/13 09:20:15 zzam Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -90,6 +90,7 @@ for dev in ${IUSE_LIRC_DEVICES}; do
 done
 
 add_device() {
+	: ${lirc_device_count:=0}
 	((lirc_device_count++))
 
 	if [[ ${lirc_device_count} -eq 2 ]]; then
@@ -118,17 +119,15 @@ pkg_setup() {
 
 	# set default configure options
 	MY_OPTS=""
-	lirc_driver_count=0
-
 	LIRC_DRIVER_DEVICE="/dev/lirc/0"
 
-	local dev
 
 	if use lirc_devices_all; then
 		# compile in drivers for a lot of devices
 		add_device all "a lot of devices"
 	else
 		# compile in only requested drivers
+		local dev
 		for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do
 			if use lirc_devices_${dev}; then
 				add_device ${dev}
@@ -233,8 +232,8 @@ src_unpack() {
 	edos2unix contrib/lirc.rules
 
 	# Apply patches needed for some special device-types
-	use lirc_devices_imon_pad2keys && epatch ${FILESDIR}/${PN}-0.8.1-imon-pad2keys.patch
-	use lirc_devices_remote_wonder_plus && epatch ${FILESDIR}/lirc-remotewonderplus.patch
+	use lirc_devices_imon_pad2keys && epatch "${FILESDIR}"/${PN}-0.8.1-imon-pad2keys.patch
+	use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-remotewonderplus.patch
 
 	# remove parallel driver on SMP systems
 	if linux_chkconfig_present SMP ; then
@@ -254,18 +253,18 @@ src_unpack() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd ${FILESDIR}/lircd lircd
-	newinitd ${FILESDIR}/lircmd lircmd
-	newconfd ${FILESDIR}/lircd.conf lircd
+	newinitd "${FILESDIR}"/lircd lircd
+	newinitd "${FILESDIR}"/lircmd lircmd
+	newconfd "${FILESDIR}"/lircd.conf lircd
 
 	insinto /etc/modules.d/
-	newins ${FILESDIR}/modulesd.lirc lirc
+	newins "${FILESDIR}"/modulesd.lirc lirc
 
-	newinitd ${FILESDIR}/irexec-initd irexec
-	newconfd ${FILESDIR}/irexec-confd irexec
+	newinitd "${FILESDIR}"/irexec-initd irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
 
 	insinto /etc/udev/rules.d/;
-	newins ${S}/contrib/lirc.rules 10-lirc.rules
+	newins "${S}"/contrib/lirc.rules 10-lirc.rules
 
 	if use doc ; then
 		dohtml doc/html/*.html