remove obsolete version; fix conf.d and init.d files according to bug #97248; version bump (#115179)

(Portage version: 2.0.51.22-r3)

10 files changed, 66 insertions, 94 deletions

diff --git a/net-dialup/eagle-usb/ChangeLog b/net-dialup/eagle-usb/ChangeLog
index 1aff11c67a48..2b553bfc70a4 100644
--- a/net-dialup/eagle-usb/ChangeLog
+++ b/net-dialup/eagle-usb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/eagle-usb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/ChangeLog,v 1.5 2005/11/04 05:36:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/ChangeLog,v 1.6 2005/12/14 18:31:06 mrness Exp $
+
+*eagle-usb-2.3.2 (14 Dec 2005)
+
+  14 Dec 2005; Alin Nastac <mrness@gentoo.org>
+  +files/eagle-usb-2.3.2-kernel-2.6.14.patch, files/confd, files/initd,
+  -eagle-usb-2.1.1.ebuild, -eagle-usb-2.3.1.ebuild, +eagle-usb-2.3.2.ebuild:
+  Remove obsolete versions. Correct DSP variable in /etc/conf.d/eagle-usb and
+  create /dev/ppp device in /etc/init.d/eagle-usb (#97248). Version bump
+  (#115179).
 
 *eagle-usb-2.3.1-r1 (04 Nov 2005)
 
diff --git a/net-dialup/eagle-usb/Manifest b/net-dialup/eagle-usb/Manifest
index 580664a5bfe5..89d3dd8edf43 100644
--- a/net-dialup/eagle-usb/Manifest
+++ b/net-dialup/eagle-usb/Manifest
@@ -1,22 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8bd5affbf916cafa3ee089c1ce8cc54b eagle-usb-2.3.1.ebuild 2372
 MD5 3f943ad547d252ddae938f5e972ab9fb eagle-usb-2.3.1-r1.ebuild 2459
-MD5 ab58f19ab2eb89eda0b06230e27395a2 eagle-usb-2.1.1.ebuild 2376
-MD5 a9076e8b4d38e52554e4a3485a7ca073 ChangeLog 1041
+MD5 350695530e8cd6ef299aec345002f4a3 eagle-usb-2.3.2.ebuild 2459
+MD5 735f3d3c91f8d2a93cdbf421d4b09c09 ChangeLog 1434
 MD5 784ec6993aa07588926fec5a7fbf2c70 metadata.xml 246
-MD5 9bcb1e4277b2ca63a52b873a3c8b632d files/confd 805
-MD5 e6bb5c4e3d40da64218b22962001d51e files/initd 9194
+MD5 1be21c3db71831527e5651ecb2ba2cbd files/confd 807
+MD5 4080058818261b0bbb604c68bd2ddb1d files/initd 9368
 MD5 3e4640108bd9d4f20b535eb371e7a38b files/eagle-usb-2.3.1-kernel-2.6.14.patch 1025
-MD5 4062d2a6eb8bbb26c70db6813102e56c files/digest-eagle-usb-2.1.1 68
-MD5 638f7cece06abaad09f9e13f5d2164f8 files/digest-eagle-usb-2.3.1 68
+MD5 4e18b4a9b8da13d4f302a127deeeb9cb files/digest-eagle-usb-2.3.2 68
 MD5 a26da8905bd09e0c8d5628c0afd96a8b files/dsl.peer 185
+MD5 e068fea45c066b365fd8256930480dc4 files/eagle-usb-2.3.2-kernel-2.6.14.patch 1181
 MD5 638f7cece06abaad09f9e13f5d2164f8 files/digest-eagle-usb-2.3.1-r1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDavOCNSP4Vda7IdsRAg6xAJ9Nd9QsG97cAJfykCC3i0YuKSIAqACeLX8e
-joR1pk0SQ87bfTqz8kOJqQ0=
-=qd9V
------END PGP SIGNATURE-----
diff --git a/net-dialup/eagle-usb/eagle-usb-2.1.1.ebuild b/net-dialup/eagle-usb/eagle-usb-2.1.1.ebuild
deleted file mode 100644
index c194f0d4303f..000000000000
--- a/net-dialup/eagle-usb/eagle-usb-2.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/eagle-usb-2.1.1.ebuild,v 1.2 2005/03/02 22:37:12 sekretarz Exp $
-
-inherit linux-mod
-
-DESCRIPTION="GPL Driver for Eagle Chipset powered ADSL modem"
-SRC_URI="http://download.gna.org/eagleusb/eagle-usb-2.1.0/${P}.tar.bz2"
-HOMEPAGE="http://www.eagle-usb.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="net-dialup/ppp"
-
-MODULE_NAMES="${PN}(net:${S}/driver)"
-CONFIG_CHECK="!IPV6 USB"
-BUILD_TARGETS=" "
-BUILD_PARAMS="KERNELSRC=${KV_DIR}"
-
-src_compile() {
-	./autogen.sh || die "autogen.sh failed"
-	CONFIG_FILES=Makefile.common econf --with-kernel-src=${KV_DIR} || die "econf failed"
-	for i in pppoa utils/scripts utils/eagleconnect; do
-		emake -C ${i} || die "emake ${i} failed"
-	done
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	for i in driver/firmware driver/user pppoa utils/scripts utils/eagleconnect; do
-		make DESTDIR=${D} -C ${i} install || die "make ${i} install failed"
-	done
-
-	doman doc/man/*
-	dodoc README ChangeLog
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/initd ${PN}
-	insinto /etc/conf.d ; newins ${FILESDIR}/confd ${PN}
-	insopts -m 600 ; insinto /etc/ppp/peers ; doins ${FILESDIR}/dsl.peer
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	ewarn "Please set METHOD in /etc/conf.d/${PN} to the needed value:"
-	ewarn "dhcpip:"
-	einfo "          Make sure you have dhcpcd emerged."
-	ewarn "staticip:"
-	einfo "          Set your static IP in /etc/conf.d/eagle-adsl"
-	ewarn "dhcpip && staticip: You can use the following to set up the eagle conf-files:"
-	echo 'sed -i -e "s/Encapsulation *= *[0-9]\+/Encapsulation=00000004/" /etc/eagle-usb/eagle-usb.conf'
-	echo 'sed -i -e "s/VCI *= *[0-9]\+/VCI=00000024/" /etc/eagle-usb/eagle-usb.conf'
-	ewarn "pppoa:"
-	einfo "          Make sure you have kernel support for HDCL and PPP"
-	einfo "          Edit /etc/ppp/peers/dsl.peer to insert your username as"
-	einfo "          well as /etc/ppp/chap-secrets and /etc/ppp/pap-secrets"
-	einfo
-	einfo "          dsl.peer contains the \"usepeerdns\" option so, you"
-	einfo "          should consider making a symlink named /etc/resolv.conf"
-	einfo "          and pointing to /etc/ppp/resolv.conf:"
-	echo "rm /etc/resolv.conf"
-	echo "ln -s /etc/ppp/resolv.conf /etc/resolv.conf"
-}
diff --git a/net-dialup/eagle-usb/eagle-usb-2.3.1.ebuild b/net-dialup/eagle-usb/eagle-usb-2.3.2.ebuild
index daa32aba7746..42f944fd0366 100644
--- a/net-dialup/eagle-usb/eagle-usb-2.3.1.ebuild
+++ b/net-dialup/eagle-usb/eagle-usb-2.3.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/eagle-usb-2.3.1.ebuild,v 1.1 2005/05/03 09:24:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/eagle-usb-2.3.2.ebuild,v 1.1 2005/12/14 18:31:06 mrness Exp $
 
-inherit linux-mod
+inherit linux-mod eutils
 
 DESCRIPTION="GPL Driver for Eagle Chipset powered ADSL modem"
 SRC_URI="http://baud123.free.fr/eagle-usb/${PN}-${PV%.*}/${P}.tar.bz2"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.eagle-usb.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="net-dialup/ppp"
@@ -20,6 +20,12 @@ CONFIG_CHECK="!IPV6 USB"
 BUILD_TARGETS=" "
 BUILD_PARAMS="KERNELSRC=${KV_DIR}"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-kernel-2.6.14.patch
+}
+
 src_compile() {
 	./autogen.sh || die "autogen.sh failed"
 	CONFIG_FILES=Makefile.common econf --with-kernel-src=${KV_DIR} || die "econf failed"
diff --git a/net-dialup/eagle-usb/files/confd b/net-dialup/eagle-usb/files/confd
index 58be50544b62..e26f872d1397 100644
--- a/net-dialup/eagle-usb/files/confd
+++ b/net-dialup/eagle-usb/files/confd
@@ -1,10 +1,10 @@
 # Config file for the eagle-adsl ebuild
 
 # Set the options path
-OPTIONS="/etc/eagle-usb/dsp/eagle-usb.conf"
+OPTIONS="/etc/eagle-usb/eagle-usb.conf"
 
 # Set DSP code path
-DSP="/etc/eagle-usb/dsp"
+DSP="/usr/share/eagle-usb/dsp"
 
 # Set default synchro timeout in seconds
 SYNCHRO_TIMEOUT=120
diff --git a/net-dialup/eagle-usb/files/digest-eagle-usb-2.1.1 b/net-dialup/eagle-usb/files/digest-eagle-usb-2.1.1
deleted file mode 100644
index 34a1fc3edd66..000000000000
--- a/net-dialup/eagle-usb/files/digest-eagle-usb-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e6e2f8e69172cf71c1c2fab73bedb52 eagle-usb-2.1.1.tar.bz2 906750
diff --git a/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.1 b/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.1
deleted file mode 100644
index 764c6eaad613..000000000000
--- a/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6c6b15a8eeff1f51d7bc875c2d3809b6 eagle-usb-2.3.1.tar.bz2 928311
diff --git a/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.2 b/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.2
new file mode 100644
index 000000000000..54824f4ba57f
--- /dev/null
+++ b/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.2
@@ -0,0 +1 @@
+MD5 91727db818e5170b2d78a99ee51c2d58 eagle-usb-2.3.2.tar.bz2 930712
diff --git a/net-dialup/eagle-usb/files/eagle-usb-2.3.2-kernel-2.6.14.patch b/net-dialup/eagle-usb/files/eagle-usb-2.3.2-kernel-2.6.14.patch
new file mode 100644
index 000000000000..1476e8f4a355
--- /dev/null
+++ b/net-dialup/eagle-usb/files/eagle-usb-2.3.2-kernel-2.6.14.patch
@@ -0,0 +1,33 @@
+diff -Nru eagle-usb-2.3.2.orig/driver/eu_eth.c eagle-usb-2.3.2/driver/eu_eth.c
+--- eagle-usb-2.3.2.orig/driver/eu_eth.c	2005-01-17 22:54:42.000000000 +0200
++++ eagle-usb-2.3.2/driver/eu_eth.c	2005-12-14 19:43:29.953273250 +0200
+@@ -495,11 +495,16 @@
+      * netif_wakequeue:
+     */
+     
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+     ins->urb_write->transfer_flags |= URB_ASYNC_UNLINK;
+     usb_unlink_urb(ins->urb_write);
+ 
+     ins->urb_oam_write->transfer_flags |= URB_ASYNC_UNLINK;
+     usb_unlink_urb(ins->urb_oam_write);
++#else
++    USB_KILL_URB(ins->urb_write);
++    USB_KILL_URB(ins->urb_oam_write);
++#endif
+     
+     /* We must reset the transaction time to keep the watchdog quiet: */
+     dev->trans_start = jiffies;
+diff -Nru eagle-usb-2.3.2.orig/driver/Pipes.c eagle-usb-2.3.2/driver/Pipes.c
+--- eagle-usb-2.3.2.orig/driver/Pipes.c	2005-01-17 22:54:42.000000000 +0200
++++ eagle-usb-2.3.2/driver/Pipes.c	2005-12-14 19:43:29.953273250 +0200
+@@ -919,7 +919,9 @@
+              *  -EINVAL.
+             */
+             urb->status = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+             urb->transfer_flags &= ~URB_ASYNC_UNLINK;
++#endif
+ 	}
+ 	else
+ 	{
diff --git a/net-dialup/eagle-usb/files/initd b/net-dialup/eagle-usb/files/initd
index 788d09768819..7ed5be356cfa 100644
--- a/net-dialup/eagle-usb/files/initd
+++ b/net-dialup/eagle-usb/files/initd
@@ -64,12 +64,17 @@ check_ppp () {
     # Check for PPP
     [ ! -z ${PPP} ] ; eend $? "failed to find ppp" || return 1
 
+    # Check for /dev/ppp
+    modprobe pppoe-generic &> /dev/null
+    [ -c /dev/ppp ] || mknod /dev/ppp c 108 0 || eend $?  "Failed to create device /dev/ppp" || return 1
+
     # Check for PEER file
     [ "${PEER:-set}" != set ] ; eend $? "Please define \$PEER in /etc/conf.d/eagle-usb" || return 1
     [ -f /etc/ppp/peers/${PEER} ]  ; eend $? "Failed to find peer ${PEER} configuration" || return 1
 
     # Check for IFCONFIG
     [ -x ${IFCONFIG} ]; eend $? "Failed to find 'ifconfig'" || return 1
+	 
 }
 
 check_dhcpcd () {