Cleaning house.

8 files changed, 8 insertions, 212 deletions

diff --git a/net-dialup/speedtouch/ChangeLog b/net-dialup/speedtouch/ChangeLog
index bbdd06e27d13..fe5438e8855d 100644
--- a/net-dialup/speedtouch/ChangeLog
+++ b/net-dialup/speedtouch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/speedtouch
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.14 2004/04/14 02:27:05 steel300 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.15 2004/04/14 02:35:53 steel300 Exp $
+
+*speedtouch-1.2_beta1-r1 (13 Apr 2004)
+
+  13 Apr 2004; <coxj@gentoo.org> speedtouch-1.2_beta1-r1.ebuild,
+  speedtouch-1.2_beta3-r1.ebuild, speedtouch-1.2_beta3-r2.ebuild:
+  Cleaning house.
 
 *speedtouch-1.2 (13 Apr 2004)
 
diff --git a/net-dialup/speedtouch/Manifest b/net-dialup/speedtouch/Manifest
index 202b1971052b..55d504d14dd0 100644
--- a/net-dialup/speedtouch/Manifest
+++ b/net-dialup/speedtouch/Manifest
@@ -1,16 +1,10 @@
 MD5 e0e1438bb03cd8cd4e85cae98998ab88 speedtouch-1.2.ebuild 2431
 MD5 d9c8849cae242068d01a8eb056d3d2f1 speedtouch-1.2_beta2.ebuild 2280
-MD5 d6cb75f836823289e9672f65ed3be0e4 speedtouch-1.2_beta1-r1.ebuild 2238
-MD5 191be35facd23aa16a5b5c09bee9694a speedtouch-1.2_beta3-r2.ebuild 2227
 MD5 82b7f4357577518d94c77ea454c01d71 speedtouch-1.1.ebuild 2098
-MD5 ecf3f3d2446815d588e5be27c9a81823 ChangeLog 2166
+MD5 c47b9e548f72b5cfd40b6bf962a261cf ChangeLog 2356
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 d99b11bfd69084b2126150b5c24b998d speedtouch-1.2_beta3-r1.ebuild 2041
 MD5 1ddbfd36c7d2e58244506161aa88e587 files/speedtouch.rc6 2346
 MD5 3e693de9c41b36042a0791eee733ca44 files/speedtouch.confd 578
-MD5 95f539c58595e5274cd5a8f57873d497 files/digest-speedtouch-1.2_beta1-r1 73
-MD5 5ab228b414732bb2f3c022f70577524c files/digest-speedtouch-1.2_beta3-r1 73
-MD5 5ab228b414732bb2f3c022f70577524c files/digest-speedtouch-1.2_beta3-r2 73
 MD5 c622ee14e155b3897e6a069306d1c88b files/digest-speedtouch-1.1 67
 MD5 da45576edbdb9ba3d5d9b0043cd4777b files/digest-speedtouch-1.2 67
 MD5 cdf60c2b5a982947a9fc9c420bad10e8 files/adsl.sample 606
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta1-r1 b/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta1-r1
deleted file mode 100644
index 6264e90614b1..000000000000
--- a/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a59dc82461ab170e1a55d08461bd895a speedtouch-1.2-beta1.tar.bz2 168793
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta3-r1 b/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta3-r1
deleted file mode 100644
index 3a6531025aea..000000000000
--- a/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33d9a6afe54d9e89c6c32e4443d5a2d8 speedtouch-1.2-beta3.tar.bz2 179894
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta3-r2 b/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta3-r2
deleted file mode 100644
index 3a6531025aea..000000000000
--- a/net-dialup/speedtouch/files/digest-speedtouch-1.2_beta3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33d9a6afe54d9e89c6c32e4443d5a2d8 speedtouch-1.2-beta3.tar.bz2 179894
diff --git a/net-dialup/speedtouch/speedtouch-1.2_beta1-r1.ebuild b/net-dialup/speedtouch/speedtouch-1.2_beta1-r1.ebuild
deleted file mode 100644
index bce5c0a5f5df..000000000000
--- a/net-dialup/speedtouch/speedtouch-1.2_beta1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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_beta1-r1.ebuild,v 1.1 2003/08/08 16:20:18 zhen Exp $
-
-inherit flag-o-matic
-filter-flags -mpowerpc-gfxopt -mpowerpc-gpopt
-
-MY_P=${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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~alpha hppa amd64"
-IUSE="debug static"
-
-DEPEND=""
-RDEPEND=">=net-dialup/ppp-2.4.1"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	local myconf
-
-	[ `use debug` ] && myconf="--enable-debug"
-	[ `use static` ] && myconf="${myconf} --enable-static"
-
-	sed 's/^C$/#&/' < configure > configure.new
-	mv -f 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_beta3-r1.ebuild b/net-dialup/speedtouch/speedtouch-1.2_beta3-r1.ebuild
deleted file mode 100644
index b32e2fcc13f7..000000000000
--- a/net-dialup/speedtouch/speedtouch-1.2_beta3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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-r1.ebuild,v 1.1 2003/12/23 11:54:29 lanius 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
-
-	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 ""
-}
diff --git a/net-dialup/speedtouch/speedtouch-1.2_beta3-r2.ebuild b/net-dialup/speedtouch/speedtouch-1.2_beta3-r2.ebuild
deleted file mode 100644
index c502fc625532..000000000000
--- a/net-dialup/speedtouch/speedtouch-1.2_beta3-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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 ""
-}