inter-block this package with newly added net-dialup/ueagle-atm (#131693)

Package-Manager: portage-2.0.54

6 files changed, 18 insertions, 131 deletions

diff --git a/net-dialup/eagle-usb/ChangeLog b/net-dialup/eagle-usb/ChangeLog
index a5a27904871e..94129310fb28 100644
--- a/net-dialup/eagle-usb/ChangeLog
+++ b/net-dialup/eagle-usb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/eagle-usb
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/ChangeLog,v 1.8 2006/03/26 17:32:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/ChangeLog,v 1.9 2006/04/30 13:14:08 mrness Exp $
+
+  30 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  -files/eagle-usb-2.3.2-kernel-2.6.14.patch, -eagle-usb-2.3.2.ebuild,
+  eagle-usb-2.3.3.ebuild:
+  Advise users with kernel >= 2.6.16 to use the driver available in their
+  kernel and instruct them to install net-dialup/ueagle-atm instead.
 
   26 Mar 2006; Alin Nastac <mrness@gentoo.org> eagle-usb-2.3.2.ebuild,
   eagle-usb-2.3.3.ebuild:
diff --git a/net-dialup/eagle-usb/Manifest b/net-dialup/eagle-usb/Manifest
index c3112f71dcb8..567681d112f5 100644
--- a/net-dialup/eagle-usb/Manifest
+++ b/net-dialup/eagle-usb/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e99f6ba000159b1a8d2409c4d454c0c2 ChangeLog 1986
-MD5 d67d6466f22c381923e907b4d3685775 eagle-usb-2.3.2.ebuild 2779
-MD5 d8f46a8dd1be6844b31f4e02e9917c9c eagle-usb-2.3.3.ebuild 2779
+MD5 5b25c5db9956a6d87e8e824ad43185ad ChangeLog 2274
+MD5 79531dd6c3cfaf21362ba9f06a3d1278 eagle-usb-2.3.3.ebuild 2899
 MD5 1be21c3db71831527e5651ecb2ba2cbd files/confd 807
-MD5 4e18b4a9b8da13d4f302a127deeeb9cb files/digest-eagle-usb-2.3.2 68
 MD5 acf561a1ee40cb6850292366d1768eef files/digest-eagle-usb-2.3.3 68
 MD5 a26da8905bd09e0c8d5628c0afd96a8b files/dsl.peer 185
-MD5 e068fea45c066b365fd8256930480dc4 files/eagle-usb-2.3.2-kernel-2.6.14.patch 1181
 MD5 a8c66d048f6a6f7651cf2d8a0a36700c files/eagle-usb-2.3.3-kernel-2.6.14.patch 1181
 MD5 4080058818261b0bbb604c68bd2ddb1d files/initd 9368
 MD5 784ec6993aa07588926fec5a7fbf2c70 metadata.xml 246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEJtA1jG8pv1lIUX4RAia/AJ4ouBuEO+pPcr5m2AyX16JaCdUgcQCg5MyW
-cWYSfkxZ8jedzLVl2e7HBJc=
-=rBUD
+iD8DBQFEVLgsjG8pv1lIUX4RAoOmAKDtBu7nNfNYhVvEtLP9aF/8YaXdwwCcD845
+1t9Q9OXysxaWK+Ba8GvsOss=
+=NVrT
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/eagle-usb/eagle-usb-2.3.2.ebuild b/net-dialup/eagle-usb/eagle-usb-2.3.2.ebuild
deleted file mode 100644
index 6dacc7912b2d..000000000000
--- a/net-dialup/eagle-usb/eagle-usb-2.3.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2006 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.2.ebuild,v 1.3 2006/03/26 17:32:20 mrness Exp $
-
-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"
-HOMEPAGE="http://www.eagle-usb.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="net-dialup/ppp"
-
-MODULE_NAMES="${PN}(net:${S}/driver)"
-CONFIG_CHECK="!IPV6 USB"
-BUILD_TARGETS=" "
-BUILD_PARAMS="KERNELSRC='${KV_DIR}'"
-
-pkg_setup() {
-	if kernel_is ge 2 6 16; then
-		eerror "This driver should be used only with kernel versions less than 2.6.16."
-		eerror "Please install and use the driver included in your kernel instead."
-		eerror "The kernel option that enables the driver is CONFIG_USB_UEAGLEATM."
-		die "unsupported kernel version"
-	fi
-	linux-mod_pkg_setup
-}
-
-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"
-	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
-
-	newinitd "${FILESDIR}/initd" "${PN}"
-	newconfd "${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.3.ebuild b/net-dialup/eagle-usb/eagle-usb-2.3.3.ebuild
index 9dd4235371ce..93b49e8aea0d 100644
--- a/net-dialup/eagle-usb/eagle-usb-2.3.3.ebuild
+++ b/net-dialup/eagle-usb/eagle-usb-2.3.3.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/eagle-usb/eagle-usb-2.3.3.ebuild,v 1.2 2006/03/26 17:32:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/eagle-usb-2.3.3.ebuild,v 1.3 2006/04/30 13:14:08 mrness Exp $
 
 inherit linux-mod eutils
 
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="net-dialup/ppp"
+RDEPEND="net-dialup/ppp
+	!net-dialup/ueagle-atm"
 
 MODULE_NAMES="${PN}(net:${S}/driver)"
 CONFIG_CHECK="!IPV6 USB"
@@ -24,7 +25,9 @@ pkg_setup() {
 	if kernel_is ge 2 6 16; then
 		eerror "This driver should be used only with kernel versions less than 2.6.16."
 		eerror "Please install and use the driver included in your kernel instead."
-		eerror "The kernel option that enables the driver is CONFIG_USB_UEAGLEATM."
+		echo
+		einfo "The kernel option that enables the driver is CONFIG_USB_UEAGLEATM."
+		einfo "You should also install firmware files available through net-dialup/ueagle-atm."
 		die "unsupported kernel version"
 	fi
 	linux-mod_pkg_setup
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
deleted file mode 100644
index 54824f4ba57f..000000000000
--- a/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.2
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 1476e8f4a355..000000000000
--- a/net-dialup/eagle-usb/files/eagle-usb-2.3.2-kernel-2.6.14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
- 	{