Apply makefile.patch (#157331).

Package-Manager: portage-2.1.1-r1

3 files changed, 14 insertions, 174 deletions

diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 977b8ff779db..8c48fc640f85 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -36,14 +36,14 @@ EBUILD slmodem-2.9.11_pre20051101-r3.ebuild 4647 RMD160 2dfa39e11c3106b4b82f4e4c
 MD5 1f8422dd189f180c170dce93a715eee7 slmodem-2.9.11_pre20051101-r3.ebuild 4647
 RMD160 2dfa39e11c3106b4b82f4e4caecd3343a21e8643 slmodem-2.9.11_pre20051101-r3.ebuild 4647
 SHA256 229aeb81b1537c69bafe5a4fc7034badb976b36f08409b77095347d2dd513b57 slmodem-2.9.11_pre20051101-r3.ebuild 4647
-EBUILD slmodem-2.9.11_pre20061021.ebuild 4588 RMD160 d2ee4fa2b125e63df5244712f886eb374268ed84 SHA1 ef4eedcff1914fac3e6daea357be76b45270e8b3 SHA256 279e3e3c3462f5cd6fbe88e1c6d7dfa0281485de3f1f8e76098b9700b963e2d9
-MD5 85e6f96179422501f28e05ad900ae4ad slmodem-2.9.11_pre20061021.ebuild 4588
-RMD160 d2ee4fa2b125e63df5244712f886eb374268ed84 slmodem-2.9.11_pre20061021.ebuild 4588
-SHA256 279e3e3c3462f5cd6fbe88e1c6d7dfa0281485de3f1f8e76098b9700b963e2d9 slmodem-2.9.11_pre20061021.ebuild 4588
-MISC ChangeLog 16647 RMD160 feb2afb6dff1cb24fd582f133ec5178b53bfc306 SHA1 055544d8f24b2e49f1785dafbc79605025da3a4b SHA256 aa4bfebcedbebbee7403256399bbb3dd497c5e9879c737bb452dd673b31e5912
-MD5 8ee8ffcc9ab2cac1b27a3fe081f0976b ChangeLog 16647
-RMD160 feb2afb6dff1cb24fd582f133ec5178b53bfc306 ChangeLog 16647
-SHA256 aa4bfebcedbebbee7403256399bbb3dd497c5e9879c737bb452dd673b31e5912 ChangeLog 16647
+EBUILD slmodem-2.9.11_pre20061021-r1.ebuild 4649 RMD160 09c7d9039a14947f34cabbdf467aa602f3534b2e SHA1 d5e296e19fd6429cc9af79b42544f870da7d58e9 SHA256 c46a77863851651739c25d3ce2915c796eb50501d207d7c203e182b7b6233df3
+MD5 26b569847bf7862f1f7bcacb0aca44ec slmodem-2.9.11_pre20061021-r1.ebuild 4649
+RMD160 09c7d9039a14947f34cabbdf467aa602f3534b2e slmodem-2.9.11_pre20061021-r1.ebuild 4649
+SHA256 c46a77863851651739c25d3ce2915c796eb50501d207d7c203e182b7b6233df3 slmodem-2.9.11_pre20061021-r1.ebuild 4649
+MISC ChangeLog 16852 RMD160 24b6af2676ba9119e72a9a3b3638ab5a7d9b7935 SHA1 f8e00329ff942685a76017c8c0e9aae5325de7b8 SHA256 308f2b0c153406b0086edabac5b97517c90e10d7b0f6af19f40a2f6a9dfce07a
+MD5 3804d1183dee872b98650e6d366d8d75 ChangeLog 16852
+RMD160 24b6af2676ba9119e72a9a3b3638ab5a7d9b7935 ChangeLog 16852
+SHA256 308f2b0c153406b0086edabac5b97517c90e10d7b0f6af19f40a2f6a9dfce07a ChangeLog 16852
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -51,13 +51,13 @@ SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata
 MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101-r3 512
 RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101-r3 512
 SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101-r3 512
-MD5 1e86c27a40bdda7df7e235d0495dbc5d files/digest-slmodem-2.9.11_pre20061021 512
-RMD160 e1732463bba377a01a9845a6705e32ea4816655d files/digest-slmodem-2.9.11_pre20061021 512
-SHA256 55e9c497a14ce5058ab1b24c2540bded458b7bcb88bece092aebc0d6f1a301f3 files/digest-slmodem-2.9.11_pre20061021 512
+MD5 1e86c27a40bdda7df7e235d0495dbc5d files/digest-slmodem-2.9.11_pre20061021-r1 512
+RMD160 e1732463bba377a01a9845a6705e32ea4816655d files/digest-slmodem-2.9.11_pre20061021-r1 512
+SHA256 55e9c497a14ce5058ab1b24c2540bded458b7bcb88bece092aebc0d6f1a301f3 files/digest-slmodem-2.9.11_pre20061021-r1 512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFcTf23sf9c6kjmR8RAs50AKCZoTU7BwycK5RDMC/3P3nT9GnveACgoFd+
-WbMq25SE5VUbFtChTgZuaGI=
-=IF27
+iD8DBQFFdu/b3sf9c6kjmR8RAu6fAJ9PTFsYr6KHgSYt6eUmlkqpFOW5NwCfRpxk
+pMhppjsCRO5ByN/1nzzHvXI=
+=Ne0W
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021
deleted file mode 100644
index 2754331a0334..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20061021
+++ /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/slmodem-2.9.11_pre20061021.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20061021.ebuild
deleted file mode 100644
index da15ae362609..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20061021.ebuild
+++ /dev/null
@@ -1,154 +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_pre20061021.ebuild,v 1.1 2006/12/02 08:23:06 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}
-	cd "${WORKDIR}"
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
-		ungrab-winmodem/Makefile
-	convert_to_m ungrab-winmodem/Makefile
-
-	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.19.patch"
-	cd "${S}"/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"
-}