2.9.9d x86 stable, removing old versions.

(Portage version: 1.589-cvs)

8 files changed, 9 insertions, 315 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 914a056cdfde..41592acaa31e 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.45 2005/06/12 07:41:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.46 2005/06/14 16:41:23 genstef Exp $
+
+  14 Jun 2005; Stefan Schweizer <genstef@gentoo.org>
+  -files/slmodem-2.9.9a-alsa.patch,
+  -files/slmodem-usb_endpoint_halted-gentoo.patch,
+  -slmodem-2.9.9a-r2.ebuild, -slmodem-2.9.9b.ebuild, slmodem-2.9.9d.ebuild:
+  2.9.9d x86 stable, removing old versions.
 
   12 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
   Remove myself from metadata since my laptop is broken.
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9a-r2 b/net-dialup/slmodem/files/digest-slmodem-2.9.9a-r2
deleted file mode 100644
index e1578e200497..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.9a-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2330415f6b60b4eb4593592abb09da7b slmodem-2.9.9a.tar.gz 709728
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9b b/net-dialup/slmodem/files/digest-slmodem-2.9.9b
deleted file mode 100644
index 4ece36c078b4..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.9b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b9a5af9713e85717d3574264ade14d0 slmodem-2.9.9b.tar.gz 710319
diff --git a/net-dialup/slmodem/files/slmodem-2.9.9a-alsa.patch b/net-dialup/slmodem/files/slmodem-2.9.9a-alsa.patch
deleted file mode 100644
index c46398f5cb0e..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.9a-alsa.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From Jos Delbar <jos.delbar@ugent.be>
-Written and posted to gentoo bugzilla before 2.9.10 was released
-http://bugs.gentoo.org/60676
-
---- slmodem-2.9.9a/modem/modem_cmdline.c	2005-01-19 14:34:16.009578193 +0100
-+++ slmodem-2.9.9a-fixed/modem/modem_cmdline.c	2005-01-19 14:36:57.987589517 +0100
-@@ -103,7 +103,7 @@
- 	{'v',"version","show version and exit"},
- 	{'c',"country","default modem country name",MANDATORY,STRING,"USA"},
- 	{ 0 ,"countrylist","show list of supported countries"},
--	{'a',"alsa","ALSA mode (see README for howto)"},
-+	{'a',"alsa","ALSA mode (see README for howto)",OPTIONAL,STRING,"hw:1"},
- 	{'g',"group","Modem TTY group",MANDATORY,STRING,"uucp"},
- 	{'p',"perm","Modem TTY permission",MANDATORY,INTEGER,"0660"},
- 	{'n',"nortpriority","run with regular priority"},
-@@ -237,7 +237,7 @@
- 		PR_INFO("ALSA support is not compiled in (see README for howto).\n");
- 		exit(1);
- #endif
--		modem_dev_name = modem_alsa_dev_name;
-+		modem_dev_name = opt_list[OPT_ALSA].arg_val;
- 		use_alsa = 1;
- 	}
- 	if(opt_list[OPT_GROUP].found)
diff --git a/net-dialup/slmodem/files/slmodem-usb_endpoint_halted-gentoo.patch b/net-dialup/slmodem/files/slmodem-usb_endpoint_halted-gentoo.patch
deleted file mode 100644
index 23ce7001b04d..000000000000
--- a/net-dialup/slmodem/files/slmodem-usb_endpoint_halted-gentoo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u slmodem-2.9.10.orig/drivers/st7554.c slmodem-2.9.10/drivers/st7554.c
---- slmodem-2.9.10.orig/drivers/st7554.c	2004-12-10 14:22:05.017025448 +0100
-+++ slmodem-2.9.10/drivers/st7554.c	2004-12-10 14:22:48.679387760 +0100
-@@ -1080,11 +1080,14 @@
- 
- #define SET_REG(s,reg,val) { ret = s->set_reg(s,reg,val); if (ret < 0) { USB_ERR("st7554: failed to set reg %x.\n", reg); ; return ret;} }
- 
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8))
-+#define CLEAR_ENDPOINT(s,pipe)
-+#else
- #define CLEAR_ENDPOINT(s,pipe) { \
-      if (usb_endpoint_halted(s->usbdev, usb_pipeendpoint(pipe), usb_pipeout(pipe))) {   \
-        USB_DBG("st7554_init: pipe %d is halted. clear...\n", usb_pipeendpoint(pipe));  \
-        if (!(ret=usb_clear_halt(s->usbdev, pipe))) return ret;}}
--
-+#endif
- 
- 
- static int st7554_init  (struct st7554_state *s)
diff --git a/net-dialup/slmodem/slmodem-2.9.9a-r2.ebuild b/net-dialup/slmodem/slmodem-2.9.9a-r2.ebuild
deleted file mode 100644
index aef800f2c70d..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.9a-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9a-r2.ebuild,v 1.2 2005/01/28 14:20:04 genstef Exp $
-
-inherit eutils linux-mod
-
-DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
-SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P}.tar.gz"
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="x86 -*"
-IUSE="alsa usb"
-
-DEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )
-	>=sys-apps/sed-4"
-
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )"
-
-pkg_setup() {
-	MODULE_NAMES="slamr(extra:${S}/drivers)"
-	useq usb && MODULE_NAMES="${MODULE_NAMES} slusb(extra:${S}/drivers)"
-	BUILD_TARGETS="all"
-
-	local CONFIG_CHECK=""
-	if useq usb; then
-		CONFIG_CHECK="${CONFIG_CHECK} USB"
-	fi
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-usb_endpoint_halted-gentoo.patch || die "failed to apply usb_endpoint patch"
-	epatch ${FILESDIR}/${P}-alsa.patch || die "failed to apply alsa patch"
-
-	convert_to_m drivers/Makefile
-}
-
-src_compile() {
-	local MAKE_PARAMS=""
-	if useq alsa; then
-		MAKE_PARAMS="SUPPORT_ALSA=1"
-	fi
-	emake ${MAKE_PARAMS} modem || die "failed to build modem"
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd ${S}
-	newsbin modem/modem_test slmodem_test
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /var/lib/slmodem
-	keepdir /var/lib/slmodem
-
-	dodoc COPYING Changes README
-
-	# Install /etc/{devfs,modules,init,conf}.d/slmodem files
-	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
-	insopts -m0755; insinto /etc/init.d/; newins ${FILESDIR}/${PN}-2.9.init ${PN}
-	sed -i -e "s/ALSACONF//g" -e "s/PCICONF//g" -e "s/USBCONF//g" ${D}/etc/conf.d/slmodem
-
-	# Make some devices if we aren't using devfs
-	# If we are using devfs, restart it
-	if [ -e ${ROOT}/dev/.devfsd ] ; then
-		# devfs
-		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
-	elif [ -e ${ROOT}/dev/.udev ] ; then
-		# udev
-		# check Symlink
-		dodir /etc/udev/rules.d/
-		echo 'KERNEL="slamr", NAME="slamr0"' > \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-		echo 'KERNEL="slusb", NAME="slusb0"' >> \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-		dodir /etc/udev/permissions.d
-		echo 'slamr*:root:dialout:0660' > \
-			${D}/etc/udev/permissions.d/55-${PN}.permissions
-	fi
-
-	#Create device nodes, add module aliases and install hotplug script
-	make -C drivers DESTDIR=${D} KERNEL_DIR="${ROOT}/usr/src/linux" install-devices
-	insinto /etc/modules.d/; insopts -m0644; newins ${FILESDIR}/${PN}-2.9.modules ${PN}
-	useq usb &&
-		( insinto /etc/hotplug/usb; insopts -m0755; newins ${FILESDIR}/slusb.hotplug slusb )
-
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/55-${PN}
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs
-	# If we are using devfs, restart it
-	if [ -e ${ROOT}/dev/.devfsd ]; then
-		ebegin "Restarting devfsd to reread devfs rules"
-			killall -HUP devfsd
-		eend $?
-
-	elif [ -e ${ROOT}/dev/.udev ]; then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend $?
-	fi
-
-	if [ ! -e ${ROOT}/dev/ppp ]; then
-		mknod ${ROOT}/dev/ppp c 108 0
-	fi
-
-	ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist"
-	einfo "You must edit /etc/conf.d/${PN} for your configuration"
-	einfo "To add slmodem to your startup - type : rc-update add slmodem default"
-
-	if use alsa; then
-		einfo "I hope you have already added alsa to your startup: "
-		einfo "otherwise type: rc-update add alsasound boot"
-		einfo
-		einfo "If you need to use snd-intel8x0m from the kernel"
-		einfo "compile it as a module and edit /etc/module.d/alsa"
-		einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
-	fi
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.9b.ebuild b/net-dialup/slmodem/slmodem-2.9.9b.ebuild
deleted file mode 100644
index 2d40adffb561..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.9b.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9b.ebuild,v 1.3 2005/05/29 12:35:33 mrness Exp $
-
-inherit eutils linux-mod
-
-DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
-SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P}.tar.gz"
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="~x86 -*"
-IUSE="alsa usb"
-
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	MODULE_NAMES="slamr(net:${S}/drivers)"
-	if useq usb; then
-		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
-		CONFIG_CHECK="USB"
-	fi
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-	BUILD_TARGETS="all"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.9.9a-alsa.patch
-	epatch ${FILESDIR}/${PN}-2.9.9b-gcc4.patch
-
-	convert_to_m drivers/Makefile
-}
-
-src_compile() {
-	local MAKE_PARAMS=""
-	if useq alsa; then
-		MAKE_PARAMS="SUPPORT_ALSA=1"
-	fi
-	emake ${MAKE_PARAMS} modem || die "failed to build modem"
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd ${S}
-	newsbin modem/modem_test slmodem_test
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /var/lib/slmodem
-	keepdir /var/lib/slmodem
-
-	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
-	exeinto /etc/init.d/; newexe ${FILESDIR}/${PN}-2.9.init ${PN}
-
-	# configure for alsa - or not for alsa
-	if useq alsa; then
-		sed -i -e "s/# MODULE=alsa/MODULE=alsa/" \
-			-e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" ${D}/etc/conf.d/slmodem
-	else
-		sed -i "s/# MODULE=slamr/MODULE=slamr/" ${D}/etc/conf.d/slmodem
-	fi
-
-
-	# Add module aliases and install hotplug script
-	insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.modules ${PN}
-	if useq usb; then
-		exeinto /etc/hotplug/usb; newexe ${FILESDIR}/slusb.hotplug slusb
-	fi
-
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/55-${PN}
-
-	# Add configuration for devfs, udev
-	if [ -e ${ROOT}/dev/.devfsd ] ; then
-		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
-	elif [ -e ${ROOT}/dev/.udev ] ; then
-		dodir /etc/udev/rules.d/
-		echo 'KERNEL="slamr", NAME="slamr0" GROUP="dialout"' > \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-		echo 'KERNEL="slusb", NAME="slusb0" GROUP="dialout"' >> \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-	fi
-
-	dodoc COPYING Changes README
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs or udev
-	if [ -e ${ROOT}/dev/.devfsd ]; then
-		ebegin "Restarting devfsd to reread devfs rules"
-			killall -HUP devfsd
-		eend $?
-
-	elif [ -e ${ROOT}/dev/.udev ]; then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend $?
-	else
-		cd ${S}/drivers
-		make DESTDIR=${ROOT} install-devices
-	fi
-
-	if [ ! -e ${ROOT}/dev/ppp ]; then
-		mknod ${ROOT}/dev/ppp c 108 0
-	fi
-
-	ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist"
-	einfo "You must edit /etc/conf.d/${PN} for your configuration"
-	einfo "To add slmodem to your startup - type : rc-update add slmodem default"
-
-	if use alsa; then
-		einfo "I hope you have already added alsa to your startup: "
-		einfo "otherwise type: rc-update add alsasound boot"
-		einfo
-		einfo "If you need to use snd-intel8x0m from the kernel"
-		einfo "compile it as a module and edit /etc/module.d/alsa"
-		einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
-	fi
-
-	einfo "You need to be in the uucp AND dialout group to make calls as a user."
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.9d.ebuild b/net-dialup/slmodem/slmodem-2.9.9d.ebuild
index b4407537656b..1a0c81fd8de5 100644
--- a/net-dialup/slmodem/slmodem-2.9.9d.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.9d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9d.ebuild,v 1.2 2005/05/29 12:35:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9d.ebuild,v 1.3 2005/06/14 16:41:23 genstef Exp $
 
 inherit eutils linux-mod
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
 SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P}.tar.gz"
 LICENSE="Smart-Link"
 SLOT="0"
-KEYWORDS="~x86 -*"
+KEYWORDS="x86 -*"
 IUSE="alsa usb"
 
 RDEPEND="virtual/libc