correct fix for #74770

diff --git a/net-dialup/speedtouch/ChangeLog b/net-dialup/speedtouch/ChangeLog
index 3a6bd68b504fdc97d26fb69bf16adb3c72bbbab2..addcab2e4f7046dbe17a6fa60e9d6e1ec5d7526b 100644 (file)
--- a/net-dialup/speedtouch/ChangeLog
+++ b/net-dialup/speedtouch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/speedtouch
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.25 2004/12/18 15:59:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.26 2004/12/22 21:42:05 mrness Exp $
+
+*speedtouch-1.3.1-r2 (22 Dec 2004)
+
+  22 Dec 2004; Alin Nastac <mrness@gentoo.org> -speedtouch-1.3.1-r1.ebuild,
+  +speedtouch-1.3.1-r2.ebuild:
+  Proper fix bug #74770.
 
 *speedtouch-1.3.1-r1 (18 Dec 2004)
 

diff --git a/net-dialup/speedtouch/Manifest b/net-dialup/speedtouch/Manifest
index 91ba13835f504a8b1f3b5c1015792e607e7fa921..15c13c9a07549555570a26e91e18265eb9ba66b7 100644 (file)
--- a/net-dialup/speedtouch/Manifest
+++ b/net-dialup/speedtouch/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8d49b340546a3ff65082ff930ee2c3b4 ChangeLog 3768
+MD5 9bc70a787c74d49568a0803ef91765f8 ChangeLog 3937
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 b315243b1b3acdb95ef60ce5a9a86c26 speedtouch-1.3.1-r1.ebuild 2941
+MD5 bf5946537ca088833a94fe186393a3eb speedtouch-1.3.1-r2.ebuild 2947
 MD5 d6eb26607fa211c61609dd783ecfdac9 files/adsl.sample 599
 MD5 3c7d210090e2fed135170292f62e279b files/speedtch-hotplug 396
 MD5 e1433d87a19203883aeaa0d4f791f91f files/speedtouch.confd 699
 MD5 aa0803fb7b3133521df4ee07d7ff141a files/speedtouch.rc7 1655
-MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1-r1 69
+MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1-r2 69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBxFQBjtv59x0+BrURAhmHAKC/Z9/VgKSh41FpLFKX92Vz9hL3cACghJpW
-ELcV2cbv6MIshgbuGg/HgU8=
-=MBQO
+iD8DBQFByeo2jtv59x0+BrURAr3JAKDDAJxBf9sQt5Y1Zcn6do/4eYN2YgCg3qEF
+kDPfeyOonnblQDI6QWuOWIA=
+=l15d
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r1 b/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r2
similarity index 100%
rename from net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r1
rename to net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r2

diff --git a/net-dialup/speedtouch/speedtouch-1.3.1-r1.ebuild b/net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild
similarity index 95%
rename from net-dialup/speedtouch/speedtouch-1.3.1-r1.ebuild
rename to net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild
index b7605056a62710e7dd8ceb9938319da8870695df..10f1507d14fab13c4b2f1ae915f6a1e4b68181fd 100644 (file)
--- a/net-dialup/speedtouch/speedtouch-1.3.1-r1.ebuild
+++ b/net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/speedtouch-1.3.1-r1.ebuild,v 1.1 2004/12/18 15:11:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild,v 1.1 2004/12/22 21:42:05 mrness Exp $
 
 inherit flag-o-matic
 
 MY_P=${P/_/-}
 S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="GPL Driver for the Alcatel Speedtouch USB under *nix"
 HOMEPAGE="http://speedtouch.sf.net/"
 SRC_URI="mirror://sourceforge/speedtouch/${MY_P}.tar.bz2"
@@ -18,12 +19,12 @@ IUSE="static debug"
 DEPEND=""
 RDEPEND=">=net-dialup/ppp-2.4.1"
 
-pkg_unpack() {
+src_unpack() {
        unpack ${A}
 
        #Increase minlevel of reports in atm.c
        #At least one of the reports could affect performance due to call frequency
-       sed -i -e 's/report(0/report(1/' src/atm.c
+       sed -i -e 's/report(0/report(1/' ${S}/src/atm.c
 }
 
 src_compile() {