Remove hotplug from dependencies and update the README file (#110665)

(Portage version: 2.0.54)

2 files changed, 77 insertions, 73 deletions

diff --git a/net-dialup/speedtouch-usb/files/README b/net-dialup/speedtouch-usb/files/README
index 1e3a9b20c5eb..d72174bc3b9e 100644
--- a/net-dialup/speedtouch-usb/files/README
+++ b/net-dialup/speedtouch-usb/files/README
@@ -10,74 +10,84 @@ must be emerged instead.
 Configuration
 =============
 
+Most SpeedTouch USB modems are connected via the ATM protocol, rather
+than Ethernet. For ATM, run the following:
+   euse -E atm && emerge net-dialup/ppp net-dialup/speedtouch-usb
+
 It is necessary to choose an interface number for the connection. This
 is arbitrary - the only requirement is that the connection number is
 not already in use. The first available number is 0, and it is usual to
 choose the lowest unused number. For the purposes of this document, 0
 will be chosen.
 
-Add the following lines to /etc/conf.d/net, then customize them as per
-the inline comments.
-
-a) /etc/conf.d/net for PPPoA links:
-  config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd
-  link_ppp0='/dev/null'  # Not required by PPPoA links, but must be specified
-  # The 2 numbers represents 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
-  plugins_ppp0=( 'pppoa 0.38' ) 
-  # '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/ppp/resolv.conf
-  pppd_ppp0=( updetach debug defaultroute noaccomp nobsdcomp noccp
-    nodeflate nopcomp novj novjccomp )
-  username_ppp0='username@isp.com'  # E.g. 'fredbloggs@hg5.btclick.com'
-  password_ppp0='password'  # ADSL password, assigned by your ISP
-
-  # If the kernel modules are not built-in, then you also need to load
-  # them before starting the PPP daemon:
-  function preup() {
-    if [[ "$1" = "ppp0" ]] ; then
-      modprobe -q pppoatm
-      modprobe -q speedtch
-    fi
-  }
-  
-b) /etc/conf.d/net for PPPoE links:
-  config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd
-  # The name of the Ethernet interface over which PPPoE link
-  link_ppp0='nas0' #must correspond to the -c option of the br2684ctl utility
-  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/ppp/resolv.conf
-  pppd_ppp0=( updetach debug defaultroute noaccomp nobsdcomp noccp
-    nodeflate nopcomp novj novjccomp )
-  username_ppp0='username@isp.com'  # E.g. 'fredbloggs@hg5.btclick.com'
-  password_ppp0='password'  # ADSL password, assigned by your ISP
-
-  # If the kernel modules are not built-in, then you also need to load
-  # them before starting the PPP daemon:
-  function preup() {
-    if [[ "$1" = "ppp0" ]] ; then
-      modprobe -q speedtch
-	  # The number after -c correspond with the name of 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 represents 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 --pidfile /var/run/${nasifname}.pid --makepid -- \
-	  	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
-    fi
-  }
+Add the following lines from the appropriate section below to
+/etc/conf.d/net, then customize them as per the inline comments.
+
+
+a) PPPoATM configuration:
+
+config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd
+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:
+#   http://www.linux-usb.org/SpeedTouch/faq/index.html#q12
+plugins_ppp0=( 'pppoa 0.38' ) 
+# '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/ppp/resolv.conf
+pppd_ppp0=( updetach debug defaultroute noaccomp nobsdcomp noccp
+	nodeflate nopcomp novj novjccomp )
+username_ppp0='username@isp.com'  # E.g. 'fredbloggs@hg5.btclick.com'
+password_ppp0='password'  # ADSL password, assigned by your ISP
+
+# If the kernel modules are not built-in, then they must be loaded
+# before starting the PPP daemon:
+function preup() {
+	if [[ "$1" = "ppp0" ]] ; then
+		modprobe -q pppoatm
+		modprobe -q speedtch
+	fi
+}
+
+
+b) PPPoE configuration:
+
+config_ppp0=( 'ppp' )  # Runs /lib/rcscripts/net.modules.d/pppd
+# 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 ) 
+# '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/ppp/resolv.conf
+pppd_ppp0=( updetach debug defaultroute noaccomp nobsdcomp noccp
+	nodeflate nopcomp novj novjccomp )
+username_ppp0='username@isp.com'  # E.g. 'fredbloggs@hg5.btclick.com'
+password_ppp0='password'  # ADSL password, assigned by your ISP
+
+# If the kernel modules are not built-in, then they must be loaded
+# before starting the PPP daemon:
+function preup() {
+	if [[ "$1" = "ppp0" ]] ; 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 --pidfile /var/run/${nasifname}.pid --makepid -- \
+			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
+	fi
+}
+
 
 Create a symlink for the new network interface, for it to be enabled by
 baselayout:
@@ -88,13 +98,6 @@ connection to /var/log/messages, e.g.:
 "sent [LCP ConfReq id=0x1 <magic 0x7bea6ef1>]". It is wise to keep the
 option on permanently, due to its usefulness when debugging.
 
-Alternatively, if you choosed to compile speedtouch driver as a 
-kernel module, you could load it through /etc/modules.autoload.d/kernel-2.6
-instead of loading it in preup function.
-This allows the kernel to load the firmware during bootup, before the
-network is configured, thus saving a couple of seconds from the startup
-time.
-
 Set RC_NET_STRICT_CHECKING="yes" in /etc/conf.d/rc, to prevent Internet
 services in /etc/init.d/ from starting before the Internet connection
 is established. Other options are to start/stop programs in
@@ -123,7 +126,8 @@ Note that in the list below, "[*]" means that the option is compiled
 into the kernel, whereas "[M]" means that the option can either be
 compiled into the kernel, or as a module. Compiling them into the
 kernel is preferable, to guarantee that the modules are already loaded
-when they are needed.
+when they are needed, and it will improve the bootup time by a couple
+of seconds.
 
 In "make menuconfig", you can press "/" and search on e.g. "speedtouch"
 to see exactly where an option is - the location of an option and its
@@ -151,6 +155,7 @@ list includes the prerequisites, e.g. USB_SPEEDTOUCH depends on USB):
    Networking options  --->
     [*] Packet socket - CONFIG_PACKET
     [M] Asynchronous Transfer Mode (ATM) - CONFIG_ATM
+    [M] RFC1483/2684 Bridged protocols - CONFIG_ATM_BR2684 (only needed for PPPoE)
    
  Device Drivers  --->
   Network device support  --->
@@ -160,7 +165,8 @@ list includes the prerequisites, e.g. USB_SPEEDTOUCH depends on USB):
         compression is supported - rare)
    [M] PPP BSD-Compress compression - CONFIG_PPP_BSDCOMP (only useful
         if compression is supported - rare)
-   [M] PPP over ATM - CONFIG_PPPOATM
+   [M] PPP over Ethernet - CONFIG_PPPOE (only needed for PPPoE)
+   [M] PPP over ATM - CONFIG_PPPOATM (only needed for PPPoATM)
   USB support  --->
    [*] Support for Host-side USB - CONFIG_USB
    [*] USB device filesystem - CONFIG_USB_DEVICEFS
diff --git a/net-dialup/speedtouch-usb/files/speedtch.usermap b/net-dialup/speedtouch-usb/files/speedtch.usermap
deleted file mode 100644
index c9079e764232..000000000000
--- a/net-dialup/speedtouch-usb/files/speedtch.usermap
+++ /dev/null
@@ -1,2 +0,0 @@
-# usb module         match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info
-speedtch           0x0003      0x06b9   0x4061    0x0000       0x00         0x00         0x00            0x00            0x00            0x00               0x00000000         "Alcatel SpeedTouch USB"