Remove obsolete version. Remove references to $ROOT from src_install (#168039).

(Portage version: 2.1.2.2)

5 files changed, 25 insertions, 223 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 75af359d2554..0041436cd5ef 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/slmodem
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.78 2006/12/20 18:33:11 mrness Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.79 2007/03/10 14:29:31 mrness Exp $
+
+  10 Mar 2007; Alin Năstac <mrness@gentoo.org>
+  -files/slmodem-2.9.11-kernel-2.6.18.patch,
+  -slmodem-2.9.11_pre20051101-r3.ebuild,
+  slmodem-2.9.11_pre20061021-r1.ebuild:
+  Remove obsolete version. Remove references to $ROOT from src_install (#168039).
 
   20 Dec 2006; Alin Năstac <mrness@gentoo.org>
   files/slmodem-2.9.11-kernel-2.6.19.patch:
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r3 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r3
deleted file mode 100644
index 047a97ea184a..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56bb1ddf621b2fe26caf746aed0ac26f slmodem-2.9.11-20051101.tar.gz 833644
-RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 slmodem-2.9.11-20051101.tar.gz 833644
-SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172 slmodem-2.9.11-20051101.tar.gz 833644
-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/slmodem-2.9.11-kernel-2.6.18.patch b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.18.patch
deleted file mode 100644
index 62a21f332a1b..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.18.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nru slmodem-2.9.11-20051101.orig/drivers/amrmo_init.c slmodem-2.9.11-20051101/drivers/amrmo_init.c
---- slmodem-2.9.11-20051101.orig/drivers/amrmo_init.c	2005-10-10 00:14:13.000000000 +0300
-+++ slmodem-2.9.11-20051101/drivers/amrmo_init.c	2006-09-09 18:13:47.219081000 +0300
-@@ -53,7 +53,13 @@
- #include <linux/poll.h>
- #include <linux/fs.h>
- #include <asm/uaccess.h>
--#include <linux/devfs_fs_kernel.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-+#	include <linux/devfs_fs_kernel.h>
-+#else
-+#	define devfs_mk_cdev(dev, mode, fmt, i)
-+#	define devfs_remove(fmt, i)
-+#endif
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- #define OLD_KERNEL 1
-diff -Nru slmodem-2.9.11-20051101.orig/drivers/kernel-ver.c slmodem-2.9.11-20051101/drivers/kernel-ver.c
---- slmodem-2.9.11-20051101.orig/drivers/kernel-ver.c   2003-09-23 20:38:40.000000000 +0300
-+++ slmodem-2.9.11-20051101/drivers/kernel-ver.c        2006-09-10 12:45:04.643367500 +0300
-@@ -4,6 +4,9 @@
-
- #include <stdio.h>
- #include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
-+#      include <linux/utsrelease.h>
-+#endif
-
- int main()
- {
-diff -Nru slmodem-2.9.11-20051101.orig/drivers/st7554.c slmodem-2.9.11-20051101/drivers/st7554.c
---- slmodem-2.9.11-20051101.orig/drivers/st7554.c	2005-11-01 17:31:45.000000000 +0200
-+++ slmodem-2.9.11-20051101/drivers/st7554.c	2006-09-09 18:14:36.910186500 +0300
-@@ -55,7 +55,13 @@
- #include <linux/poll.h>
- #include <linux/usb.h>
- #include <linux/device.h>
--#include <linux/devfs_fs_kernel.h>
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-+#	include <linux/devfs_fs_kernel.h>
-+#else
-+#	define devfs_mk_cdev(dev, mode, fmt, i)
-+#	define devfs_remove(fmt, i)
-+#endif
- 
- #include <modem_defs.h>
- 
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r3.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r3.ebuild
deleted file mode 100644
index fa8a7c81731a..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2006 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_pre20051101-r3.ebuild,v 1.1 2006/12/01 09:59:27 mrness Exp $
-
-inherit eutils linux-mod multilib
-
-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"
-
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="-* ~amd64 x86"
-IUSE="alsa usb"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	amd64? ( app-emulation/emul-linux-x86-soundlibs )"
-
-QA_EXECSTACK="usr/sbin/slmodem_test usr/sbin/slmodemd"
-
-S=${WORKDIR}/${P/_pre/-}
-
-pkg_setup() {
-	use amd64 && multilib_toolchain_setup x86
-
-	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem)"
-	if ! use amd64; then
-		MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)"
-		if use usb; then
-			MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
-			CONFIG_CHECK="USB"
-		fi
-	fi
-	BUILD_TARGETS="all"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
-		"${WORKDIR}/ungrab-winmodem/Makefile"
-	convert_to_m "${WORKDIR}/ungrab-winmodem/Makefile"
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
-	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.18.patch"
-	cd drivers
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
-	convert_to_m Makefile
-	sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c
-	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \
-		amrmo_init.c old_st7554.c
-}
-
-src_compile() {
-	local MAKE_PARAMS=""
-	if use alsa || use amd64; then
-		MAKE_PARAMS="SUPPORT_ALSA=1"
-	fi
-	emake ${MAKE_PARAMS} modem || die "failed to build modem"
-
-	use amd64 && multilib_toolchain_setup amd64
-	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
-
-	newconfd "${FILESDIR}/slmodem-confd" ${PN}
-	newinitd "${FILESDIR}/slmodem-initd" ${PN}
-
-	# configure for alsa - or not for alsa
-	if use 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}/slmodem-modules" ${PN}
-	if use 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/${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"
-		if use usb; then
-			echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout"' >> \
-				 "${D}/etc/udev/rules.d/55-${PN}.rules"
-		fi
-	fi
-
-	dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.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
-		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/modules.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."
-	einfo
-	einfo "If you see the following in dmesg:"
-	echo slamr: device 10b9:5457 is grabbed by driver serial
-	einfo "you need to modprobe ungrab-winmodem before slamr"
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild
index b6a7416d1925..c40c7dfa85c6 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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-r1.ebuild,v 1.2 2006/12/08 11:42:19 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r1.ebuild,v 1.3 2007/03/10 14:29:31 mrness Exp $
 
 inherit eutils linux-mod multilib
 
@@ -99,21 +99,27 @@ src_install() {
 	echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/hotplug/blacklist.d/${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"' > \
+	insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN}
+	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"' >> \
 			 "${D}/etc/udev/rules.d/55-${PN}.rules"
-		if use usb; then
-			echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout"' >> \
-				 "${D}/etc/udev/rules.d/55-${PN}.rules"
-		fi
 	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
+}
+
 pkg_postinst() {
 	linux-mod_pkg_postinst