Changed eclasses and does a few more compatable with later kernel versions. bug #67639

4 files changed, 161 insertions, 11 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 3f90d0d43bd5..acd5d00f8180 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.26 2004/10/01 22:52:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.27 2004/10/16 02:21:20 dragonheart Exp $
+
+*slmodem-2.9.10-r1 (16 Oct 2004)
+
+  16 Oct 2004; Daniel Black <dragonheart@gentoo.org>
+  +slmodem-2.9.10-r1.ebuild:
+  Changed eclasses and does a few more compatable with later kernel versions.
+  Thanks to Stefan Schweizer <sschweizer@gmail.com> in bug #67639
 
   02 Oct 2004; Daniel Black <dragonheart@gentoo.org>
   files/slmodem-2.9.10-makefile-fixup.patch:
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index a1937a1d6aec..bbcf49dbb88a 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7faf41f1aa59e6b8a1673f106ffac1e1 metadata.xml 523
 MD5 39a6e7fcda2ee23817e894ed009e7ba7 slmodem-2.7.14.ebuild 1511
 MD5 099fcd1269631619aebc85d80d0f4325 ChangeLog 6066
 MD5 d5d2b6c197ae9d40d4e3326e2f1b1dd5 slmodem-2.9.9-r2.ebuild 4335
 MD5 d087a4c2817309c5060154ad7840a463 slmodem-2.9.10.ebuild 4333
+MD5 4dffd342644c4f6bceaa55627c97bbe3 slmodem-2.9.10-r1.ebuild 3832
 MD5 43dee264075d4262df5388ce1f055929 files/slmodem-2.9.conf 707
 MD5 04150d1eddd9774a7d1a70df93600e3c files/digest-slmodem-2.7.14 64
 MD5 5565553c8ddd949c38070e59ce64b90c files/slmodem-2.7.14-makefile-fixup.patch 1626
@@ -17,11 +15,5 @@ MD5 9ae4e594075f43c76a7067fa8004095a files/digest-slmodem-2.9.9-r2 65
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
 MD5 5c0b5dfce1ad5bd98a79d8307faf584d files/slmodem-2.9.init 2659
 MD5 a358a1ca75aad86c0d7a059da089bc58 files/slmodem-2.9.10-makefile-fixup.patch 6229
+MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r1 66
 MD5 a1b37267647bbb45a01facc3b807ccff files/slmodem-2.9.9-makefile-fixup.patch 6328
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBXd+rmdTrptrqvGERAj8nAJ4xsWLkPjeVgM83Nzamffu0rfwgmgCgmxzd
-eT4hh4ZmIcZ2dCmMG+NF88w=
-=pbHY
------END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.10-r1 b/net-dialup/slmodem/files/digest-slmodem-2.9.10-r1
new file mode 100644
index 000000000000..b6aff29497e8
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.10-r1
@@ -0,0 +1 @@
+MD5 cbc4918f2ee9ed4952d3f4309d364b35 slmodem-2.9.10.tar.gz 806884
diff --git a/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild
new file mode 100644
index 000000000000..a161bfc75493
--- /dev/null
+++ b/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild,v 1.1 2004/10/16 02:21:20 dragonheart Exp $
+
+inherit kernel-mod eutils
+
+DESCRIPTION="Driver for Smart Link modem"
+HOMEPAGE="http://www.smlink.com/"
+SRC_URI="http://www.smlink.com/main/down/${P}.tar.gz"
+LICENSE="Smart-Link"
+SLOT="0"
+KEYWORDS="~x86 -*"
+IUSE="alsa usb"
+
+DEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )
+	virtual/os-headers
+	>=sys-apps/sed-4"
+
+RDEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )"
+
+pkg_setup() {
+	kernel-mod_check_modules_supported
+}
+
+src_compile() {
+	if use alsa
+	then
+		export SUPPORT_ALSA=1
+	else
+		export SUPPORT_ALSA=0
+	fi
+
+	# http://marc.theaimsgroup.com/?l=gentoo-dev&m=109672618708314&w=2
+	kernel-mod_getversion
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i 's:SUBDIRS=:M=:g' drivers/Makefile
+	fi
+
+	unset ARCH
+
+	emake \
+		KERNEL_DIR="${ROOT}/usr/src/linux" \
+	 	modem drivers || die "Failed to compile driver"
+}
+
+src_install() {
+	if kernel-mod_is_2_6_kernel
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
+	insinto /lib/modules/${KV}/extra
+	doins drivers/slamr.${KV_OBJ}
+	doins drivers/slusb.${KV_OBJ}
+
+	newsbin modem/modem_test slmodem_test
+	dosbin modem/slmodemd
+	dodir /var/lib/slmodem
+	fowners root:dialout /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}
+
+	if use alsa
+	then
+		sed -i -e "s/# ALSACONF //g" ${D}/etc/conf.d/slmodem
+	else
+		sed -i -e "s/# NONALSACONF //g" ${D}/etc/conf.d/slmodem
+		if use usb
+		then
+			sed -i -e "s/# USBCONF //g" ${D}/etc/conf.d/slmodem
+		else
+			sed -i -e "s/# PCICONF //g" ${D}/etc/conf.d/slmodem
+		fi
+	fi
+	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}
+		insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.modules ${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
+	else
+		make -C drivers DESTDIR=${D} KERNEL_DIR="${ROOT}/usr/src/linux" install-devices
+	fi
+
+	dodir /etc/hotplug/blacklist.d
+	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/55-${PN}
+}
+
+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 0
+		einfo "modules-update to complete configuration."
+
+	elif [ -e ${ROOT}/dev/.udev ]
+	then
+		ebegin "Restarting udev to reread udev rules"
+			udevstart
+		eend 0
+	fi
+
+	echo
+
+	einfo "You must edit /etc/conf.d/${PN} for your configuration"
+
+	ewarn "To avoid problems add slusb/slamr to /etc/hotplug/blacklist"
+
+	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 "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+}