Modify PPPoA chapter of the documentation (#144194). Stable on x86. Version bump.

(Portage version: 2.1.1)

6 files changed, 86 insertions, 5 deletions

diff --git a/net-dialup/ueagle-atm/ChangeLog b/net-dialup/ueagle-atm/ChangeLog
index d3e5eb584731..185590182da9 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.3 2006/05/23 17:09:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ueagle-atm/ChangeLog,v 1.4 2006/09/23 16:25:11 mrness Exp $
+
+*ueagle-atm-1.2 (23 Sep 2006)
+
+  23 Sep 2006; Alin Nastac <mrness@gentoo.org> files/README,
+  ueagle-atm-1.1-r2.ebuild, +ueagle-atm-1.2.ebuild:
+  Modify PPPoA chapter of the documentation (#144194). Stable on x86. Version
+  bump.
 
 *ueagle-atm-1.1-r2 (23 May 2006)
 
diff --git a/net-dialup/ueagle-atm/files/README b/net-dialup/ueagle-atm/files/README
index 646b481325e4..5cac68ae4fc6 100644
--- a/net-dialup/ueagle-atm/files/README
+++ b/net-dialup/ueagle-atm/files/README
@@ -27,10 +27,10 @@ Add the following lines from the appropriate section below to
 a) PPPoATM configuration:
 
 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.
-plugins_ppp0=( 'pppoa 0.38' ) 
+link_ppp0='0.38'
+plugins_ppp0=( 'pppoa' ) 
 # '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
diff --git a/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.1-r2 b/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.1-r2
index 224202223d37..4286c7ba07b9 100644
--- a/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.1-r2
+++ b/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.1-r2
@@ -1 +1,3 @@
 MD5 06dc13f3588ad963d1e6f94916271e93 ueagle-data-src-1.1.tar.gz 1270515
+RMD160 fc16fd4fa9151351b192c724c92d3d3491bcb8e7 ueagle-data-src-1.1.tar.gz 1270515
+SHA256 45b944e5b141591b9a7e64b7e1e704b8507a73f9314dee2f572e4a845f6096c2 ueagle-data-src-1.1.tar.gz 1270515
diff --git a/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.2 b/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.2
new file mode 100644
index 000000000000..83e0c3751fd5
--- /dev/null
+++ b/net-dialup/ueagle-atm/files/digest-ueagle-atm-1.2
@@ -0,0 +1,3 @@
+MD5 3bef87c7f914d927378e0926dc5579d2 ueagle-data-src-1.2.tar.gz 1270577
+RMD160 94711aae8ade9d9f4f1a0ec1705d71d64f3565ed ueagle-data-src-1.2.tar.gz 1270577
+SHA256 5bf340e986b6fbaac6fbb91d8627e5261d2d7897a95bfca806e9ee1f3d0928de ueagle-data-src-1.2.tar.gz 1270577
diff --git a/net-dialup/ueagle-atm/ueagle-atm-1.1-r2.ebuild b/net-dialup/ueagle-atm/ueagle-atm-1.1-r2.ebuild
index 2865f5c67496..a32e17709a5f 100644
--- a/net-dialup/ueagle-atm/ueagle-atm-1.1-r2.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-r2.ebuild,v 1.2 2006/05/24 09:45:19 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ueagle-atm/ueagle-atm-1.1-r2.ebuild,v 1.3 2006/09/23 16:25:11 mrness Exp $
 
 inherit eutils linux-info
 
@@ -10,7 +10,7 @@ SRC_URI="http://eagle-usb.org/ueagle-atm/non-free/ueagle-data-src-${PV}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=net-dialup/ppp-2.4.3-r14
diff --git a/net-dialup/ueagle-atm/ueagle-atm-1.2.ebuild b/net-dialup/ueagle-atm/ueagle-atm-1.2.ebuild
new file mode 100644
index 000000000000..809bf984a089
--- /dev/null
+++ b/net-dialup/ueagle-atm/ueagle-atm-1.2.ebuild
@@ -0,0 +1,69 @@
+# 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.2.ebuild,v 1.1 2006/09/23 16:25:11 mrness Exp $
+
+inherit eutils linux-info
+
+DESCRIPTION="Firmware and configuration instructions for ADI 930/Eagle USB ADSL Modem driver"
+HOMEPAGE="https://gna.org/projects/ueagleatm/"
+SRC_URI="http://eagle-usb.org/ueagle-atm/non-free/ueagle-data-src-${PV}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-dialup/ppp-2.4.3-r14
+	!net-dialup/eagle-usb"
+
+S="${WORKDIR}/ueagle-data-src-${PV}"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 2 6 16 ; then
+		eerror "The kernel-space driver exists only in kernels >= 2.6.16."
+		eerror "Please emerge net-dialup/eagle-usb instead or upgrade the kernel."
+		die "Unsupported kernel version"
+	fi
+}
+
+src_compile() {
+	make generate
+}
+
+src_install() {
+	# Copy to the firmware directory
+	insinto /lib/firmware/ueagle-atm
+	doins build/* || die "doins firmware failed"
+
+	# Documentation necessary to complete the setup
+	dodoc "${FILESDIR}/README" || die "dodoc failed"
+}
+
+pkg_postinst() {
+	# Check kernel configuration
+	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
+	echo
+
+	# Check user-space for PPPoA support
+	if ! built_with_use net-dialup/ppp atm ; then
+		ewarn "Run the following command if connecting via PPPoA protocol:"
+		ewarn "   euse -E atm && emerge net-dialup/ppp"
+		echo
+	fi
+	# Check user-space for PPPoE support
+	if ! has_version net-misc/br2684ctl ; then
+		ewarn "Run the following command if connecting via PPPoE protocol:"
+		ewarn "   emerge net-misc/br2684ctl"
+		echo
+	fi
+
+	ewarn "To complete the installation, you must read the documentation in"
+	ewarn "   ${ROOT}usr/share/doc/${PF}"
+}