switched custom ARCH setting code to use set_arch_to_* from eutils, also used some functions from kmod instead of homebrew stuff

3 files changed, 34 insertions, 22 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index ccd24f0a5758..bc672a812d61 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.15 2004/09/23 23:57:02 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.16 2004/10/04 04:09:48 iggy Exp $
+
+  03 Oct 2004; <iggy@gentoo.org> zaptel-1.0.0.ebuild:
+  switched custom ARCH setting code to use set_arch_to_* from eutils, also
+  used some functions from kmod instead of homebrew stuff
 
 *zaptel-1.0.0 (24 Sep 2004)
 
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 0256d3fecdff..a04c78510cc9 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,19 +1,29 @@
-MD5 b9ef576ee2a004bbdba73c8fd8cef7f4 ChangeLog 2110
-MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 4181d4bc03ffde84cb0ea2bc55eacbbf zaptel-0.7.0.ebuild 1403
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 50a2f3af01a95978f69765ecb3e61e8a zaptel-1.0.0.ebuild 3196
 MD5 7f1a2d9310ce76f745a72baaa7a2ec47 zaptel-0.8.1.ebuild 1350
+MD5 4181d4bc03ffde84cb0ea2bc55eacbbf zaptel-0.7.0.ebuild 1403
+MD5 5443aee5ae773bde196704cf0e314bab ChangeLog 2298
+MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
 MD5 2f9c63c938ecf48124ba4fd3e4f2648a zaptel-0.9.1.ebuild 3529
-MD5 a4af67e1ad0e05f458e4bfd459ace19c zaptel-1.0.0.ebuild 3321
+MD5 48c7eb4a7726cb0ce920784778ad2efb files/zaptel-modulesd.patch 1601
+MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
+MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-0.9.1-modulesd.diff 1941
 MD5 4f38ae7d0fb20dee726303a35ca85eda files/digest-zaptel-0.7.0 64
 MD5 e356380452b756847ed2a73660c97ec4 files/digest-zaptel-0.8.1 134
 MD5 3921a7fd4a60c8785d510e857ff2eabe files/digest-zaptel-0.9.1 64
+MD5 9cf4f1d646d216441b7f4508ac7c0e8b files/digest-zaptel-1.0.0 64
 MD5 1dcd4bcf154cf1140d716eeeb8892ef3 files/zaptel-0.9.1-experimental-devfs26.diff 6432
-MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-0.9.1-modulesd.diff 1941
-MD5 fea918445512e51f2019ff20d78a7926 files/zaptel-install_prefix-typo.patch 486
-MD5 e6a38926132312059bd3a8a712d8d88e files/zaptel-mkdir-usrincludelinux.patch 469
-MD5 48c7eb4a7726cb0ce920784778ad2efb files/zaptel-modulesd.patch 1601
-MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
 MD5 b72142a9b09e32506b88b96706abaeb4 files/zaptel.rc6 903
-MD5 9cf4f1d646d216441b7f4508ac7c0e8b files/digest-zaptel-1.0.0 64
-MD5 60910db3ceada75031a91d419832871d files/zaptel-1.0.0-experimental-devfs26.diff 5474
+MD5 e6a38926132312059bd3a8a712d8d88e files/zaptel-mkdir-usrincludelinux.patch 469
 MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-1.0.0-modulesd.diff 1941
+MD5 fea918445512e51f2019ff20d78a7926 files/zaptel-install_prefix-typo.patch 486
+MD5 60910db3ceada75031a91d419832871d files/zaptel-1.0.0-experimental-devfs26.diff 5474
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBYM2YMSkoRwEucGERArkdAKCk5AIxgMuI0cwR3WRN5FgqIDa3vwCg81Vw
+8uDTy47NnduYKcst1zSHKkg=
+=Cfo8
+-----END PGP SIGNATURE-----
diff --git a/net-misc/zaptel/zaptel-1.0.0.ebuild b/net-misc/zaptel/zaptel-1.0.0.ebuild
index 143f237cc0fc..5a2dce1968cd 100644
--- a/net-misc/zaptel/zaptel-1.0.0.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.0.ebuild,v 1.1 2004/09/23 23:57:02 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.0.ebuild,v 1.2 2004/10/04 04:09:48 iggy Exp $
 
 IUSE="devfs26"
 
-inherit eutils
+inherit eutils kmod
 
 DESCRIPTION="Pseudo-TDM engine"
 HOMEPAGE="http://www.asterisk.org"
@@ -29,7 +29,7 @@ pkg_setup() {
 	einfo "Otherwise quit this ebuild, rebuild your kernel and reboot"
 
 	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if [ $(echo $KV | cut -d. -f1) -eq 2 ] && [ $(echo $KV|cut -d. -f2) -eq 6 ]; then
+	if is_kernel 2 6 ; then
 		echo
 		einfo "You're using zaptel with linux-2.6:"
 		ewarn "   Zaptel doesn't support devfs with 2.6, you'll need to use udev or disable devfs"
@@ -37,7 +37,7 @@ pkg_setup() {
 		echo
 		ewarn "There's an experimental patch which adds devfs support when using linux-2.6, but:"
 		ewarn "  1. It's an ugly hack atm and needs a cleanup..."
-		ewarn "  2. I was only abled to test loding / unloading with the ztd-eth driver..."
+		ewarn "  2. I was only able to test loading / unloading with the ztd-eth driver..."
 		ewarn "  3. I _really_ don't know if it works with real hardware..."
 		echo
 		eerror "  4. And more important: This is not officially supported by Digium / the Asterisk project!!!"
@@ -80,16 +80,14 @@ src_unpack() {
 
 src_compile() {
 	# workaround for 2.6 build system
-	if [ $(echo $KV | cut -d. -f1) -eq 2 ] && [ $(echo $KV|cut -d. -f2) -eq 6 ]; then
+	if is_kernel 2 6 ; then
 		einfo "Enabled 2.6 module building workaround..."
 		addwrite /usr/src/linux
 	fi
 
-	if use x86; then
-		make ARCH="i386" || die
-	else
-		make || die
-	fi
+	set_arch_to_kernel
+	make || die
+	set_arch_to_portage
 }
 
 src_install() {