11 files changed, 23 insertions, 299 deletions
diff --git a/net-dialup/speedtouch/ChangeLog b/net-dialup/speedtouch/ChangeLog
index 86f1d3401720..31682decf4f9 100644
--- a/net-dialup/speedtouch/ChangeLog
+++ b/net-dialup/speedtouch/ChangeLog
@@ -1,6 +1,15 @@
 # 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.23 2004/11/02 10:46:08 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.24 2004/12/18 15:11:56 mrness Exp $
+
+*speedtouch-1.3.1-r1 (18 Dec 2004)
+
+  18 Dec 2004; Alin Nastac <mrness@gentoo.org> -files/speedtouch.rc6,
+  -speedtouch-1.1.ebuild, -speedtouch-1.2.ebuild,
+  -speedtouch-1.2_beta2.ebuild, +speedtouch-1.3.1-r1.ebuild,
+  -speedtouch-1.3.1.ebuild:
+  Increase verbosity level required by ATM log reports due to decreased
+  performance in some cases (bug #74770). Cleanup old ebuilds.
 
   02 Nov 2004; Simon Stelling <blubb@gentoo.org> speedtouch-1.3.1.ebuild:
   stable on amd64 for security reasons (bug #68436)
diff --git a/net-dialup/speedtouch/Manifest b/net-dialup/speedtouch/Manifest
index a23bf60338cf..de1b4354eb7e 100644
--- a/net-dialup/speedtouch/Manifest
+++ b/net-dialup/speedtouch/Manifest
@@ -3,15 +3,17 @@ MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 f381ca3fb212230f03e9ed8297457c01 speedtouch-1.1.ebuild 2104
 MD5 155b1c40da16772c5bc6ec45c04537e9 speedtouch-1.2.ebuild 2421
 MD5 9cd1bc9f313b9164f7e3f10157301da7 speedtouch-1.2_beta2.ebuild 2261
-MD5 4600f02658dba0e66cdf7a48796d42a1 speedtouch-1.3.ebuild 2783
 MD5 2a3cbd6c18217f881619ea771509ca97 speedtouch-1.3.1.ebuild 2744
+MD5 4600f02658dba0e66cdf7a48796d42a1 speedtouch-1.3.ebuild 2783
+MD5 2a3cbd6c18217f881619ea771509ca97 speedtouch-1.3.1-r1.ebuild 2744
 MD5 d6eb26607fa211c61609dd783ecfdac9 files/adsl.sample 599
 MD5 c622ee14e155b3897e6a069306d1c88b files/digest-speedtouch-1.1 67
 MD5 da45576edbdb9ba3d5d9b0043cd4777b files/digest-speedtouch-1.2 67
 MD5 b1033785b6ac1ed25eb1c9dfdf95e379 files/digest-speedtouch-1.2_beta2 73
 MD5 a136338c0454c68c160d7bf1b4dbc4b2 files/digest-speedtouch-1.3 67
+MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1 69
 MD5 3c7d210090e2fed135170292f62e279b files/speedtch-hotplug 396
 MD5 e1433d87a19203883aeaa0d4f791f91f files/speedtouch.confd 699
 MD5 83e6f2ae7a2c4a9fe6d68d3c051e31c9 files/speedtouch.rc6 2339
 MD5 aa0803fb7b3133521df4ee07d7ff141a files/speedtouch.rc7 1655
-MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1 69
+MD5 be6c41b714f7e55195d93fd478dc5e7e files/digest-speedtouch-1.3.1-r1 69
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.1 b/net-dialup/speedtouch/files/digest-speedtouch-1.1
deleted file mode 100644
index 24acc1658028..000000000000
--- a/net-dialup/speedtouch/files/digest-speedtouch-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7828aefa97b66903f048204fadbe94c speedtouch-1.1.tar.bz2 137412
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.2 b/net-dialup/speedtouch/files/digest-speedtouch-1.2
deleted file mode 100644
index 53029d6f1cb8..000000000000
--- a/net-dialup/speedtouch/files/digest-speedtouch-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa55748175d14dcf8ebe22577df408b3 speedtouch-1.2.tar.bz2 188536
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta2 b/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta2
deleted file mode 100644
index 20207d345284..000000000000
--- a/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 450005ae68dc6b0323c54d4117460031 speedtouch-1.2-beta2.tar.bz2 170497
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.3.1 b/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r1
index a2553a2dd249..a2553a2dd249 100644
--- a/net-dialup/speedtouch/files/digest-speedtouch-1.3.1
+++ b/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r1
diff --git a/net-dialup/speedtouch/files/speedtouch.rc6 b/net-dialup/speedtouch/files/speedtouch.rc6
deleted file mode 100644
index ff123fd58543..000000000000
--- a/net-dialup/speedtouch/files/speedtouch.rc6
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/files/speedtouch.rc6,v 1.5 2004/07/14 23:11:58 agriffis Exp $
-
-PPP=$(which pppd)
-MODEM_RUN=$(which modem_run)
-MOUNT=$(which mount)
-UMOUNT=$(which umount)
-IFCONFIG=$(which ifconfig)
-
-MAX_LOOP=60
-
-check_modem_run() {
-[ "${MICROCODE:-set}" = set ] && ( eend 1 "Please define \$MICROCODE in /etc/conf.d/speedtouch" ; exit 1 )
-[ -f ${MICROCODE} ] ; eend $? "Failed to find the microcode." || exit 1
-[ -x ${MODEM_RUN} ] ; eend $? "Failed to find the 'modem_run' executable." || exit 1
-
-# usbdevfs is up ?
-( ${MOUNT} | grep -q usbdevfs ) || $MOUNT none /proc/bus/usb -t usbdevfs > /dev/null 2>&1
-
-sleep 1
-
-## Let's check if modem_run is UP. If not let's try lauching it (again)?
-( ps -e | grep -q modem_run ) || $MODEM_RUN -v $VERBOSE -m $MODEM_RUN_EXTRAOPTS -f $MICROCODE
-RETURNED=$?
-
-sleep 1
-if [ $RETURNED -ne 0 ]; then		# modem_run CAN'T run
-	eerror "Can't load the microcode !!" 
-	eerror "Please detach and attach again your modem to the USB port to unload the microcode."
-	eerror "Then run '/etc/init.d/speedtouch start'"
-return 1 
-fi
-
-}
-
-depend() {
-need localmount modules
-}
-
-start() {
-
-ebegin "Starting Speedtouch ADSL Modem..."
-
-check_modem_run || eend 1 "Failed to start Speedtouch ADSL Modem..."
-
-[ ! -z $PPP ] ; eend $? "Failed to find ppp" || exit 1
-[ -f "/etc/ppp/peers/$PEER" ] ; eend $? "Failed to find peer configuration" || exit 1
-[ -x $IFCONFIG ] ; eend $? "Failed to find 'ifconfig'" || exit 1
-
-## Allright. Start pppd.
-einfo "Launching the PPP daemon..."
-rm -f /var/run/pppoa*.pid
-start-stop-daemon --start --exec $PPP call $PEER > /dev/null 2>&1
-
-RETURNED=1
-LOOPS=0
-
-# Loop until connection has been established with the ISP
-# or the transaction has failed
-while [ $RETURNED -ne 0 ] && [ $LOOPS -le $MAX_LOOP ] ; do
-    $IFCONFIG | grep -q 'ppp'
-    RETURNED=$?
-    LOOPS=`expr $LOOPS + 1`
-    sleep 1
-done
-
-if [ $LOOPS -gt $MAX_LOOP ] && [ $RETURNED -ne 0 ] ; then
-    eerror "Failed to start the PPP daemon" ; return 1
-fi
-
-					
-eend $? "Failed to start Speedtouch ADSL Modem..."
-}
-
-stop () {
-ebegin "Shutting down the SpeedTouch ADSL Modem..."
-
-start-stop-daemon --stop --pidfile /var/run/ppp0.pid pppd
-
-eend $? "Failed to stop 'pppd'."
-}
diff --git a/net-dialup/speedtouch/speedtouch-1.1.ebuild b/net-dialup/speedtouch/speedtouch-1.1.ebuild
deleted file mode 100644
index d1cc22531ec5..000000000000
--- a/net-dialup/speedtouch/speedtouch-1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.1.ebuild,v 1.11 2004/07/14 23:11:58 agriffis Exp $
-
-DESCRIPTION="GPL Driver for the Alcatel Speedtouch USB under *nix"
-HOMEPAGE="http://speedtouch.sf.net/"
-SRC_URI="mirror://sourceforge/speedtouch/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~alpha ~hppa amd64"
-IUSE="debug static"
-
-DEPEND=""
-RDEPEND=">=net-dialup/ppp-2.4.1"
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-debug"
-	use static && myconf="${myconf} --enable-static"
-
-	sed 's/^C$/#&/' < configure > configure.new
-	mv --force configure.new configure && chmod u+x configure
-
-	econf 	--enable-syslog  \
-		${myconf} || die "./configure failed"
-
-	sed '90,104d' < Makefile > Makefile.new
-	mv --force Makefile.new Makefile
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die
-
-	echo $(find ${D}/usr/share/doc/speedtouch/ -type f) | xargs dodoc
-	rm -rf ${D}/usr/share/doc/speedtouch/
-	dodoc AUTHORS COPYING ChangeLog INSTALL TODO VERSION
-	rm -r ${D}/etc/init.d/speedtouch
-	exeinto /etc/init.d ; newexe ${FILESDIR}/speedtouch.rc6 speedtouch
-	insinto /etc/conf.d ; newins ${FILESDIR}/speedtouch.confd speedtouch
-	insopts -m 600 ; insinto /etc/ppp/peers ; doins ${FILESDIR}/adsl.sample
-}
-
-pkg_postinst() {
-	echo ""
-	ewarn "Make sure you have kernel support for USB, HDCL and PPP"
-	ewarn "NB: kernels >= 2.4.18 include the hdlc patch"
-	echo ""
-	ewarn "Read and subscribe vendor's licence to download the microcode"
-	ewarn "You can get it from: "
-	ewarn "  1) vendor's site: http://www.speedtouchdsl.com/dvrreg_lx.htm"
-	ewarn "  2) a windows system: c:\windows\system\alcaudsl.sys"
-	ewarn "  3) the CD provided: X:\Driver\alcaudsl.sys"
-	ewarn "Then you should set its path in the /etc/conf.d/speedtouch file"
-	ewarn "edit and rename 'adsl.sample' to 'adsl' in /etc/ppp/peers/adsl and"
-	ewarn "bring up your adsl line using the /etc/init.d/speedtouch script"
-	echo ""
-	einfo "More info in the documentation in /usr/share/doc/${P}"
-	echo ""
-}
diff --git a/net-dialup/speedtouch/speedtouch-1.2.ebuild b/net-dialup/speedtouch/speedtouch-1.2.ebuild
deleted file mode 100644
index 097da8c914b5..000000000000
--- a/net-dialup/speedtouch/speedtouch-1.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.2.ebuild,v 1.4 2004/06/24 22:32:55 agriffis Exp $
-
-inherit flag-o-matic
-filter-flags -mpowerpc-gfxopt -mpowerpc-gpopt
-
-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"
-
-IUSE="static debug"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~hppa amd64"
-
-DEPEND=""
-RDEPEND=">=net-dialup/ppp-2.4.1"
-
-src_compile() {
-	use debug && myconf="--enable-debug"
-	use static && myconf="${myconf} --enable-static"
-
-	econf --enable-syslog  \
-		${myconf} || die "./configure failed"
-
-	emake || die "make failed"
-}
-
-src_install () {
-	einstall || die
-
-	# twp 2003-12-25 install *.html correctly
-	find ${D}/usr/share/doc/speedtouch/ -type f -name '*.html' | xargs dohtml
-	find ${D}/usr/share/doc/speedtouch/ -type f -name '*.html' | xargs rm
-	echo $(find ${D}/usr/share/doc/speedtouch/ -type f) | xargs dodoc
-	rm -rf ${D}/usr/share/doc/speedtouch/
-	dodoc AUTHORS COPYING ChangeLog INSTALL TODO VERSION
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/speedtouch.rc6 speedtouch
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/speedtouch.confd speedtouch
-
-	insopts -m 600 ; insinto /etc/ppp/peers ; doins ${FILESDIR}/adsl.sample
-
-	dosbin doc-linux/adsl-conf-pppd
-}
-
-pkg_postinst() {
-	echo ""
-	ewarn "Make sure you have kernel support for USB, HDCL and PPP"
-	ewarn "NB: kernels >= 2.4.18 include the hdlc patch"
-	echo ""
-	ewarn "Read and subscribe vendor's licence to download the microcode"
-	ewarn "You can get it from: "
-	ewarn "  1) vendor's site: http://www.speedtouchdsl.com/dvrreg_lx.htm"
-	ewarn "  2) a windows system: c:\windows\system\alcaudsl.sys"
-	ewarn "  3) the CD provided: X:\Driver\alcaudsl.sys"
-	ewarn "Then you should set its path in the /etc/conf.d/speedtouch file"
-	ewarn "edit and rename 'adsl.sample' to 'adsl' in /etc/ppp/peers/adsl and"
-	ewarn "bring up your adsl line using the /etc/init.d/speedtouch script"
-	echo ""
-	einfo "More info in the documentation in /usr/share/doc/${P}"
-	echo ""
-	einfo "You need to pass -a /usr/share/speedtouch/boot.v123.bin to"
-	einfo "modem_run with this version. The URL for firmware is:"
-	einfo "http://www.speedtouchdsl.com/driver_upgrade_lx_3.0.1.2.htm"
-	echo ""
-}
diff --git a/net-dialup/speedtouch/speedtouch-1.2_beta2.ebuild b/net-dialup/speedtouch/speedtouch-1.2_beta2.ebuild
deleted file mode 100644
index 64d38f328fa7..000000000000
--- a/net-dialup/speedtouch/speedtouch-1.2_beta2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.2_beta2.ebuild,v 1.5 2004/06/24 22:32:55 agriffis Exp $
-
-inherit flag-o-matic
-filter-flags -mpowerpc-gfxopt -mpowerpc-gpopt
-
-
-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"
-
-IUSE="static debug"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc alpha hppa amd64"
-
-DEPEND=""
-RDEPEND=">=net-dialup/ppp-2.4.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed 's/^C$/#&/' < configure > configure.new
-	mv -f configure.new configure && chmod u+x configure
-
-
-}
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-debug"
-	use static && myconf="${myconf} --enable-static"
-
-	econf 	--enable-syslog  \
-		${myconf} || die "./configure failed"
-
-	#sed '90,104d' < Makefile > Makefile.new
-	#mv --force Makefile.new Makefile
-	emake || die "make failed"
-}
-
-src_install () {
-	einstall || die
-
-	echo $(find ${D}/usr/share/doc/speedtouch/ -type f) | xargs dodoc
-	rm -rf ${D}/usr/share/doc/speedtouch/
-	dodoc AUTHORS COPYING ChangeLog INSTALL TODO VERSION
-	#	rm -r ${D}/etc/init.d/speedtouch
-	exeinto /etc/init.d ; newexe ${FILESDIR}/speedtouch.rc6 speedtouch
-	insinto /etc/conf.d ; newins ${FILESDIR}/speedtouch.confd speedtouch
-	insopts -m 600 ; insinto /etc/ppp/peers ; doins ${FILESDIR}/adsl.sample
-}
-
-pkg_postinst() {
-	echo ""
-	ewarn "Make sure you have kernel support for USB, HDCL and PPP"
-	ewarn "NB: kernels >= 2.4.18 include the hdlc patch"
-	echo ""
-	ewarn "Read and subscribe vendor's licence to download the microcode"
-	ewarn "You can get it from: "
-	ewarn "  1) vendor's site: http://www.speedtouchdsl.com/dvrreg_lx.htm"
-	ewarn "  2) a windows system: c:\windows\system\alcaudsl.sys"
-	ewarn "  3) the CD provided: X:\Driver\alcaudsl.sys"
-	ewarn "Then you should set its path in the /etc/conf.d/speedtouch file"
-	ewarn "edit and rename 'adsl.sample' to 'adsl' in /etc/ppp/peers/adsl and"
-	ewarn "bring up your adsl line using the /etc/init.d/speedtouch script"
-	echo ""
-	einfo "More info in the documentation in /usr/share/doc/${P}"
-	echo ""
-}
diff --git a/net-dialup/speedtouch/speedtouch-1.3.1.ebuild b/net-dialup/speedtouch/speedtouch-1.3.1-r1.ebuild
index 0bf2a7b24843..b7605056a627 100644
--- a/net-dialup/speedtouch/speedtouch-1.3.1.ebuild
+++ b/net-dialup/speedtouch/speedtouch-1.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.4 2004/11/02 10:46:08 blubb Exp $
+# $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 $
 
 inherit flag-o-matic
 
@@ -18,6 +18,14 @@ IUSE="static debug"
 DEPEND=""
 RDEPEND=">=net-dialup/ppp-2.4.1"
 
+pkg_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
+}
+
 src_compile() {
 	local myconf=
 	use debug && myconf="--enable-debug"