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, 46 deletions

diff --git a/net-dialup/ueagle-atm/ChangeLog b/net-dialup/ueagle-atm/ChangeLog
index 373a114fe344..d3e5eb584731 100644
--- a/net-dialup/ueagle-atm/ChangeLog
+++ b/net-dialup/ueagle-atm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/ueagle-atm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ueagle-atm/ChangeLog,v 1.2 2006/05/01 08:29:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ueagle-atm/ChangeLog,v 1.3 2006/05/23 17:09:04 mrness Exp $
+
+*ueagle-atm-1.1-r2 (23 May 2006)
+
+  23 May 2006; Alin Nastac <mrness@gentoo.org> files/README,
+  -ueagle-atm-1.1-r1.ebuild, +ueagle-atm-1.1-r2.ebuild:
+  Keep up with baselayout-1.12.0 development. Improve post-install messages,
+  based on new features available in linux-info.eclass.
 
 *ueagle-atm-1.1-r1 (01 May 2006)
 
diff --git a/net-dialup/ueagle-atm/Manifest b/net-dialup/ueagle-atm/Manifest
index 1f8d05078248..9b4b47b6a8df 100644
--- a/net-dialup/ueagle-atm/Manifest
+++ b/net-dialup/ueagle-atm/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 100ac52fc1942d8882808cc1f4d78f26 ChangeLog 683
-MD5 0cf8405a4993538a941f235f6410b15f files/README 8766
-MD5 0d747d791cf20ab224f960ab892c767d files/digest-ueagle-atm-1.1-r1 72
+MD5 11711e91149b2f12316af9838aec7374 files/README 8892
+MD5 0d747d791cf20ab224f960ab892c767d files/digest-ueagle-atm-1.1-r2 72
 MD5 7bb58ae97db72c0e60691f42e245e6ba metadata.xml 312
-MD5 4df716d7c8fa69e948c76c9f2d01cd26 ueagle-atm-1.1-r1.ebuild 2634
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEVccEjG8pv1lIUX4RAgDYAJ9wjd766uj/GoIk5wuR+PTzYYoz2ACgzFdw
-NdrYdMzvGy5Jsz+W0FWYWIs=
-=MaSQ
------END PGP SIGNATURE-----
+MD5 7873ea6866f052bc282e27f30b6890b5 ueagle-atm-1.1-r2.ebuild 2630
diff --git a/net-dialup/ueagle-atm/files/README b/net-dialup/ueagle-atm/files/README
index 9af58f9da03f..646b481325e4 100644
--- a/net-dialup/ueagle-atm/files/README
+++ b/net-dialup/ueagle-atm/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. Ask your ISP about those numbers.
@@ -35,8 +35,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
@@ -51,36 +51,37 @@ function preup() {
 
 b) PPPoE configuration:
 
+# 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="-a 0.38 -e 0"
+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 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" = "nas0" ]] ; then
 		modprobe -q ueagle-atm
+		return 0
 	fi
 }
 
-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 ) 
-# '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'
-password_ppp0='password'  # ADSL password, assigned by your ISP
-
-
 
 Configuration continued
 =======================
@@ -88,6 +89,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/ueagle-atm/files/digest-ueagle-atm-1.1-r1 b/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.1-r2
index 224202223d37..224202223d37 100644
--- a/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.1-r1
+++ b/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.1-r2
diff --git a/net-dialup/ueagle-atm/ueagle-atm-1.1-r1.ebuild b/net-dialup/ueagle-atm/ueagle-atm-1.1-r2.ebuild
index a5a30bc13ec9..bbdb2ee5505c 100644
--- a/net-dialup/ueagle-atm/ueagle-atm-1.1-r1.ebuild
+++ b/net-dialup/ueagle-atm/ueagle-atm-1.1-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/ueagle-atm/ueagle-atm-1.1-r1.ebuild,v 1.1 2006/05/01 08:29:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ueagle-atm/ueagle-atm-1.1-r2.ebuild,v 1.1 2006/05/23 17:09:04 mrness Exp $
 
 inherit eutils linux-info
 
@@ -27,11 +27,11 @@ pkg_setup() {
 		die "Unsupported kernel version"
 	fi
 
-	if ! has_version '>=sys-apps/baselayout-1.12.0_pre18' ; then
-		ewarn "The best way of using this driver is through the pppd net module of"
-		ewarn ">=sys-apps/baselayout-1.12.0_pre18, which is also the only"
-		ewarn "documented mode of using ${CATEGORY}/${PN}."
-		ewarn "Please install baselayout-1.12.0_pre18 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
 }
@@ -51,29 +51,29 @@ src_install() {
 
 pkg_postinst() {
 	# Check kernel configuration
-	CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_UEAGLEATM \
+	local CONFIG_CHECK="~FW_LOADER ~NET ~PACKET ~ATM ~NETDEVICES ~USB_DEVICEFS ~USB_ATM ~USB_UEAGLEATM \
 		~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
 	fi
 
-	ewarn "To complete the installation, you must read the documentation available in"
-	ewarn "   ${ROOT}usr/share/doc/${PF}"
+	einfo "To complete the installation, you must read the documentation available in"
+	einfo "   ${ROOT}usr/share/doc/${PF}"
 }