Remove obsolete revision. Remove useless debug useflag (#191118).

(Portage version: 2.1.2.12)

6 files changed, 39 insertions, 180 deletions

diff --git a/net-dialup/speedtouch/ChangeLog b/net-dialup/speedtouch/ChangeLog
index 02ce98ba9a67..1170e22c953f 100644
--- a/net-dialup/speedtouch/ChangeLog
+++ b/net-dialup/speedtouch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/speedtouch
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.38 2007/09/03 05:29:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/ChangeLog,v 1.39 2007/09/03 17:51:40 mrness Exp $
+
+  03 Sep 2007; Alin Năstac <mrness@gentoo.org>
+  +files/speedtouch-1.3.1-debug.patch, -files/speedtouch.rc7,
+  -speedtouch-1.3.1-r2.ebuild, speedtouch-1.3.1-r3.ebuild:
+  Remove obsolete revision. Remove useless debug useflag (#191118).
 
   03 Sep 2007; Jeroen Roovers <jer@gentoo.org> speedtouch-1.3.1-r3.ebuild:
   Stable for HPPA (bug #185747).
diff --git a/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r2 b/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r2
deleted file mode 100644
index adf70aa30fd8..000000000000
--- a/net-dialup/speedtouch/files/digest-speedtouch-1.3.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0848a120ae0eeab6c8ab378e11dc4fa2 speedtouch-1.3.1.tar.bz2 197709
-RMD160 88e64bb415db535078915d10684262b5e57f55dc speedtouch-1.3.1.tar.bz2 197709
-SHA256 0e42203af9252fab2d3e5610d80d6ad72ce18cd2b62454299ab34b9ab71c0dd8 speedtouch-1.3.1.tar.bz2 197709
diff --git a/net-dialup/speedtouch/files/speedtouch-1.3.1-debug.patch b/net-dialup/speedtouch/files/speedtouch-1.3.1-debug.patch
new file mode 100644
index 000000000000..243f2b6a4df7
--- /dev/null
+++ b/net-dialup/speedtouch/files/speedtouch-1.3.1-debug.patch
@@ -0,0 +1,19 @@
+diff -Nru speedtouch-1.3.1.orig/configure.in speedtouch-1.3.1/configure.in
+--- speedtouch-1.3.1.orig/configure.in	2004-09-29 23:56:31.000000000 +0300
++++ speedtouch-1.3.1/configure.in	2007-09-03 08:42:29.000000000 +0300
+@@ -33,15 +33,10 @@
+ # --sysconfdir='${prefix}/etc' is considered the system default
+ test "x$sysconfdir" = 'x${prefix}/etc' && sysconfdir="/etc"
+ 
+-CFLAGS=`echo $CFLAGS | sed s/"-g"/""/g`
+-
+ dnl User options
+ AC_ARG_ENABLE(release,[  --enable-release	  set the compiler flags to -O6],
+ 	CFLAGS="-O6")
+ 
+-AC_ARG_ENABLE(debug,[  --enable-debug	  set the compiler flags to -g],[
+-	CFLAGS="-g"; debug_flags="-DDEBUG"])
+-
+ AC_ARG_ENABLE(syslog,[  --enable-syslog	  log messages via syslog],
+ 	syslog_flags="-DUSE_SYSLOG")
+ 
diff --git a/net-dialup/speedtouch/files/speedtouch.rc7 b/net-dialup/speedtouch/files/speedtouch.rc7
deleted file mode 100644
index 4743e6b0ade2..000000000000
--- a/net-dialup/speedtouch/files/speedtouch.rc7
+++ /dev/null
@@ -1,67 +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.rc7,v 1.2 2004/09/28 01:23:20 swegener Exp $
-
-depend() {
-	need localmount modules
-}
-
-start() {
-	ebegin "Starting Speedtouch ADSL Modem..."
-
-	ps -e | grep -q modem_run
-	if [ $? -eq 0 ]; then
-		einfo "Firmware already loaded, skipping load"
-	else
-
-		einfo "Loading firmware..."
-
-		if [ -z "${MICROCODE}" ]; then
-			eend 1 "Please define \$MICROCODE in /etc/conf.d/speedtouch"
-			return 1
-		fi
-		if [ ! -f ${MICROCODE} ]; then
-			eend 1 "Failed to find the microcode."
-			return 1
-		fi
-		# usbdevfs is up ?
-		if [ ! -f /proc/bus/usb/devices ]; then
-			eend 1 "usbdevfs not mounted"
-			return 1
-		fi
-
-		modem_run -v $VERBOSE $MODEM_RUN_EXTRAOPTS -f $MICROCODE
-		if [ $? -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'"
-			eend 1 "Speedtouch firmward load failed"
-			return 1 
-		fi
-
-		
-		einfo "Speedtouch firmware loaded"
-		eend 0
-	fi
-
-	if [ ! -f "/etc/ppp/peers/$PEER" ]; then
-		eend 1 "Failed to find peer configuration"
-		return 1
-	fi
-
-	einfo "Launching the PPP daemon..."
-	rm -f /var/run/pppoa*.pid
-	start-stop-daemon --start \
-		--exec /usr/sbin/pppd call $PEER &>/dev/null
-
-	eend $? "Failed to start the PPP daemon"
-}
-
-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.3.1-r2.ebuild b/net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild
deleted file mode 100644
index 71185035c9c7..000000000000
--- a/net-dialup/speedtouch/speedtouch-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2007 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-r2.ebuild,v 1.10 2007/05/06 08:15:00 genone Exp $
-
-inherit flag-o-matic eutils
-
-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="alpha amd64 hppa ~ppc x86"
-IUSE="static debug"
-
-RDEPEND=">=net-dialup/ppp-2.4.1
-	!net-dialup/speedtouch-usb"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	# Patch to fix gcc-4.* compile error (bug #99759)
-	epatch ${FILESDIR}/${P}-gcc4.patch
-
-	#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/' ${S}/src/atm.c
-}
-
-src_compile() {
-	local myconf=
-	use debug && myconf="--enable-debug"
-	use static && myconf="${myconf} --enable-static"
-
-	filter-flags -mpowerpc-gfxopt -mpowerpc-gpopt
-	econf \
-		--enable-syslog \
-		${myconf} || die "./configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	einstall || die
-
-	# twp 2003-12-25 install *.html correctly
-	dohtml $(find "${D}/usr/share/doc/speedtouch/" -type f -name '*.html')
-	rm $(find "${D}/usr/share/doc/speedtouch/" -type f -name '*.html')
-	dodoc $(find "${D}/usr/share/doc/speedtouch/" -type f)
-	rm -rf "${D}/usr/share/doc/speedtouch/"
-	dodoc AUTHORS ChangeLog TODO VERSION
-
-	rm -rf ${D}/usr/bin
-	rm -rf ${D}/usr/share/man/man1
-
-	newinitd ${FILESDIR}/speedtouch.rc7 speedtouch
-	newconfd ${FILESDIR}/speedtouch.confd speedtouch
-
-	insopts -m 600 ; insinto /etc/ppp/peers ; doins ${FILESDIR}/adsl.sample
-
-	dosbin doc-linux/adsl-conf-pppd
-
-	#allows hotplug to modprobe the speedtch module automatically
-	mv ${D}/etc/hotplug/usb/speedtouch.usermap ${D}/etc/hotplug/usb/speedtch.usermap
-	exeinto /etc/hotplug/usb ; newexe ${FILESDIR}/speedtch-hotplug speedtch
-	rm ${D}/etc/hotplug/usb/speedtouch
-}
-
-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"
-	ewarn
-	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"
-	ewarn
-	elog "More info in the documentation in /usr/share/doc/${PF}"
-	elog
-	elog "You need to pass -a /usr/share/speedtouch/boot.v123.bin to"
-	elog "modem_run with this version. The URL for firmware is:"
-	elog "http://www.speedtouchdsl.com/driver_upgrade_lx_3.0.1.2.htm"
-	elog
-	ewarn "This driver is obsoleted by the kernel-space driver, available"
-	ewarn "in >=2.6.10 kernels. The firmware and installation instructions"
-	ewarn "for this driver are available through net-dialup/speedtouch-usb."
-	echo
-}
diff --git a/net-dialup/speedtouch/speedtouch-1.3.1-r3.ebuild b/net-dialup/speedtouch/speedtouch-1.3.1-r3.ebuild
index af6a6e596fad..2295a125b6af 100644
--- a/net-dialup/speedtouch/speedtouch-1.3.1-r3.ebuild
+++ b/net-dialup/speedtouch/speedtouch-1.3.1-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 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-r3.ebuild,v 1.9 2007/09/03 05:29:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/speedtouch/speedtouch-1.3.1-r3.ebuild,v 1.10 2007/09/03 17:51:40 mrness Exp $
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils autotools
 
 MY_P=${P/_/-}
 
@@ -13,8 +13,9 @@ SRC_URI="mirror://sourceforge/speedtouch/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ~ppc x86"
-IUSE="static debug"
+IUSE="static"
 
+DEPEND=""
 RDEPEND=">=net-dialup/ppp-2.4.1
 	!net-dialup/speedtouch-usb"
 
@@ -23,23 +24,24 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 
-	# Patch to fix gcc-4.* compile error (bug #99759)
+	# Patch to fix gcc-4.* compile error (bug 99759)
 	epatch "${FILESDIR}/${P}-gcc4.patch"
 
-	#Increase minlevel of reports in atm.c
-	#At least one of the reports could affect performance due to call frequency
+	# 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/' "${S}/src/atm.c"
+
+	# Remove stupid --enable debug option (bug 191118)
+	epatch "${FILESDIR}/${P}-debug.patch"
+	cd "${S}"
+	eautoreconf
 }
 
 src_compile() {
-	local myconf=
-	use debug && myconf="--enable-debug"
-	use static && myconf="${myconf} --enable-static"
-
 	filter-flags -mpowerpc-gfxopt -mpowerpc-gpopt
 	econf \
 		--enable-syslog \
-		${myconf} || die "./configure failed"
+		$(use_enable static) || die "./configure failed"
 
 	emake || die "make failed"
 }
@@ -64,7 +66,7 @@ src_install() {
 
 	dosbin doc-linux/adsl-conf-pppd
 
-	#allows hotplug to modprobe the speedtch module automatically
+	# allows hotplug to modprobe the speedtch module automatically
 	mv "${D}"/etc/hotplug/usb/speedtouch.usermap "${D}"/etc/hotplug/usb/speedtch.usermap
 	exeinto /etc/hotplug/usb ; newexe "${FILESDIR}/speedtch-hotplug" speedtch
 	rm "${D}"/etc/hotplug/usb/speedtouch