Version bump (#196497).

(Portage version: 2.1.2.12)

6 files changed, 42 insertions, 94 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 4dfb14defd5c..9b1f67fa44be 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.85 2007/07/25 07:21:03 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.86 2007/10/23 13:19:32 mrness Exp $
+
+*slmodem-2.9.11_pre20070813 (23 Oct 2007)
+
+  23 Oct 2007; Alin Năstac <mrness@gentoo.org>
+  -files/slmodem-2.9.11-kernel-2.6.19.patch, -files/slusb.hotplug,
+  -slmodem-2.9.11_pre20061021-r2.ebuild, +slmodem-2.9.11_pre20070813.ebuild:
+  Version bump (#196497).
 
   25 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
   slmodem-2.9.11_pre20070505.ebuild:
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021-r2 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021-r2
deleted file mode 100644
index 2754331a0334..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 8e1858b0a6d16fce73966759732986ab slmodem-2.9.11-20061021.tar.gz 839050
-RMD160 7f307d5267e2c9ecb165b34ccb0432032122eb6d slmodem-2.9.11-20061021.tar.gz 839050
-SHA256 7516ee6fbf897a1fad5689f4cb6ec03b1b459fc53e72cebd1f641d1a25916c98 slmodem-2.9.11-20061021.tar.gz 839050
-MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872
-RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf ungrab-winmodem.tar.gz 1872
-SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11 ungrab-winmodem.tar.gz 1872
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070813 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070813
new file mode 100644
index 000000000000..6ddd6435226e
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070813
@@ -0,0 +1,6 @@
+MD5 4e2eeb99d1fe7db939c0f5fbe05a1b01 slmodem-2.9.11-20070813.tar.gz 838510
+RMD160 9fa5697d00a242e5ad33fa39bdcf48d7b3954955 slmodem-2.9.11-20070813.tar.gz 838510
+SHA256 7698ef23b4993446644eb609107aa7840d56dc5a86db4c96cbfa2caef4156125 slmodem-2.9.11-20070813.tar.gz 838510
+MD5 748bfc7387006293f9eddde119fa9d6f ungrab-winmodem-20070505.tar.gz 2254
+RMD160 51b71b203688004718826f23dc2485223d8b4a17 ungrab-winmodem-20070505.tar.gz 2254
+SHA256 9fd9287638f89c17733bb4a6c981b00446f0be18589a71f10f69fca5006a7781 ungrab-winmodem-20070505.tar.gz 2254
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch
deleted file mode 100644
index 2958470ae034..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nru work.orig/slmodem-2.9.11-20061021/drivers/amrmo_init.c work/slmodem-2.9.11-20061021/drivers/amrmo_init.c
---- work.orig/slmodem-2.9.11-20061021/drivers/amrmo_init.c	2006-12-20 20:26:38.000000000 +0200
-+++ work/slmodem-2.9.11-20061021/drivers/amrmo_init.c	2006-12-20 20:28:01.000000000 +0200
-@@ -43,9 +43,11 @@
- 
- /*****************************************************************************/
- 
--#include <linux/config.h>
--#include <linux/module.h>
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-+#	include <linux/config.h>
-+#endif
-+#include <linux/module.h>
- #include <linux/init.h>
- #include <linux/pci.h>
- #include <linux/kernel.h>
-diff -Nru work.orig/ungrab-winmodem/ungrab-winmodem.c work/ungrab-winmodem/ungrab-winmodem.c
---- work.orig/ungrab-winmodem/ungrab-winmodem.c	2006-12-20 20:26:38.000000000 +0200
-+++ work/ungrab-winmodem/ungrab-winmodem.c	2006-12-20 20:28:19.000000000 +0200
-@@ -11,9 +11,11 @@
-  *
-  */
- 
--#include <linux/config.h>
--#include <linux/module.h>
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
-+#	include <linux/config.h>
-+#endif
-+#include <linux/module.h>
- #include <linux/init.h>
- #include <linux/pci.h>
- #include <linux/kernel.h>
diff --git a/net-dialup/slmodem/files/slusb.hotplug b/net-dialup/slmodem/files/slusb.hotplug
deleted file mode 100644
index a8a056c45f45..000000000000
--- a/net-dialup/slmodem/files/slusb.hotplug
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-RC_NOCOLOR="yes"
-source /sbin/functions.sh
-source /etc/conf.d/slmodem
-if [ -z "${USBMOD}" ];then 
-	MODULE="slusb"
-else 
-	MODULE=${USBMOD}
-fi
-source /etc/init.d/slmodem
-source "${svclib}/sh/rc-services.sh"
-start && source "${svclib}/sh/rc-services.sh"
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r2.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20070813.ebuild
index 44011bd97864..11532ef4caea 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r2.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20070813.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r2.ebuild,v 1.4 2007/07/15 04:52:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20070813.ebuild,v 1.1 2007/10/23 13:19:32 mrness Exp $
 
 inherit eutils linux-mod multilib
 
+UNGRAB_PV="20070505"
+
 DESCRIPTION="Driver for Smart Link modem"
 HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
 SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P/_pre/-}.tar.gz
-	http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem.tar.gz"
+	http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-${UNGRAB_PV}.tar.gz"
 
 LICENSE="Smart-Link"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="alsa usb"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
@@ -24,7 +26,7 @@ S="${WORKDIR}"/${P/_pre/-}
 pkg_setup() {
 	use amd64 && multilib_toolchain_setup x86
 
-	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem)"
+	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${UNGRAB_PV})"
 	if ! use amd64; then
 		MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)"
 		if use usb; then
@@ -34,17 +36,18 @@ pkg_setup() {
 	fi
 	BUILD_TARGETS="all"
 	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
+	BUILD_PARAMS="KERNEL_DIR=${KV_OUT_DIR}"
 }
 
 src_unpack() {
 	unpack ${A}
 	cd "${WORKDIR}"
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
-		ungrab-winmodem/Makefile
-	convert_to_m ungrab-winmodem/Makefile
+	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}:" \
+		ungrab-winmodem-${UNGRAB_PV}/Makefile
+	convert_to_m ungrab-winmodem-${UNGRAB_PV}/Makefile
+
+	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
 
-	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.19.patch"
 	cd "${S}"
 	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
 
@@ -88,60 +91,44 @@ src_install() {
 		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}/slmodem-modules" ${PN}
+	# Add module aliases and install udev script
+	insinto /etc/modules.d/
+	newins "${FILESDIR}/slmodem-modules" ${PN}
 	if use usb; then
-		exeinto /etc/hotplug/usb; newexe "${FILESDIR}/slusb.hotplug" slusb
+		exeinto /$(get_libdir)/udev
+		newexe "${FILESDIR}/slusb-udev.script" slmodem_usb.sh
 	fi
 
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/hotplug/blacklist.d/${PN}"
+	dodir /etc/modprobe.d
+	echo -e "blacklist slusb\nblacklist slamr\nblacklist snd-intel8x0m" >> "${D}/etc/modprobe.d/${PN}"
 
-	# Add configuration for devfs, udev
-	insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN}
+	# Add configuration for udev
 	dodir /etc/udev/rules.d/
 	echo 'KERNEL=="slamr", NAME="slamr0" GROUP="dialout"' > \
 		 "${D}/etc/udev/rules.d/55-${PN}.rules"
 	if use usb; then
-		echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout"' >> \
+		echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout" RUN+="slmodem_usb.sh"' >> \
 			 "${D}/etc/udev/rules.d/55-${PN}.rules"
 	fi
 
-	dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.txt"
-}
-
-pkg_preinst() {
-	linux-mod_pkg_preinst
-
-	# Remove obsolete devfs configuration files if the box use udev
-	if [ -e "${ROOT}/dev/.udev" ]; then
-		rm -r "${D}/etc/devfs.d"
-	fi
+	dodoc Changes README
+	newdoc "${WORKDIR}"/ungrab-winmodem-${UNGRAB_PV}/Readme.txt README-ungrab-winmodem.txt
 }
 
 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
+	if [ -e "${ROOT}/dev/.udev" ]; then
+		ebegin "Reloading udev rules..."
+			udevcontrol reload_rules
 		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"
+	ewarn "To avoid problems, slusb/slamr have been blacklisted in /etc/modprobe.d/${PN}"
 	elog "You must edit /etc/conf.d/${PN} for your configuration"
 	elog "To add slmodem to your startup - type : rc-update add slmodem default"
 	elog
@@ -161,4 +148,5 @@ pkg_postinst() {
 	elog "If you see the following in dmesg:"
 	elog "    slamr: device 10b9:5457 is grabbed by driver serial"
 	elog "you need to modprobe ungrab-winmodem before slamr"
+	elog "See /etc/modules.d/slmodem for details."
 }