Changed ebuilds to use tc-arch-kernel instead of the soon-to-be-removed set_arch_to_* functions and removed non-existent docs file from src_install.

Package-Manager: portage-2.0.51.22-r1

10 files changed, 49 insertions, 58 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index 8a1fcc14d2d1..3d0f5baa5768 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.49 2005/06/28 21:00:13 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.50 2005/07/12 20:54:40 stkn Exp $
+
+  12 Jul 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.3.ebuild,
+  zaptel-1.0.4-r1.ebuild, zaptel-1.0.4.ebuild, zaptel-1.0.6-r1.ebuild,
+  zaptel-1.0.6.ebuild, zaptel-1.0.7-r1.ebuild, zaptel-1.0.7.ebuild,
+  zaptel-1.0.8.ebuild:
+  Changed ebuilds to use tc-arch-kernel instead of set_arch_to_* and removed
+  non-existent docs file from dodoc lines.
 
   28 Jun 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.7-r1.ebuild:
   Marking stable on x86.
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 973fdf6f4345..6d19c5d015b4 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,13 +1,13 @@
-MD5 c7f95d70b494080141f49c6c8df9c6ca zaptel-1.0.7-r1.ebuild 6500
-MD5 f3a4df254ba1f5fc878aa89423274860 zaptel-1.0.4-r1.ebuild 4437
-MD5 bc1198088b0a128fae00180269e2f036 zaptel-1.0.6-r1.ebuild 6224
-MD5 373dbadbb20d7eb4fd7d4001f47d7015 zaptel-1.0.7.ebuild 6096
-MD5 7245a92de844119cd4351807007616f0 zaptel-1.0.3.ebuild 3532
-MD5 e1b7a4d3a6b6529f0b3308a9e83ebb04 zaptel-1.0.4.ebuild 4477
+MD5 3e99f4aad34341a7e82127ff2e55d242 zaptel-1.0.7-r1.ebuild 6527
+MD5 6748a058fe2c9650c3ad2fbc1d31b5b7 zaptel-1.0.4-r1.ebuild 4419
+MD5 b640a29e6e8188d8b58820ec864fbec3 zaptel-1.0.6-r1.ebuild 6228
+MD5 18b9c41a98574311faaea931786e304c zaptel-1.0.7.ebuild 6100
+MD5 a2f85c43f924825aa60f686fac8a18e2 zaptel-1.0.3.ebuild 3514
+MD5 3f9ea369b365b565b7e3fefd79d32c9e zaptel-1.0.4.ebuild 4459
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 e33adbdca86c19623fb93dc9edd6af53 ChangeLog 8687
-MD5 bda08bc5f2488088cac8289b814f3e70 zaptel-1.0.8.ebuild 6327
-MD5 f9d339edf9e5ce34fadcd0a6c0dfa762 zaptel-1.0.6.ebuild 6265
+MD5 4a9ed588036a1b5e50941ef49d742426 ChangeLog 9040
+MD5 80762fb7e05da63aa97391264e92abab zaptel-1.0.8.ebuild 6378
+MD5 8557c37abd20a8f19a4d05cddf411ee6 zaptel-1.0.6.ebuild 6269
 MD5 8d66c378ea6b3b3f7bb2ee1fd2b6e51c zaptel-0.9.1.ebuild 3526
 MD5 0c81001d4c9efeeffeb1332580fb4cdc files/digest-zaptel-1.0.6-r1 212
 MD5 296ec9da581d5768ca13840b1a32c33f files/digest-zaptel-1.0.7 212
diff --git a/net-misc/zaptel/zaptel-1.0.3.ebuild b/net-misc/zaptel/zaptel-1.0.3.ebuild
index 594cec396b11..22d45957d4c8 100644
--- a/net-misc/zaptel/zaptel-1.0.3.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.3.ebuild,v 1.5 2005/02/01 22:47:22 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.3.ebuild,v 1.6 2005/07/12 20:54:40 stkn Exp $
 
 IUSE="devfs26"
 
@@ -83,9 +83,7 @@ src_unpack() {
 }
 
 src_compile() {
-	set_arch_to_kernel
-	make || die
-	set_arch_to_portage
+	make ARCH=$(tc-arch-kernel) || die
 }
 
 src_install() {
diff --git a/net-misc/zaptel/zaptel-1.0.4-r1.ebuild b/net-misc/zaptel/zaptel-1.0.4-r1.ebuild
index f3b481d3c789..0265d136802f 100644
--- a/net-misc/zaptel/zaptel-1.0.4-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.4-r1.ebuild,v 1.2 2005/06/25 13:26:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.4-r1.ebuild,v 1.3 2005/07/12 20:54:40 stkn Exp $
 
 IUSE="devfs26"
 
@@ -99,9 +99,7 @@ src_unpack() {
 }
 
 src_compile() {
-	set_arch_to_kernel
-	make || die
-	set_arch_to_portage
+	make ARCH=$(tc-arch-kernel) || die
 }
 
 src_install() {
diff --git a/net-misc/zaptel/zaptel-1.0.4.ebuild b/net-misc/zaptel/zaptel-1.0.4.ebuild
index 581ebf05d682..f7eb4ccf7ec6 100644
--- a/net-misc/zaptel/zaptel-1.0.4.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.4.ebuild,v 1.6 2005/06/25 13:26:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.4.ebuild,v 1.7 2005/07/12 20:54:40 stkn Exp $
 
 IUSE="devfs26"
 
@@ -99,9 +99,7 @@ src_unpack() {
 }
 
 src_compile() {
-	set_arch_to_kernel
-	make || die
-	set_arch_to_portage
+	make ARCH=$(tc-arch-kernel) || die
 }
 
 src_install() {
diff --git a/net-misc/zaptel/zaptel-1.0.6-r1.ebuild b/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
index 5148a5a51f9c..34c1ffd5b367 100644
--- a/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6-r1.ebuild,v 1.2 2005/06/25 13:26:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6-r1.ebuild,v 1.3 2005/07/12 20:54:40 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -115,15 +115,13 @@ src_unpack() {
 src_compile() {
 	# TODO: bristuff modules
 
-	set_arch_to_kernel
-	make KERNEL_SOURCE=/usr/src/linux || die
+	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
 
 	if use bri; then
 		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make -C qozap || die
-		make -C zaphfc || die
+		make ARCH=$(tc-arch-kernel) -C qozap || die
+		make ARCH=$(tc-arch-kernel) -C zaphfc || die
 	fi
-	set_arch_to_portage
 }
 
 src_install() {
@@ -155,7 +153,7 @@ src_install() {
 		newins zaphfc/zapata.conf zapata.conf.zaphfc
 
 		docinto bristuff
-		dodoc CHANGES INSTALL README-ZAPHFC-USERS.1st
+		dodoc CHANGES INSTALL
 
 		docinto bristuff/qozap
 		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
diff --git a/net-misc/zaptel/zaptel-1.0.6.ebuild b/net-misc/zaptel/zaptel-1.0.6.ebuild
index b297f116ea9e..fedc82edba41 100644
--- a/net-misc/zaptel/zaptel-1.0.6.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6.ebuild,v 1.7 2005/06/25 13:26:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.6.ebuild,v 1.8 2005/07/12 20:54:40 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -115,15 +115,13 @@ src_unpack() {
 src_compile() {
 	# TODO: bristuff modules
 
-	set_arch_to_kernel
-	make KERNEL_SOURCE=/usr/src/linux || die
+	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
 
 	if use bri; then
 		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make -C qozap || die
-		make -C zaphfc || die
+		make ARCH=$(tc-arch-kernel) -C qozap || die
+		make ARCH=$(tc-arch-kernel) -C zaphfc || die
 	fi
-	set_arch_to_portage
 }
 
 src_install() {
@@ -155,7 +153,7 @@ src_install() {
 		newins zaphfc/zapata.conf zapata.conf.zaphfc
 
 		docinto bristuff
-		dodoc CHANGES INSTALL README-ZAPHFC-USERS.1st
+		dodoc CHANGES INSTALL
 
 		docinto bristuff/qozap
 		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
diff --git a/net-misc/zaptel/zaptel-1.0.7-r1.ebuild b/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
index b4367f6b4454..a6e9619cb0a5 100644
--- a/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7-r1.ebuild,v 1.8 2005/06/28 21:00:13 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7-r1.ebuild,v 1.9 2005/07/12 20:54:40 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -111,16 +111,14 @@ src_unpack() {
 src_compile() {
 	# TODO: bristuff modules
 
-	set_arch_to_kernel
-	make KERNEL_SOURCE=/usr/src/linux || die
+	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
 
 	if use bri; then
 		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make -C qozap  || die
-		make -C zaphfc || die
-		make -C cwain  || die
+		make ARCH=$(tc-arch-kernel) -C qozap  || die
+		make ARCH=$(tc-arch-kernel) -C zaphfc || die
+		make ARCH=$(tc-arch-kernel) -C cwain  || die
 	fi
-	set_arch_to_portage
 }
 
 src_install() {
@@ -157,7 +155,7 @@ src_install() {
 		newins cwain/zapata.conf  zapata.conf.E1
 
 		docinto bristuff
-		dodoc CHANGES INSTALL README-ZAPHFC-USERS.1st
+		dodoc CHANGES INSTALL
 
 		docinto bristuff/qozap
 		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
diff --git a/net-misc/zaptel/zaptel-1.0.7.ebuild b/net-misc/zaptel/zaptel-1.0.7.ebuild
index f9faad7c1b83..d38c5f58a751 100644
--- a/net-misc/zaptel/zaptel-1.0.7.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7.ebuild,v 1.3 2005/06/25 13:26:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.7.ebuild,v 1.4 2005/07/12 20:54:40 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -109,15 +109,13 @@ src_unpack() {
 src_compile() {
 	# TODO: bristuff modules
 
-	set_arch_to_kernel
-	make KERNEL_SOURCE=/usr/src/linux || die
+	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
 
 	if use bri; then
 		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make -C qozap || die
-		make -C zaphfc || die
+		make ARCH=$(tc-arch-kernel) -C qozap || die
+		make ARCH=$(tc-arch-kernel) -C zaphfc || die
 	fi
-	set_arch_to_portage
 }
 
 src_install() {
@@ -149,7 +147,7 @@ src_install() {
 		newins zaphfc/zapata.conf zapata.conf.zaphfc
 
 		docinto bristuff
-		dodoc CHANGES INSTALL README-ZAPHFC-USERS.1st
+		dodoc CHANGES INSTALL
 
 		docinto bristuff/qozap
 		dodoc qozap/LICENSE qozap/TODO qozap/*.conf*
diff --git a/net-misc/zaptel/zaptel-1.0.8.ebuild b/net-misc/zaptel/zaptel-1.0.8.ebuild
index 5d5d593a0783..f7a69cd245be 100644
--- a/net-misc/zaptel/zaptel-1.0.8.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.8.ebuild,v 1.1 2005/06/25 08:56:54 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.8.ebuild,v 1.2 2005/07/12 20:54:40 stkn Exp $
 
 IUSE="devfs26 bri florz"
 
@@ -116,16 +116,14 @@ src_unpack() {
 src_compile() {
 	# TODO: bristuff modules
 
-	set_arch_to_kernel
-	make KERNEL_SOURCE=/usr/src/linux || die
+	make ARCH=$(tc-arch-kernel) KERNEL_SOURCE=/usr/src/linux || die
 
 	if use bri; then
 		cd ${WORKDIR}/bristuff-${BRI_VERSION}
-		make -C qozap  || die
-		make -C zaphfc || die
-		make -C cwain  || die
+		make ARCH=$(tc-arch-kernel) -C qozap  || die
+		make ARCH=$(tc-arch-kernel) -C zaphfc || die
+		make ARCH=$(tc-arch-kernel) -C cwain  || die
 	fi
-	set_arch_to_portage
 }
 
 src_install() {