Port 1.4-branch hrtimer build fix to 1.2.27, fixes build against 2.6.28 kernels. Quote a few variables in the 1.2.18 ebuilds.

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

6 files changed, 153 insertions, 95 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index d4e9ac2a9834..99c1cf9570f6 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.114 2009/04/05 14:20:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.115 2009/04/06 14:59:26 chainsaw Exp $
+
+  06 Apr 2009; <chainsaw@gentoo.org> +files/zaptel-1.2.27-hrtimer.patch,
+  zaptel-1.2.18.ebuild, zaptel-1.2.18-r1.ebuild, zaptel-1.2.27.ebuild:
+  Port 1.4-branch hrtimer build fix to 1.2.27, fixes build against 2.6.28
+  kernels. Quote a few variables in the 1.2.18 ebuilds.
 
   05 Apr 2009; Brent Baude <ranger@gentoo.org> zaptel-1.2.18.ebuild:
   Marking zaptel-1.2.18 ppc for bug 237476
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index f650762dd78c..37d8d2cd354f 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX zaptel-1.2.18-2.6.22.diff 1172 RMD160 d285a3a76fb9023db10207467c6cdbdb06677574 SHA1 186ce56d54d0c9cc8ac6df1f78472ed3e165fa82 SHA256 e90a922d549d2a10532cd20f053c48beb0510c1465cb40de0a515a1ad7bb7ccd
 AUX zaptel-1.2.18-gentoo.diff 5295 RMD160 fe847e40ecdf041970bf91fe38f088cf3e1be4c3 SHA1 03badeb90d7b97e69878d6fed64d6ce317a09ea5 SHA256 f7caa5824fc7ef39149b6a52dd9b4520d4580db20211b0c8995275ae89ff2c31
 AUX zaptel-1.2.23-gentoo.diff 2352 RMD160 33bfa3ad9645eb8a26576e680916dfbf52762beb SHA1 8518953978d1f4e9ac27c7a5e1f4dc2d49c1452d SHA256 43a66b279a7c65f94b728e146bc206f82119fc057230d517c30dc894f47b0361
 AUX zaptel-1.2.25-xpputils.diff 1003 RMD160 7c0fce9b25b7c150054c3a05360ae25dc6e35905 SHA1 9ed98f3aac4eddc6fdfd5e5ff384b83552c7abb0 SHA256 475a043d99dc8c83f04ae61ba84ea66a06380f31e42cd7d1579c52ee5f04f230
 AUX zaptel-1.2.26-gentoo.diff 2630 RMD160 deb1159fe570e1d84cd64d93189791685dab8f67 SHA1 1d0ec0c897083c89422ae2ff5e5d14d72349dde9 SHA256 7780f7f7483c5d67b2ddc416f145f2995a2df2a3de6ee9d85ea088dd075238a8
+AUX zaptel-1.2.27-hrtimer.patch 1214 RMD160 404e928bd61531eed6012a20d69f75f214dfebd6 SHA1 97d381aaeca42b8a9e68bf1331f59368cdcf7e57 SHA256 01c45b8f9217edeb27e894d0153f5f5a37f57cdc2a4e38e0fe5d8f7b6544cd5b
 AUX zaptel-1.2.27-kernel.patch 717 RMD160 3706368aa788e1079c509a802634a189c74a1f98 SHA1 adb034c6ae3c4bfabfc710ee0238ec7b16ae1edd SHA256 00d3eb981adfdf6a0075ef9e563e421c403400b901b570847dbb704fe435f069
 AUX zaptel-1.2.27-semaphore.patch 3109 RMD160 dbac54f308febd2d30752c0565cc9f20785a318d SHA1 6b3b86af614c0ec5b9866ad6cda65e08444e49b8 SHA256 bf7be7a810a5f4cf15ff3ae315cf1cd97f734db1426b98fe3177d2af9521e50f
 AUX zaptel-1.2.9.1-ar.patch 924 RMD160 24eac6e9c5a9576b04df1e595fa6a2e2487772fe SHA1 fdf329d360508d8e629d196d4f0e6ccfabf24dff SHA256 8a8374b2689ed70108d10eb704bb6d3b35550f33a183e039e7efd69c7a681485
@@ -20,10 +24,17 @@ DIST zaptel-1.2.18.tar.gz 3076214 RMD160 e051b06311681c281a70c4826705b2ab315377c
 DIST zaptel-1.2.24.tar.gz 3698419 RMD160 dae9da002162ad74d3324f0b0bad409af2585666 SHA1 4a45654ce392a8ba5a5d73a0a01ba8febfcc5c4b SHA256 2c00825461ac3605311f3be646fec0c95715954bbf71aca4eda105fea7895da0
 DIST zaptel-1.2.26.tar.gz 3731266 RMD160 47f584ea4d738b1bc12dc32a6694cd435004c4b5 SHA1 180d2697c773105b2adfe632254116e687447151 SHA256 73481e63596b45587f07aacca6906d298ab36e4b162f1af1af87fb99dcd5dda8
 DIST zaptel-1.2.27.tar.gz 3732992 RMD160 f41ab128a8ecce86a07efc1a697ae7cf1836137e SHA1 02d394a19a998dece198c108ea1b9830b7de0653 SHA256 7bf31ab4b3c4c9e833c9709ceb1d6e82c17fdbc5cbc9933b65ceb7ade4b79f8f
-EBUILD zaptel-1.2.18-r1.ebuild 11135 RMD160 4f16f3e055e5f19aedf0a6e05ca40d2ac4ec7318 SHA1 a50d7a2e5dee7be8119034c8360d6501c1deb37f SHA256 ff1351ea9269cb30c3a6eb28ec873f52e18e88ae5bbf3ec5e970c8ad4d83b1b6
-EBUILD zaptel-1.2.18.ebuild 9342 RMD160 a2dbb5d03486cab25c47edae31c88fbc6af748c3 SHA1 b01f5f5f13489e91ff668b56bbeb2ffcc44895f9 SHA256 a9b79e8d0c39dc778927818373cc5ffc3c62ed523ef5a1a33fbc46ac105dbc5d
+EBUILD zaptel-1.2.18-r1.ebuild 11226 RMD160 2ee34468bae2b52a1782dc35774f210dea56ed2f SHA1 c972dcebd0f92156ec2beb3d0fbf1dc4bcf6e771 SHA256 e8c87b1396e48498d3c7f73c03bd1c29de4df674055b6fc4a26d7a260e807ab2
+EBUILD zaptel-1.2.18.ebuild 9412 RMD160 3bd3e15d59634cbb3421140c1bfb0356c936cbbe SHA1 981286d013893ef36801a607938167cedf03e103 SHA256 0cae5dce521921ed162f89ce73a823360e65fbe6fcc3255446591ff23af5f7d0
 EBUILD zaptel-1.2.24.ebuild 8958 RMD160 d82442e671d7e0aca2792c062a9fce8da51b4e12 SHA1 335127b5ee570c6fa00f7aa126abb1caf9ab98b5 SHA256 a199b68bda89f4808216aa1d2fd0543c10e825fb7aec9c9fa7bf408a1b9e6692
 EBUILD zaptel-1.2.26-r1.ebuild 9055 RMD160 61b054ca38b0438c0aa08bd42386ff10e7ad18da SHA1 5116cdd2f54957e00697e10ff2ec3e675102307e SHA256 729438774adaa6d57891507fcb28541ca70d215e54575ff9ba71977d472493f5
-EBUILD zaptel-1.2.27.ebuild 9151 RMD160 23e8fa3898a19e89799c10c2f7ae6f3fe511bb60 SHA1 d10b920e46fc530fd4cfee9667afeec819d5fb33 SHA256 8e1feb6eaf6a1438e405c8d3241ae6d9ee7b5778d42c0757908316e22fd1faf7
-MISC ChangeLog 22414 RMD160 b45b49818be79300d027f2754680dd8bd2ce411f SHA1 44af1d2816536e25d22bb737046d9cad4df7d79f SHA256 3c39a9fa31b7ce3fdebb9062e6a1946ca1782e6b9e89100f97fc24a8936fa562
+EBUILD zaptel-1.2.27.ebuild 9206 RMD160 d5bf3425ccc481be03c0a03fb24d3eeb94524792 SHA1 fdff45b9ca5d00107373e33efd3eae30f5c2ee79 SHA256 0451ae1ea6e92237a9c4335b36f3d69011f92fad60bc9e1ddce01aa990133c3a
+MISC ChangeLog 22691 RMD160 d2ed5dc022bf831fcf910f37b8fe5755c65eac39 SHA1 cf82852fbd75e7bb4784d3e342161e559c28a176 SHA256 9de13bb6910bcbc442ce478718e534f452ae5eeaf773fbb4f01ce329b9facc99
 MISC metadata.xml 1480 RMD160 27bd3bee78996d32f3d2f58f48219cd48dbc038b SHA1 d4e6c0d8f8de3cdfc606830cbad9b477e489420a SHA256 90da234d53bce387b5b12b022bdd55edf0e8a2ccb20518c2df46e9cb06e167e6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknaGNYACgkQp5vW4rUFj5oCeQCdEGNvWd4LkPH3NFoNgdEyl+++
++1gAn0TQzpUiJzXlwINJgyQH5IrMjgWg
+=0QXz
+-----END PGP SIGNATURE-----
diff --git a/net-misc/zaptel/files/zaptel-1.2.27-hrtimer.patch b/net-misc/zaptel/files/zaptel-1.2.27-hrtimer.patch
new file mode 100644
index 000000000000..3eada3093186
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.2.27-hrtimer.patch
@@ -0,0 +1,41 @@
+diff -uNr zaptel-1.2.27.ORIG/ztdummy.c zaptel-1.2.27/ztdummy.c
+--- zaptel-1.2.27.ORIG/ztdummy.c	2009-04-06 10:36:51.000000000 +0100
++++ zaptel-1.2.27/ztdummy.c	2009-04-06 10:40:21.000000000 +0100
+@@ -107,6 +107,19 @@
+ #  error "This kernel is too old: not supported by this file"
+ #endif
+ 
++#if defined(USE_HIGHRESTIMER) && ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) )
++/* compatibility with new hrtimer interface */
++static inline ktime_t hrtimer_get_expires(const struct hrtimer *timer)
++{
++	return timer->expires;
++}
++
++static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
++{
++	timer->expires = time;
++}
++#endif
++
+ static struct ztdummy *ztd;
+ 
+ static int debug = 0;
+@@ -192,7 +205,7 @@
+ 	 * expired.
+ 	 * We should worry if overrun is 2 or more; then we really missed 
+ 	 * a tick */
+-	overrun = hrtimer_forward(&zaptimer, htmr->expires, 
++	overrun = hrtimer_forward(&zaptimer, hrtimer_get_expires(htmr),
+ 			ktime_set(0, ZAPTEL_TIME_NS));
+ 	if(overrun > 1) {
+ 		if(printk_ratelimit())
+@@ -217,7 +230,7 @@
+ {
+     zt_receive(&ztd->span);
+     zt_transmit(&ztd->span);
+-    timer.expires = jiffies + 1;
++    hrtimer_set_expires(timer, jiffies + 1);
+     add_timer(&timer);
+ }
+ #endif
diff --git a/net-misc/zaptel/zaptel-1.2.18-r1.ebuild b/net-misc/zaptel/zaptel-1.2.18-r1.ebuild
index 03e926966759..009e9ff77f5e 100644
--- a/net-misc/zaptel/zaptel-1.2.18-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.18-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild,v 1.2 2007/07/15 23:22:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild,v 1.3 2009/04/06 14:59:26 chainsaw Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -60,21 +60,21 @@ select_echo_cancel() {
 }
 
 zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
+	if grep -q "${1}" "${S}/zconfig.h"; then
 		# match a little more than ${1} so we can use zconfig_disable
 		# to disable all echo cancellers in zconfig.h w/o calling it several times
 		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
+			"${S}/zconfig.h"
 	fi
 
 	return $?
 }
 
 zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
+	if grep -q "${1}" "${S}/zconfig.h"; then
 		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
 			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
+			"${S}/zconfig.h"
 	fi
 
 	return $?
@@ -175,29 +175,29 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-2.6.22.diff
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-2.6.22.diff"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/zaptel-1.2.9.1-ar.patch"
 
 	# try to apply bristuff patch
 	if use bri; then
 		# fix for userpriv
-		chmod -R a=rwX ${S_BRI}
+		chmod -R a=rwX "${S_BRI}"
 
 		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
-		epatch ${S_BRI}/patches/zaptel.patch
+		epatch "${S_BRI}"/patches/zaptel.patch
 
-		cd ${S_BRI}
+		cd "${S_BRI}"
 
 		if use florz; then
 			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
 
 			# remove as soon as there's a new florz patch available
 			sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
+				"${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff"
 
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
+			epatch "${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff"
 		fi
 
 		# patch includes
@@ -217,7 +217,7 @@ src_unpack() {
 		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
 			zaphfc/Makefile
 
-		cd ${S}
+		cd "${S}"
 	fi
 
 	# oslec echo canceller
@@ -287,43 +287,43 @@ src_unpack() {
 
 src_compile() {
 	# build
-	make KVERS=${KV_FULL} \
-	     KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die
+	make KVERS="${KV_FULL}" \
+	     KSRC="${KV_DIR}" ARCH="$(tc-arch-kernel)" || die
 
 	if use astribank; then
-		cd ${S}/xpp/utils
+		cd "${S}"/xpp/utils
 		make || die "make xpp utils failed"
 	fi
 
 	if use bri; then
-		cd ${S_BRI}
+		cd "${S_BRI}"
 		for x in cwain qozap zaphfc; do
 			einfo "Building ${x}..."
-			make KVERS=${KV_FULL} \
+			make KVERS="${KV_FULL}" \
 				KSRC=/usr/src/linux \
-				ARCH=$(tc-arch-kernel) \
-				-C ${x} || die "make ${x} failed"
+				ARCH="$(tc-arch-kernel)" \
+				-C "${x}" || die "make ${x} failed"
 		done
 	fi
 
 	if use ecoslec; then
 		cd "${S_OSLEC}"
-		make KVERS=${KV_FULL} \
+		make KVERS="${KV_FULL}" \
 			KDIR=/usr/src/linux \
-			ARCH=$(tc-arch-kernel) || die "emake oslec failed"
+			ARCH="$(tc-arch-kernel)" || die "emake oslec failed"
 	fi
 }
 
 src_install() {
 	# Create firmware directory
-	mkdir -p ${D}/lib/firmware/
+	mkdir -p "${D}/lib/firmware/"
 
-	kernel_is 2 4 && cp /etc/modules.conf ${D}/etc
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
+	kernel_is 2 4 && cp /etc/modules.conf "${D}/etc"
+	make INSTALL_PREFIX="${D}" ARCH="$(tc-arch-kernel)" \
+	     KVERS="${KV_FULL}" KSRC=/usr/src/linux install || die
 
 	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig README.fxotune
+	dodoc zaptel.conf.sample zaptel.sysconfig README.fxotune
 
 	# additional tools
 	dobin ztmonitor ztspeed zttest fxotune
@@ -335,12 +335,12 @@ src_install() {
 
 	if use bri; then
 		einfo "Installing bri"
-		cd ${S_BRI}
+		cd "${S_BRI}"
 
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
+		insinto "/lib/modules/${KV_FULL}/misc"
+		doins "qozap/qozap.${KV_OBJ}"
+		doins "zaphfc/zaphfc.${KV_OBJ}"
+		doins "cwain/cwain.${KV_OBJ}"
 
 		# install example configs for octoBRI and quadBRI
 		insinto /etc
@@ -365,13 +365,13 @@ src_install() {
 		docinto bristuff/cwain
 		dodoc cwain/TODO cwain/LICENSE
 
-		cd ${S}
+		cd "${S}"
 	fi
 
 	if use ecoslec; then
 		cd "${S_OSLEC}"
-		insinto /lib/modules/${KV_FULL}/misc
-		doins oslec.${KV_OBJ}
+		insinto "/lib/modules/${KV_FULL}/misc"
+		doins "oslec.${KV_OBJ}"
 
 		newsbin oslec-ctrl-panel.sh	oslec-ctrl-panel
 
@@ -382,27 +382,27 @@ src_install() {
 	fi
 
 	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
+	newinitd "${FILESDIR}/zaptel.rc6" zaptel
+	newconfd "${FILESDIR}/zaptel.confd" zaptel
 
 	# install devfsd rule file
 	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
+	newins "${FILESDIR}/zaptel.devfsd" zaptel
 
 	# install udev rule file
 	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
+	newins "${FILESDIR}/zaptel.udevd" 10-zaptel.rules
 
 	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
+	if [[ -d "${D}/dev/zap" ]]; then
+		chown -R root:dialout	"${D}/dev/zap"
+		chmod -R u=rwX,g=rwX,o= "${D}/dev/zap"
 	fi
 
 	if use astribank; then
-		cd ${S}/xpp/utils
+		cd "${S}"/xpp/utils
 		eval `perl '-V:installarchlib'`
-		make DESTDIR=${D} PERLLIBDIR=${installarchlib} install \
+		make DESTDIR="${D}" PERLLIBDIR="${installarchlib}" install \
 			|| die "failed xpp utils install"
 		dosbin zt_registration xpp_sync lszaptel
 	fi
@@ -440,8 +440,8 @@ pkg_postinst() {
 	fi
 
 	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
+	if [[ -d "${ROOT}dev/zap" ]]; then
+		chown -R root:dialout	"${ROOT}dev/zap"
+		chmod -R u=rwX,g=rwX,o= "${ROOT}dev/zap"
 	fi
 }
diff --git a/net-misc/zaptel/zaptel-1.2.18.ebuild b/net-misc/zaptel/zaptel-1.2.18.ebuild
index 434ac292623e..bd772b4cbfcd 100644
--- a/net-misc/zaptel/zaptel-1.2.18.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild,v 1.5 2009/04/05 14:20:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild,v 1.6 2009/04/06 14:59:26 chainsaw Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -53,21 +53,21 @@ select_echo_cancel() {
 }
 
 zconfig_disable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
+	if grep -q "${1}" "${S}/zconfig.h"; then
 		# match a little more than ${1} so we can use zconfig_disable
 		# to disable all echo cancellers in zconfig.h w/o calling it several times
 		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h
+			"${S}/zconfig.h"
 	fi
 
 	return $?
 }
 
 zconfig_enable() {
-	if grep -q "${1}" ${S}/zconfig.h; then
+	if grep -q "${1}" "${S}/zconfig.h"; then
 		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
 			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h
+			"${S}/zconfig.h"
 	fi
 
 	return $?
@@ -168,10 +168,10 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	epatch ${FILESDIR}/${P}-2.6.22.diff
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	epatch ${FILESDIR}/zaptel-1.2.9.1-ar.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-2.6.22.diff"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/zaptel-1.2.9.1-ar.patch"
 
 	# try to apply bristuff patch
 	if use bri; then
@@ -181,16 +181,16 @@ src_unpack() {
 		einfo "Patching zaptel w/ BRI stuff (${BRI_VERSION})"
 		epatch ${S_BRI}/patches/zaptel.patch
 
-		cd ${S_BRI}
+		cd "${S_BRI}"
 
 		if use florz; then
 			einfo "Using florz patches (${FLORZ_VERSION}) for zaphfc"
 
 			# remove as soon as there's a new florz patch available
 			sed -i -e "s:zaptel-1\.2\.5:zaptel-1.2.6:g" \
-				${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
+				"${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff"
 
-			epatch ${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff
+			epatch "${WORKDIR}/zaphfc_${FLORZ_VERSION}.diff"
 		fi
 
 		# patch includes
@@ -210,7 +210,7 @@ src_unpack() {
 		sed -i  -e "s:^\(CFLAGS+=-I. \).*:\1 \$(ZAP):" \
 			zaphfc/Makefile
 
-		cd ${S}
+		cd "${S}"
 	fi
 
 ### Configuration changes
@@ -254,12 +254,12 @@ src_compile() {
 	     KSRC=${KV_DIR} ARCH=$(tc-arch-kernel) || die
 
 	if use astribank; then
-		cd ${S}/xpp/utils
+		cd "${S}"/xpp/utils
 		make || die "make xpp utils failed"
 	fi
 
 	if use bri; then
-		cd ${S_BRI}
+		cd "${S_BRI}"
 		for x in cwain qozap zaphfc; do
 			einfo "Building ${x}..."
 			make KVERS=${KV_FULL} \
@@ -272,14 +272,14 @@ src_compile() {
 
 src_install() {
 	# Create firmware directory
-	mkdir -p ${D}/lib/firmware/
+	mkdir -p "${D}/lib/firmware/"
 
-	kernel_is 2 4 && cp /etc/modules.conf ${D}/etc
-	make INSTALL_PREFIX=${D} ARCH=$(tc-arch-kernel) \
-	     KVERS=${KV_FULL} KSRC=/usr/src/linux install || die
+	kernel_is 2 4 && cp /etc/modules.conf "${D}/etc"
+	make INSTALL_PREFIX="${D}" ARCH="$(tc-arch-kernel)" \
+	     KVERS="${KV_FULL}" KSRC=/usr/src/linux install || die
 
 	dodoc ChangeLog README README.udev README.Linux26 README.fxsusb zaptel.init
-	dodoc zaptel.conf.sample LICENSE zaptel.sysconfig README.fxotune
+	dodoc zaptel.conf.sample zaptel.sysconfig README.fxotune
 
 	# additional tools
 	dobin ztmonitor ztspeed zttest fxotune
@@ -291,12 +291,12 @@ src_install() {
 
 	if use bri; then
 		einfo "Installing bri"
-		cd ${S_BRI}
+		cd "${S_BRI}"
 
-		insinto /lib/modules/${KV_FULL}/misc
-		doins qozap/qozap.${KV_OBJ}
-		doins zaphfc/zaphfc.${KV_OBJ}
-		doins cwain/cwain.${KV_OBJ}
+		insinto "/lib/modules/${KV_FULL}/misc"
+		doins "qozap/qozap.${KV_OBJ}"
+		doins "zaphfc/zaphfc.${KV_OBJ}"
+		doins "cwain/cwain.${KV_OBJ}"
 
 		# install example configs for octoBRI and quadBRI
 		insinto /etc
@@ -321,31 +321,31 @@ src_install() {
 		docinto bristuff/cwain
 		dodoc cwain/TODO cwain/LICENSE
 
-		cd ${S}
+		cd "${S}"
 	fi
 
 	# install init script
-	newinitd ${FILESDIR}/zaptel.rc6 zaptel
-	newconfd ${FILESDIR}/zaptel.confd zaptel
+	newinitd "${FILESDIR}/zaptel.rc6" zaptel
+	newconfd "${FILESDIR}/zaptel.confd" zaptel
 
 	# install devfsd rule file
 	insinto /etc/devfs.d
-	newins ${FILESDIR}/zaptel.devfsd zaptel
+	newins "${FILESDIR}/zaptel.devfsd" zaptel
 
 	# install udev rule file
 	insinto /etc/udev/rules.d
-	newins ${FILESDIR}/zaptel.udevd 10-zaptel.rules
+	newins "${FILESDIR}/zaptel.udevd" 10-zaptel.rules
 
 	# fix permissions if there's no udev / devfs around
-	if [[ -d ${D}/dev/zap ]]; then
-		chown -R root:dialout	${D}/dev/zap
-		chmod -R u=rwX,g=rwX,o= ${D}/dev/zap
+	if [[ -d "${D}/dev/zap" ]]; then
+		chown -R root:dialout	"${D}/dev/zap"
+		chmod -R u=rwX,g=rwX,o= "${D}/dev/zap"
 	fi
 
 	if use astribank; then
-		cd ${S}/xpp/utils
+		cd "${S}/xpp/utils"
 		eval `perl '-V:installarchlib'`
-		make DESTDIR=${D} PERLLIBDIR=${installarchlib} install || die "failed xpp utils install"
+		make DESTDIR="${D}" PERLLIBDIR="${installarchlib}" install || die "failed xpp utils install"
 		dosbin zt_registration xpp_sync lszaptel
 	fi
 }
@@ -373,8 +373,8 @@ pkg_postinst() {
 	fi
 
 	# fix permissions if there's no udev / devfs around
-	if [[ -d ${ROOT}dev/zap ]]; then
-		chown -R root:dialout	${ROOT}dev/zap
-		chmod -R u=rwX,g=rwX,o= ${ROOT}dev/zap
+	if [[ -d "${ROOT}dev/zap" ]]; then
+		chown -R root:dialout	"${ROOT}dev/zap"
+		chmod -R u=rwX,g=rwX,o= "${ROOT}dev/zap"
 	fi
 }
diff --git a/net-misc/zaptel/zaptel-1.2.27.ebuild b/net-misc/zaptel/zaptel-1.2.27.ebuild
index 8f46938c2b57..95eb33e4879e 100644
--- a/net-misc/zaptel/zaptel-1.2.27.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.27.ebuild,v 1.2 2008/12/15 11:26:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.27.ebuild,v 1.3 2009/04/06 14:59:26 chainsaw Exp $
 
 inherit toolchain-funcs eutils linux-mod flag-o-matic multilib
 
@@ -175,6 +175,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/zaptel-1.2.25-xpputils.diff
 	epatch "${FILESDIR}"/zaptel-1.2.27-kernel.patch
 	epatch "${FILESDIR}"/zaptel-1.2.27-semaphore.patch
+	epatch "${FILESDIR}"/zaptel-1.2.27-hrtimer.patch
 
 	# try to apply bristuff patch
 	if use bri; then