Keep up with baselayout-1.12.0 development. Improve post-install messages, based on new features available in linux-info.eclass.

(Portage version: 2203-svn)

5 files changed, 47 insertions, 53 deletions

diff --git a/net-dialup/speedtouch-usb/ChangeLog b/net-dialup/speedtouch-usb/ChangeLog
index 44c36b44e9b3..a2273c8a8611 100644
--- a/net-dialup/speedtouch-usb/ChangeLog
+++ b/net-dialup/speedtouch-usb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/speedtouch-usb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch-usb/ChangeLog,v 1.4 2006/04/17 13:53:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch-usb/ChangeLog,v 1.5 2006/05/23 17:16:55 mrness Exp $
+
+*speedtouch-usb-3.0.1.2-r2 (23 May 2006)
+
+  23 May 2006; Alin Nastac <mrness@gentoo.org> files/README,
+  -speedtouch-usb-3.0.1.2-r1.ebuild, +speedtouch-usb-3.0.1.2-r2.ebuild:
+  Keep up with baselayout-1.12.0 development. Improve post-install messages,
+  based on new features available in linux-info.eclass.
 
 *speedtouch-usb-3.0.1.2-r1 (17 Apr 2006)
 
diff --git a/net-dialup/speedtouch-usb/Manifest b/net-dialup/speedtouch-usb/Manifest
index da8bcff855d6..347595e613a2 100644
--- a/net-dialup/speedtouch-usb/Manifest
+++ b/net-dialup/speedtouch-usb/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7798dfb3443c04c4e0ef066e66a7ba66 ChangeLog 1146
-MD5 e02b9a37e22cff480c05dc0af8eac845 files/README 9930
-MD5 455d21a7ea0d002dcd3cb16b8ac4c16d files/digest-speedtouch-usb-3.0.1.2-r1 76
+MD5 96bb99b3572619d76865684c91790c51 files/README 9630
+MD5 455d21a7ea0d002dcd3cb16b8ac4c16d files/digest-speedtouch-usb-3.0.1.2-r2 76
 MD5 82c09fc4e58b4a48f4730afef332413c metadata.xml 301
-MD5 7cfe5ac25288baa6e582d3a7ba5accfa speedtouch-usb-3.0.1.2-r1.ebuild 4059
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEQ54DjG8pv1lIUX4RAlDwAJ9ITDeEM4CbOo3wifaQchkXPSZGrQCePlKA
-P9m+5yRfZ4R8zhVbMv6T73E=
-=2aeY
------END PGP SIGNATURE-----
+MD5 6ce18baf59b447ca9f7df0ab169a7bed speedtouch-usb-3.0.1.2-r2.ebuild 4055
diff --git a/net-dialup/speedtouch-usb/files/README b/net-dialup/speedtouch-usb/files/README
index d9c7256ced5d..53073b6bf39f 100644
--- a/net-dialup/speedtouch-usb/files/README
+++ b/net-dialup/speedtouch-usb/files/README
@@ -26,7 +26,7 @@ Add the following lines from the appropriate section below to
 
 a) PPPoATM configuration:
 
-config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd.sh
+config_ppp0=( ppp )  # Runs /lib/rcscripts/net/pppd.sh
 link_ppp0='/dev/null'  # Not required by PPPoA links, but must be specified
 # The 2 numbers represent the VPI & VCI of your ISP, and they are separated
 # by a dot. Choose here, or ask your ISP:
@@ -36,8 +36,8 @@ plugins_ppp0=( 'pppoa 0.38' )
 # rarely taken advantage of, and may interfere with the connection.
 # Add option 'usepeerdns' to populate /etc/resolv.conf
 pppd_ppp0=( updetach noauth debug defaultroute noaccomp nobsdcomp noccp
-	nodeflate nopcomp novj novjccomp )
-username_ppp0='username@isp.com'  # E.g. 'fredbloggs@hg5.btclick.com'
+	nodeflate nopcomp novj novjccomp child-timeout 60 )
+username_ppp0='username@isp.com'  # ADSL login, assigned by your ISP
 password_ppp0='password'  # ADSL password, assigned by your ISP
 
 # If the kernel modules are not built-in, then they must be loaded
@@ -52,39 +52,33 @@ function preup() {
 
 b) PPPoE configuration:
 
-config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd.sh
-# The name of the Ethernet interface over which PPPoE links
-link_ppp0='nas0' # Must correspond to the -c option of the br2684ctl utility
-plugins_ppp0=( pppoe ) 
+# Configure first the RFC2684 bridge interface 
+config_nas0=( null )
+# Use "-e 0" for LLC mux or "-e 1" for VC mux.
+# The 2 numbers after "-a" represent the VPI & VCI of your ISP, and
+# they are separated by a dot. Ask your ISP about those numbers.
+br2684ctl_nas0="-e 0 -a 0.38"
+
+config_ppp0=( ppp )  # Runs /lib/rcscripts/net/pppd.sh
+link_ppp0='nas0' # The name of the RFC2684 bridge interface
+plugins_ppp0=( 'pppoe' )
 # 'man pppd' shows other options. Compression is disabled because it is
 # rarely taken advantage of, and may interfere with the connection.
 # Add option 'usepeerdns' to populate /etc/resolv.conf
 pppd_ppp0=( updetach noauth debug defaultroute noaccomp nobsdcomp noccp
-	nodeflate nopcomp novj novjccomp )
-username_ppp0='username@isp.com'  # E.g. 'fredbloggs@hg5.btclick.com'
+	nodeflate nopcomp novj novjccomp child-timeout 60 )
+username_ppp0='username@isp.com'  # ADSL login, assigned by your ISP
 password_ppp0='password'  # ADSL password, assigned by your ISP
 
+depend_ppp0() {
+    need net.nas0
+}
+
 # If the kernel modules are not built-in, then they must be loaded
-# before starting the PPP daemon:
+# before starting the RFC2684 bridge:
 function preup() {
-	if [[ "$1" = "ppp0" ]] ; then
+	if [[ "$1" = "nas0" ]] ; then
 		modprobe -q speedtch
-		# The number after "-c" corresponds with the Ethernet interface,
-		# e.g. 0 for nas0.
-		# Use "-e 0" for LLC mux or "-e 1" for VC mux.
-		# The 2 numbers after "-a" represent the VPI & VCI of your ISP, and
-		# they are separated by a dot. Choose here, or ask your ISP:
-		#   http://www.linux-usb.org/SpeedTouch/faq/index.html#q12
-		eval local nasifname=\$\{link_$1\}
-		start-stop-daemon --start --background --pidfile /var/run/${nasifname}.pid --make-pidfile \
-			--exec /sbin/br2684ctl -- -c ${nasifname#nas} -e 0 -a 0.38
-	fi
-}
-
-function postdown() {
-	if [[ "$1" = "ppp0" ]] ; then
-		eval local nasifname=\$\{link_$1\}
-		start-stop-daemon --stop --pidfile /var/run/${nasifname}.pid
 		return 0
 	fi
 }
@@ -97,6 +91,9 @@ Configuration continued
 Create a symlink for the new network interface, for it to be enabled by
 baselayout:
   cd /etc/init.d && ln -sfn net.lo net.ppp0
+If you use PPPoE, you should also create the symlink for the RFC2684
+bridge interface:
+  cd /etc/init.d && ln -sfn net.lo net.nas0
 
 The "debug" option adds some extra commentary from pppd regarding the
 connection to /var/log/messages, e.g.:
diff --git a/net-dialup/speedtouch-usb/files/digest-speedtouch-usb-3.0.1.2-r1 b/net-dialup/speedtouch-usb/files/digest-speedtouch-usb-3.0.1.2-r2
index d51893105db5..d51893105db5 100644
--- a/net-dialup/speedtouch-usb/files/digest-speedtouch-usb-3.0.1.2-r1
+++ b/net-dialup/speedtouch-usb/files/digest-speedtouch-usb-3.0.1.2-r2
diff --git a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r1.ebuild b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r2.ebuild
index 48da5be7ca41..91eb28a2d541 100644
--- a/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r1.ebuild
+++ b/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r1.ebuild,v 1.1 2006/04/17 13:53:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch-usb/speedtouch-usb-3.0.1.2-r2.ebuild,v 1.1 2006/05/23 17:16:55 mrness Exp $
 
 inherit eutils linux-info
 
@@ -31,11 +31,11 @@ pkg_setup() {
 		die "Unsupported kernel version"
 	fi
 
-	if ! has_version '>=sys-apps/baselayout-1.12.0_pre16' ; then
-		ewarn "The best way of using this driver is through the pppd net module of"
-		ewarn ">=sys-apps/baselayout-1.12.0_pre16, which is also the only"
-		ewarn "documented mode of using ${CATEGORY}/${PN}."
-		ewarn "Please install baselayout-1.12.0_pre16 or else you will be on your own!"
+	if ! has_version '>=sys-apps/baselayout-1.12.0' ; then
+		ewarn "The best way of using this driver is through the PPP net module of the"
+		ewarn "   >=sys-apps/baselayout-1.12.0"
+		ewarn "which is also the only documented mode of using ${PN} driver."
+		ewarn "Please install baselayout-1.12.0 or else you will be on your own!"
 		ebeep
 	fi
 }
@@ -86,24 +86,24 @@ pkg_postinst() {
 		ewarn "Please remove the SpeedTouch line from /etc/hotplug/usb.usermap"
 
 	# Check kernel configuration
-	CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_SPEEDTOUCH \
+	local CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_SPEEDTOUCH \
 		~PPP ~PPPOATM ~PPPOE ~ATM_BR2684"
+	local WARNING_PPPOATM="CONFIG_PPPOATM:\t is not set (required for PPPoA links)"
+	local WARNING_PPPOE="CONFIG_PPPOE:\t is not set (required for PPPoE links)"
+	local WARNING_ATM_BR2684="CONFIG_ATM_BR2684:\t is not set (required for PPPoE links)"
 	check_extra_config
-	einfo "Note: All the above kernel configurations are required except the following:"
-	einfo "   - CONFIG_PPPOATM is needed only for PPPoA links, while"
-	einfo "   - CONFIG_PPPOE and CONFIG_ATM_BR2684 are needed only for PPPoE links."
 	echo
 
 	# Check user space for PPPoA support
 	if ! built_with_use net-dialup/ppp atm ; then
-		eerror "PPPoA support: net-dialup/ppp should be built with 'atm' USE flag enabled!"
+		ewarn "PPPoA support: net-dialup/ppp should be built with 'atm' USE flag enabled!"
 		ewarn "Run the following command if you need PPPoA support:"
 		einfo "  euse -E atm && emerge net-dialup/ppp"
 		echo
 	fi
 	# Check user space PPPoE support
 	if ! has_version net-misc/br2684ctl ; then
-		eerror "PPPoE support: net-misc/br2684ctl is not installed!"
+		ewarn "PPPoE support: net-misc/br2684ctl is not installed!"
 		ewarn "Run the following command if you need PPPoE support:"
 		einfo "   emerge net-misc/br2684ctl"
 		echo