Remove old version. Quote strings containing env vars. Version bump.

Package-Manager: portage-2.0.54

7 files changed, 57 insertions, 47 deletions

diff --git a/net-dialup/eagle-usb/ChangeLog b/net-dialup/eagle-usb/ChangeLog
index 2b553bfc70a4..d7a8bd903d7f 100644
--- a/net-dialup/eagle-usb/ChangeLog
+++ b/net-dialup/eagle-usb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2005/12/14 18:31:06 mrness Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/ChangeLog,v 1.7 2006/03/12 10:34:51 mrness Exp $
+
+*eagle-usb-2.3.3 (12 Mar 2006)
+
+  12 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  -files/eagle-usb-2.3.1-kernel-2.6.14.patch,
+  +files/eagle-usb-2.3.3-kernel-2.6.14.patch, -eagle-usb-2.3.1-r1.ebuild,
+  eagle-usb-2.3.2.ebuild, +eagle-usb-2.3.3.ebuild:
+  Remove old version. Quote strings containing env vars. Version bump.
 
 *eagle-usb-2.3.2 (14 Dec 2005)
 
diff --git a/net-dialup/eagle-usb/Manifest b/net-dialup/eagle-usb/Manifest
index 2a78b0601bd3..389202f68156 100644
--- a/net-dialup/eagle-usb/Manifest
+++ b/net-dialup/eagle-usb/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3f943ad547d252ddae938f5e972ab9fb eagle-usb-2.3.1-r1.ebuild 2459
-MD5 a0e32a0575e1fc0be4c6217a52f8eec7 eagle-usb-2.3.2.ebuild 2456
-MD5 b886b66f010137a961035b5f8a29fe67 ChangeLog 1434
-MD5 784ec6993aa07588926fec5a7fbf2c70 metadata.xml 246
+MD5 32b7f78c4e4001158dc4b09c7391bf6c ChangeLog 1756
+MD5 437067e6222186efea17034f5a2b6a2b eagle-usb-2.3.2.ebuild 2434
+MD5 c8c811c72c1db652287291ef67935e65 eagle-usb-2.3.3.ebuild 2434
 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 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 638f7cece06abaad09f9e13f5d2164f8 files/digest-eagle-usb-2.3.1-r1 68
+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 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDoGT6NSP4Vda7IdsRAmF3AJ9BnZ5OPIgT05xmDQUtG7JFHoUw4QCeN9Yo
-89Au09Vi2XtHc3LLQjy5HbU=
-=SlPK
+iD8DBQFEE/lcjG8pv1lIUX4RAg8AAKC/owUo57i+bV2DACyd4bYYLIMF2wCgzIF1
+1hUljFnNXr7T7Rwy+kdPwCI=
+=7H0/
 -----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
index 42f944fd0366..d8fb78a802e5 100644
--- a/net-dialup/eagle-usb/eagle-usb-2.3.2.ebuild
+++ b/net-dialup/eagle-usb/eagle-usb-2.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.1 2005/12/14 18:31:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/eagle-usb-2.3.2.ebuild,v 1.2 2006/03/12 10:34:51 mrness Exp $
 
 inherit linux-mod eutils
 
@@ -18,17 +18,17 @@ RDEPEND="net-dialup/ppp"
 MODULE_NAMES="${PN}(net:${S}/driver)"
 CONFIG_CHECK="!IPV6 USB"
 BUILD_TARGETS=" "
-BUILD_PARAMS="KERNELSRC=${KV_DIR}"
+BUILD_PARAMS="KERNELSRC='${KV_DIR}'"
 
 src_unpack() {
 	unpack ${A}
 
-	epatch ${FILESDIR}/${P}-kernel-2.6.14.patch
+	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"
+	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
@@ -40,15 +40,15 @@ 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"
+		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
+	newinitd "${FILESDIR}/initd" "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insopts -m 600 ; insinto /etc/ppp/peers ; doins "${FILESDIR}/dsl.peer"
 }
 
 pkg_postinst() {
diff --git a/net-dialup/eagle-usb/eagle-usb-2.3.1-r1.ebuild b/net-dialup/eagle-usb/eagle-usb-2.3.3.ebuild
index 0e5973ddb82c..eb314bf40de3 100644
--- a/net-dialup/eagle-usb/eagle-usb-2.3.1-r1.ebuild
+++ b/net-dialup/eagle-usb/eagle-usb-2.3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.1-r1.ebuild,v 1.1 2005/11/04 05:36:52 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/eagle-usb/eagle-usb-2.3.3.ebuild,v 1.1 2006/03/12 10:34:51 mrness Exp $
 
 inherit linux-mod eutils
 
@@ -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"
@@ -18,17 +18,17 @@ RDEPEND="net-dialup/ppp"
 MODULE_NAMES="${PN}(net:${S}/driver)"
 CONFIG_CHECK="!IPV6 USB"
 BUILD_TARGETS=" "
-BUILD_PARAMS="KERNELSRC=${KV_DIR}"
+BUILD_PARAMS="KERNELSRC='${KV_DIR}'"
 
 src_unpack() {
 	unpack ${A}
 
-	epatch ${FILESDIR}/${P}-kernel-2.6.14.patch
+	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"
+	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
@@ -40,15 +40,15 @@ 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"
+		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
+	newinitd "${FILESDIR}/initd" "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insopts -m 600 ; insinto /etc/ppp/peers ; doins "${FILESDIR}/dsl.peer"
 }
 
 pkg_postinst() {
diff --git a/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.1-r1 b/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.1-r1
deleted file mode 100644
index 764c6eaad613..000000000000
--- a/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.1-r1
+++ /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.3 b/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.3
new file mode 100644
index 000000000000..89c6fac625de
--- /dev/null
+++ b/net-dialup/eagle-usb/files/digest-eagle-usb-2.3.3
@@ -0,0 +1 @@
+MD5 6c961a5022274aff870e49e2f0f922fc eagle-usb-2.3.3.tar.bz2 932829
diff --git a/net-dialup/eagle-usb/files/eagle-usb-2.3.1-kernel-2.6.14.patch b/net-dialup/eagle-usb/files/eagle-usb-2.3.3-kernel-2.6.14.patch
index 5b2c469e1ea0..313933fd2534 100644
--- a/net-dialup/eagle-usb/files/eagle-usb-2.3.1-kernel-2.6.14.patch
+++ b/net-dialup/eagle-usb/files/eagle-usb-2.3.3-kernel-2.6.14.patch
@@ -1,17 +1,6 @@
---- eagle-usb-2.3.1/driver/Pipes.c.orig	2005-01-17 21:54:42.000000000 +0100
-+++ eagle-usb-2.3.1/driver/Pipes.c	2005-11-03 21:29:53.000000000 +0100
-@@ -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
- 	{
---- eagle-usb-2.3.1/driver/eu_eth.c.orig	2005-01-17 21:54:42.000000000 +0100
-+++ eagle-usb-2.3.1/driver/eu_eth.c	2005-11-03 21:33:19.000000000 +0100
+diff -Nru eagle-usb-2.3.3.orig/driver/eu_eth.c eagle-usb-2.3.3/driver/eu_eth.c
+--- eagle-usb-2.3.3.orig/driver/eu_eth.c	2005-01-17 22:54:42.000000000 +0200
++++ eagle-usb-2.3.3/driver/eu_eth.c	2005-12-14 19:43:29.953273250 +0200
 @@ -495,11 +495,16 @@
       * netif_wakequeue:
      */
@@ -29,3 +18,16 @@
      
      /* We must reset the transaction time to keep the watchdog quiet: */
      dev->trans_start = jiffies;
+diff -Nru eagle-usb-2.3.3.orig/driver/Pipes.c eagle-usb-2.3.3/driver/Pipes.c
+--- eagle-usb-2.3.3.orig/driver/Pipes.c	2005-01-17 22:54:42.000000000 +0200
++++ eagle-usb-2.3.3/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
+ 	{