Install html correctly, add MODEM_RUN_EXTRAOPTS

6 files changed, 80 insertions, 7 deletions

diff --git a/net-dialup/speedtouch/ChangeLog b/net-dialup/speedtouch/ChangeLog
index 5161f598280c..da3c544cb54f 100644
--- a/net-dialup/speedtouch/ChangeLog
+++ b/net-dialup/speedtouch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-dialup/speedtouch
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.12 2003/12/23 11:54:29 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.13 2003/12/25 16:53:18 twp Exp $
+
+  25 Dec 2003; Tom Payne <twp@gentoo.org> speedtouch-1.2_beta3-r2.ebuild :
+  Install *.html correctly. Add MODEM_RUN_EXTRAOPTS to conf.d and init.d scripts.
 
 *speedtouch-1.2_beta3 (23 Dec 2003)
 
diff --git a/net-dialup/speedtouch/Manifest b/net-dialup/speedtouch/Manifest
index 25c0972119a9..b61c4c8507ea 100644
--- a/net-dialup/speedtouch/Manifest
+++ b/net-dialup/speedtouch/Manifest
@@ -1,16 +1,13 @@
-MD5 025120b86124084b3ab11c23a1203f2a ChangeLog 1902
+MD5 eca90e1b2fa590d07243f8cef2f4950f ChangeLog 2057
 MD5 82b7f4357577518d94c77ea454c01d71 speedtouch-1.1.ebuild 2098
-MD5 04502d57af6a22324a2569b9de56a3f2 speedtouch-1.2_beta3-r2.ebuild 2230
+MD5 191be35facd23aa16a5b5c09bee9694a speedtouch-1.2_beta3-r2.ebuild 2227
 MD5 d6cb75f836823289e9672f65ed3be0e4 speedtouch-1.2_beta1-r1.ebuild 2238
 MD5 d9c8849cae242068d01a8eb056d3d2f1 speedtouch-1.2_beta2.ebuild 2280
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 d99b11bfd69084b2126150b5c24b998d speedtouch-1.2_beta3-r1.ebuild 2041
-MD5 5f975b3ffe3a8d00a40dbd13aa9f2386 .speedtouch-1.2_beta3-r2.ebuild.swp 12288
 MD5 9ccd851394c18f9aec6c974d10f9ad32 files/speedtouch.confd 468
 MD5 5b5027245babfea9e7dfaee4a1a82af9 files/adsl.sample 501
 MD5 c622ee14e155b3897e6a069306d1c88b files/digest-speedtouch-1.1 67
-MD5 23a8befa92ce00fe4815898a9d1225ba files/.speedtouch.confd.swp 12288
-MD5 a44bcae51e8248589608a7fc8a3b1fdb files/.speedtouch.rc6.swp 12288
 MD5 559b0512f384b53eb6177e8ba7495639 files/speedtouch.rc6 2238
 MD5 95f539c58595e5274cd5a8f57873d497 files/digest-speedtouch-1.2_beta1-r1 73
 MD5 b1033785b6ac1ed25eb1c9dfdf95e379 files/digest-speedtouch-1.2_beta2 73
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta3-r2 b/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta3-r2
new file mode 100644
index 000000000000..3a6531025aea
--- /dev/null
+++ b/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta3-r2
@@ -0,0 +1 @@
+MD5 33d9a6afe54d9e89c6c32e4443d5a2d8 speedtouch-1.2-beta3.tar.bz2 179894
diff --git a/net-dialup/speedtouch/files/speedtouch.confd b/net-dialup/speedtouch/files/speedtouch.confd
index cfede61a352e..62a94f0f1329 100644
--- a/net-dialup/speedtouch/files/speedtouch.confd
+++ b/net-dialup/speedtouch/files/speedtouch.confd
@@ -12,3 +12,7 @@ VERBOSE="0"
 # Set the peer filename
 # This should be in /etc/ppp/peers/
 PEER="adsl"
+
+# Extra options to modem_run
+# Some modems will need -s, if in doubt then leave blank
+#MODEM_RUN_EXTRAOPTS="-s"
diff --git a/net-dialup/speedtouch/files/speedtouch.rc6 b/net-dialup/speedtouch/files/speedtouch.rc6
index 6666e8112381..fbf103ce5f37 100644
--- a/net-dialup/speedtouch/files/speedtouch.rc6
+++ b/net-dialup/speedtouch/files/speedtouch.rc6
@@ -21,7 +21,7 @@ check_modem_run() {
 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 -f $MICROCODE
+( ps -e | grep -q modem_run ) || $MODEM_RUN -v $VERBOSE -m $MODEM_RUN_EXTRAOPTS -f $MICROCODE
 RETURNED=$?
 
 sleep 1
diff --git a/net-dialup/speedtouch/speedtouch-1.2_beta3-r2.ebuild b/net-dialup/speedtouch/speedtouch-1.2_beta3-r2.ebuild
new file mode 100644
index 000000000000..c502fc625532
--- /dev/null
+++ b/net-dialup/speedtouch/speedtouch-1.2_beta3-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/speedtouch-1.2_beta3-r2.ebuild,v 1.1 2003/12/25 16:53:18 twp 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 ""
+}