diff options
Diffstat (limited to 'net-dialup')
-rw-r--r-- | net-dialup/slmodem/ChangeLog | 9 | ||||
-rw-r--r-- | net-dialup/slmodem/Manifest | 14 | ||||
-rw-r--r-- | net-dialup/slmodem/files/digest-slmodem-2.9.10-r3 | 1 | ||||
-rw-r--r-- | net-dialup/slmodem/slmodem-2.9.10-r1.ebuild | 6 | ||||
-rw-r--r-- | net-dialup/slmodem/slmodem-2.9.10-r2.ebuild | 6 | ||||
-rw-r--r-- | net-dialup/slmodem/slmodem-2.9.10-r3.ebuild | 141 |
6 files changed, 168 insertions, 9 deletions
diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog index 39789e8e28c3..624ef12287dd 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.32 2004/12/29 02:59:14 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.33 2004/12/29 21:54:06 mrness Exp $ + +*slmodem-2.9.10-r3 (29 Dec 2004) + + 29 Dec 2004; Alin Nastac <mrness@gentoo.org> slmodem-2.9.10-r1.ebuild, + slmodem-2.9.10-r2.ebuild, +slmodem-2.9.10-r3.ebuild: + Block installation for kernel versions >= 2.6.10 (#75656). Rewrite ebuild + using linux-mod eclass. Create /dev/ppp device at install time (#75913). 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : Change encoding to UTF-8 for GLEP 31 compliance diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest index b66aabaeee25..be2cedeaaab4 100644 --- a/net-dialup/slmodem/Manifest +++ b/net-dialup/slmodem/Manifest @@ -1,12 +1,14 @@ -MD5 5b292f3aac28a9e3370847dd1088b685 ChangeLog 7988 +MD5 af384e4b91c105bbdc4837764112e3d7 slmodem-2.9.10-r1.ebuild 3969 +MD5 83e3247c2dd2f16b38b884a25372c8fe slmodem-2.9.10-r3.ebuild 3904 MD5 01f2c169679deeeb649a179a0bfba4f1 slmodem-2.9.10-r2.ebuild 3895 +MD5 5b292f3aac28a9e3370847dd1088b685 ChangeLog 7988 MD5 93dd8a9d0c0f815e8445d9f0c1fc0910 metadata.xml 578 -MD5 af384e4b91c105bbdc4837764112e3d7 slmodem-2.9.10-r1.ebuild 3969 +MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262 MD5 026f2e2fae1fbd999455b36630164a88 files/slmodem-2.9.10-usb_endpoint_halted-gentoo.patch 830 +MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494 MD5 67543ad2e41e6dbc2150057340bb82b1 files/slmodem-2.9.conf 752 MD5 64d03a3c87a5330faa6b8dd9d344b6a3 files/slmodem-2.9.init 2657 -MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786 -MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262 -MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r2 66 -MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494 MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r1 66 +MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r2 66 +MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r3 66 +MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786 diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.10-r3 b/net-dialup/slmodem/files/digest-slmodem-2.9.10-r3 new file mode 100644 index 000000000000..b6aff29497e8 --- /dev/null +++ b/net-dialup/slmodem/files/digest-slmodem-2.9.10-r3 @@ -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 index 886bdbc49615..be99129d5533 100644 --- a/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild +++ b/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild @@ -1,6 +1,6 @@ # 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.3 2004/12/05 09:28:29 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild,v 1.4 2004/12/29 21:54:06 mrness Exp $ inherit kernel-mod eutils @@ -21,6 +21,10 @@ RDEPEND="virtual/libc alsa? ( media-libs/alsa-lib )" pkg_setup() { + if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 6 -a "${KV_PATCH}" -ge 10 ]; then + eerror "This package isn't compatible with kernel versions >= 2.6.10!" + die "unsupported kernel version" + fi kernel-mod_check_modules_supported } diff --git a/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild b/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild index 4da6d8c925ad..3e2c7e92f132 100644 --- a/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild +++ b/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild @@ -1,6 +1,6 @@ # 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-r2.ebuild,v 1.3 2004/12/14 19:03:02 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild,v 1.4 2004/12/29 21:54:06 mrness Exp $ inherit eutils linux-info @@ -21,6 +21,10 @@ RDEPEND="virtual/libc alsa? ( media-libs/alsa-lib )" pkg_setup() { + if kernel_is ge 2 6 10; then + eerror "This package isn't compatible with kernel versions >= 2.6.10!" + die "unsupported kernel version" + fi check_modules_supported } diff --git a/net-dialup/slmodem/slmodem-2.9.10-r3.ebuild b/net-dialup/slmodem/slmodem-2.9.10-r3.ebuild new file mode 100644 index 000000000000..cbfba58d4add --- /dev/null +++ b/net-dialup/slmodem/slmodem-2.9.10-r3.ebuild @@ -0,0 +1,141 @@ +# 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-r3.ebuild,v 1.1 2004/12/29 21:54:06 mrness Exp $ + +inherit eutils linux-mod + +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() { + if kernel_is ge 2 6 10; then + eerror "This package isn't compatible with kernel versions >= 2.6.10!" + die "unsupported kernel version" + fi + + local CONFIG_CHECK="" + if useq alsa; then + CONFIG_CHECK="${CONFIG_CHECK} SND" + fi + if useq usb; then + CONFIG_CHECK="${CONFIG_CHECK} USB" + fi + + MODULE_NAMES="slamr(extra:${S}/drivers)" + useq usb && MODULE_NAMES="${MODULE_NAMES} slusb(extra:${S}/drivers)" + BUILD_TARGETS="all" + + linux-mod_pkg_setup +} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-usb_endpoint_halted-gentoo.patch || die "failed to apply patch for fixing usb_endpoint" + + # http://marc.theaimsgroup.com/?l=gentoo-dev&m=109672618708314&w=2 + if kernel_is ge 2 6 6; then + sed -i 's:SUBDIRS=:M=:g' drivers/Makefile + fi +} + +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} + 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 +} |