fixed gcc34 patch, devfs check, ebuild stops if PPP is missing in kernel config, see changelog for more details

Package-Manager: portage-2.0.51-r15

5 files changed, 66 insertions, 43 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index ea13a9eadab7..40a3b4e9a4d5 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.26 2005/01/28 19:09:12 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.27 2005/02/01 22:47:22 stkn Exp $
+
+  01 Feb 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.4-gcc34.patch, zaptel-1.0.3.ebuild, zaptel-1.0.4.ebuild:
+  New gcc34 patch, provided by Ray Russell Reese III <anti@gentoo.org>,
+  ebuild stops now if required PPP support is missing in kernel config.
+  Fixed check for DEVFS_FS and moved the UDEV message to pkg_postinst.
+  Fixed SRC_URI for 1.0.3.
 
 *zaptel-1.0.4 (28 Jan 2005)
 
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 156c761475e0..7aa5b1b8e567 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,26 +1,27 @@
-MD5 5e5b4c26f408ea4a1331dfef7cd46d42 ChangeLog 4069
+MD5 a4cefca6856e53e7dc1fb86fcdb2b8a4 ChangeLog 4438
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 29c8d537ecef33c7c1225fa94655ceba zaptel-1.0.3.ebuild 3528
 MD5 8d66c378ea6b3b3f7bb2ee1fd2b6e51c zaptel-0.9.1.ebuild 3526
 MD5 57a33550baf4bda34695fa3cb84a8012 zaptel-1.0.0.ebuild 3059
 MD5 cfce09091affa8e8668e7a22801ac097 zaptel-1.0.1.ebuild 3186
 MD5 eaa764a27a800be752aba85a7df8d342 zaptel-1.0.2.ebuild 3127
-MD5 1035a89ffc2a4c40b8e865e4873fbd1e zaptel-1.0.4.ebuild 4191
-MD5 66c86744220e6716f15393caf0ee408d files/digest-zaptel-1.0.3 64
-MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4 64
+MD5 7245a92de844119cd4351807007616f0 zaptel-1.0.3.ebuild 3532
+MD5 db55fc6af69ca2fe6a0b3aa5cd83890e zaptel-1.0.4.ebuild 3804
 MD5 3921a7fd4a60c8785d510e857ff2eabe files/digest-zaptel-0.9.1 64
 MD5 9cf4f1d646d216441b7f4508ac7c0e8b files/digest-zaptel-1.0.0 64
 MD5 dbd81e086a8331bea5752bf92e288f43 files/digest-zaptel-1.0.1 64
+MD5 c05b7e3e46911ab74b865d91e7b85d42 files/digest-zaptel-1.0.2 64
+MD5 66c86744220e6716f15393caf0ee408d files/digest-zaptel-1.0.3 64
+MD5 051e2ff3f1222e2b551a70e9cd1b31f0 files/digest-zaptel-1.0.4 64
 MD5 1dcd4bcf154cf1140d716eeeb8892ef3 files/zaptel-0.9.1-experimental-devfs26.diff 6432
 MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-0.9.1-modulesd.diff 1941
 MD5 60910db3ceada75031a91d419832871d files/zaptel-1.0.0-experimental-devfs26.diff 5474
 MD5 c80f1e0e4038771d3e3bc08284ecf917 files/zaptel-1.0.0-modulesd.diff 1941
 MD5 648b9f0335741cf4aea7542ffe4705c6 files/zaptel-1.0.1-modulesd.diff 1837
 MD5 0edad95ac20c6e43ea6ee933e25ac23a files/zaptel-1.0.1-skbuff.diff 564
+MD5 9abebf47ce7e7122a184a62e5baed146 files/zaptel-1.0.3-gcc34.patch 1540
+MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
 MD5 fea918445512e51f2019ff20d78a7926 files/zaptel-install_prefix-typo.patch 486
 MD5 e6a38926132312059bd3a8a712d8d88e files/zaptel-mkdir-usrincludelinux.patch 469
 MD5 fae1145da422b8838c2a6ac3405dc4c4 files/zaptel.confd 371
 MD5 b72142a9b09e32506b88b96706abaeb4 files/zaptel.rc6 903
-MD5 c05b7e3e46911ab74b865d91e7b85d42 files/digest-zaptel-1.0.2 64
-MD5 9abebf47ce7e7122a184a62e5baed146 files/zaptel-1.0.3-gcc34.patch 1540
-MD5 e5a799243335f31a494bb4f90edbb9e4 files/zaptel-1.0.3-gentoo.diff 3456
+MD5 090668aabb8e77cfd0d83835f52bd105 files/zaptel-1.0.4-gcc34.patch 821
diff --git a/net-misc/zaptel/files/zaptel-1.0.4-gcc34.patch b/net-misc/zaptel/files/zaptel-1.0.4-gcc34.patch
new file mode 100644
index 000000000000..ea80c9e0ca06
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.0.4-gcc34.patch
@@ -0,0 +1,30 @@
+diff -ruN zaptel-1.0.4.orig/wcfxs.c zaptel-1.0.4/wcfxs.c
+--- zaptel-1.0.4.orig/wcfxs.c	2005-01-31 14:27:54.828322677 -0500
++++ zaptel-1.0.4/wcfxs.c	2005-01-31 14:32:15.629810758 -0500
+@@ -740,7 +740,7 @@
+     return 0;
+ }
+ 
+-static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
++static void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
+ {
+ #ifndef AUDIO_RINGCHECK
+ 	unsigned char res;
+@@ -884,7 +884,7 @@
+ 	}
+ }
+ 
+-static inline void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
++static void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
+ {
+ 	char res;
+ 	int hook;
+@@ -939,7 +939,7 @@
+ 	
+ }
+ 
+-static inline void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
++static void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
+ {
+ 	int res;
+ 	/* Check loopback */
diff --git a/net-misc/zaptel/zaptel-1.0.3.ebuild b/net-misc/zaptel/zaptel-1.0.3.ebuild
index a3ecc1a0cfbd..594cec396b11 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.4 2005/01/13 21:19:50 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.3.ebuild,v 1.5 2005/02/01 22:47:22 stkn Exp $
 
 IUSE="devfs26"
 
@@ -8,7 +8,7 @@ inherit eutils kernel-mod toolchain-funcs
 
 DESCRIPTION="Pseudo-TDM engine"
 HOMEPAGE="http://www.asterisk.org"
-SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/zaptel-${PV}.tar.gz"
+SRC_URI="ftp://ftp.asterisk.org/pub/telephony/zaptel/old/zaptel-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/net-misc/zaptel/zaptel-1.0.4.ebuild b/net-misc/zaptel/zaptel-1.0.4.ebuild
index 211f51993e75..b808ef4f1a61 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.1 2005/01/28 19:09:12 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.4.ebuild,v 1.2 2005/02/01 22:47:22 stkn Exp $
 
 IUSE="devfs26"
 
@@ -14,30 +14,19 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
+CONFIG_CHECK="PPP"
+ERROR_PPP="PPP support isn't enabled or available as a module! Please reconfigure your kernel to include CONFIG_PPP,
+	CONFIG_PPP_ASYNC CONFIG_PPP_DEFLATE and CONFIG_PPPOE."
+
 DEPEND="virtual/libc
 	virtual/linux-sources
 	>=dev-libs/newt-0.50.0"
 
 pkg_setup() {
-	get_version || die "Unable to calculate Linux Kernel version"
-
-	if ! linux_chkconfig_present CONFIG_PPP
-	then
-		einfo "If you want to use PPP over your hardware:"
-		einfo ""
-		einfo "   Please make sure that your kernel has the appropriate"
-		einfo "   PPP support enabled or present as modules before merging:"
-		einfo ""
-		einfo "   CONFIG_PPP=m"
-		einfo "   CONFIG_PPP_ASYNC=m"
-		einfo "   CONFIG_PPP_DEFLATE=m"
-		einfo "   CONFIG_PPPOE=m"
-		einfo ""
-		einfo "   Quit now, recompile your kernel, and reboot."
-	fi
+	linux-info_pkg_setup
 
 	# show an nice warning message about zaptel not supporting devfs on 2.6
-	if [ "${KV_MAJOR}.${KV_MINOR}" == "2.6" ] && linux_chkconfig_present CONFIG_DEVFS_FS ; then
+	if kernel_is 2 6 && linux_chkconfig_present DEVFS_FS ; then
 		echo
 		einfo "You're using a 2.6 kernel with DEVFS."
 		einfo "The Zaptel drivers won't work unless you either:"
@@ -57,10 +46,6 @@ pkg_setup() {
 		echo
 		einfo "Sleeping 20 Seconds..."
 		epause 20
-	else
-		echo
-		einfo "Sleeping 10 Seconds..."
-		epause 10
 	fi
 }
 
@@ -110,16 +95,6 @@ src_install() {
 	newexe ${FILESDIR}/zaptel.rc6 zaptel
 	insinto /etc/conf.d
 	newins ${FILESDIR}/zaptel.confd zaptel
-
-# FIXME!! Can we (we should) do this automatically
-	einfo "If you're using udev add the following to"
-	einfo "/etc/udev/rules.d/50-udev.rules (as in README.udev):"
-	einfo "# Section for zaptel device"
-	einfo "KERNEL=\"zapctl\",     NAME=\"zap/ctl\""
-	einfo "KERNEL=\"zaptimer\",   NAME=\"zap/timer\""
-	einfo "KERNEL=\"zapchannel\", NAME=\"zap/channel\""
-	einfo "KERNEL=\"zappseudo\",  NAME=\"zap/pseudo\""
-	einfo "KERNEL=\"zap[0-9]*\",  NAME=\"zap/%n\""
 }
 
 pkg_postinst() {
@@ -133,4 +108,14 @@ pkg_postinst() {
 
 	echo
 	einfo "Use the /etc/init.d/zaptel script to load zaptel.conf settings on startup!"
+	echo
+# FIXME!! Can we (we should) do this automatically
+	einfo "If you're using udev add the following to"
+	einfo "/etc/udev/rules.d/50-udev.rules (as in README.udev):"
+	einfo "# Section for zaptel device"
+	einfo "KERNEL=\"zapctl\",     NAME=\"zap/ctl\""
+	einfo "KERNEL=\"zaptimer\",   NAME=\"zap/timer\""
+	einfo "KERNEL=\"zapchannel\", NAME=\"zap/channel\""
+	einfo "KERNEL=\"zappseudo\",  NAME=\"zap/pseudo\""
+	einfo "KERNEL=\"zap[0-9]*\",  NAME=\"zap/%n\""
 }