Version bump (#271317).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 181 insertions, 6 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 5ac3459e16a4..43f504f5d254 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.100 2009/03/13 20:09:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.101 2009/06/20 09:25:15 mrness Exp $
+
+*slmodem-2.9.11_pre20090222 (20 Jun 2009)
+
+  20 Jun 2009; Alin Năstac <mrness@gentoo.org>
+  +slmodem-2.9.11_pre20090222.ebuild:
+  Version bump (#271317).
 
   13 Mar 2009; Alin Năstac <mrness@gentoo.org>
   slmodem-2.9.11_pre20080817.ebuild:
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index f8aded84845d..e60fde248989 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -12,15 +12,18 @@ AUX slmodem-ungrab-winmodem-hp500.patch 1096 RMD160 8f1f16841e02b1473748452a3fd2
 AUX slusb-udev.script 257 RMD160 62a2d7d4ec28622e89b0dfb045b570a2687e1c9a SHA1 8f3e63fc953d036fcc47755ec399a6510cf22ce3 SHA256 e93d7a46309898cb6e578f5e56e8b25753b4c371260466b10875034cca96480a
 DIST slmodem-2.9.11-20080417.tar.gz 994453 RMD160 66f154382ce2a4a8e90193b96c9e7f9f6698835d SHA1 775b63b6140cd591338eecc9792d5e527f43f679 SHA256 8e2bdb5ef93961743368b3248cfc56ddc7c37140b67b8c0cc9d627a4489ed45e
 DIST slmodem-2.9.11-20080817.tar.gz 993873 RMD160 c13ed62dfaab437efda652ed63cff20a152b6765 SHA1 7838f19a32077ed5e0ecbfe06232a3840888c5eb SHA256 2d5e5005f19cd6bc9a24e22ca533babb8c26e94db8bbc81d81ac4732c853a252
+DIST slmodem-2.9.11-20090222.tar.gz 998461 RMD160 2a0a3948e3845803eb8ac16474a7af87ad3954ab SHA1 bbe0f07e835c1f4258ad21fe117efa98ac3348d6 SHA256 1bb226b2076c72918befe2ad672dcff6d2dcbab204a02f863077c9789daf30d8
 DIST ungrab-winmodem-2.9.11-20080126.tar.gz 2334 RMD160 1f738efc75e6907b63fb664dd6cfcfc4e9a96b7f SHA1 2678bb8995dd1b355a5fc20f2217919b8517ef66 SHA256 3d50bd46884216ea32306a7dcdddaad7910242bd7dfdef44a92fa12b5f5d3609
+DIST ungrab-winmodem-20080126.tar.gz 2329 RMD160 401e853d95742ccfcc10edbd8885e304a0c21f35 SHA1 ddc8fbcbf5417f43aed7f8b01cf062340f45fd08 SHA256 b4d3330016df3f83fcbea8ee1bb421395b43d4baace5ae71f0e04de6620cf186
 EBUILD slmodem-2.9.11_pre20080417.ebuild 4964 RMD160 937277300271da59328707df9d9da0c696da8d1c SHA1 928ba554b303f0e41df05cd920a24ba479dc8928 SHA256 135f44133ea5ff4b5fcf0c678566da0232a9782ef1095c345600e5f2970a8005
 EBUILD slmodem-2.9.11_pre20080817.ebuild 4960 RMD160 03be6541ad29eb09c4b14b0fe8ba9784a12af2d8 SHA1 5b5f1f11c41c29c99a6620c989da3ee94831ede4 SHA256 1039625c07f6280557e20d48433d1dc91f4f4136b1ea86a0f799dd266450cd76
-MISC ChangeLog 22037 RMD160 494a5da9c3d5b4b0b5784397e08b98031d2a5af6 SHA1 92127f3032b395dc7562ef3a4ea924117d48c603 SHA256 16646adb30fba7b0ec21d3fedcd911a26263533192e12d153fdd4ce179c7d724
+EBUILD slmodem-2.9.11_pre20090222.ebuild 4902 RMD160 94012f78bfa883bb9e1ef583f5834ac43d3874c6 SHA1 0df78362ba389cf1f86d14c3c5107fcfa25e7e77 SHA256 1052e19b7fa2daa5e6f0f8c2c982edb21701a1075afe98fab75e757b5499fda5
+MISC ChangeLog 22193 RMD160 bb08ce026baac3043473b570525768fb87fa714c SHA1 d3706a1433cb0c9de6f803e50f378faac3967319 SHA256 688053fa547feafce074f8e2126dbf44f34791ddb565ae29a43a4328868e8b43
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkm6wyIACgkQts85UDFmaOVAmgCcCS8RO/hLK0WkuOVWb907g0XE
-xhoAnRHxkrOAtyq4Q27X1DtKy4rrLYdE
-=13qR
+iEYEARECAAYFAko8qwwACgkQts85UDFmaOWGUwCeK2rPqzxs683gmZUvVyhVH+OC
+GvcAn2s8k9pS0rn6lw3FqXEQjdnoJ/Fr
+=76A/
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20090222.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20090222.ebuild
new file mode 100644
index 000000000000..2674ec29d370
--- /dev/null
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20090222.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2009 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_pre20090222.ebuild,v 1.1 2009/06/20 09:25:15 mrness Exp $
+
+EAPI="2"
+
+inherit eutils linux-mod multilib
+
+UNGRAB_PV="20080126"
+
+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-${UNGRAB_PV}.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 )"
+
+RDEPEND="${DEPEND}
+	virtual/logger"
+
+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-${UNGRAB_PV})"
+	CONFIG_CHECK=""
+	MY_SLMODULES=""
+	if ! use amd64; then
+		MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)"
+		MY_SLMODULES="${MY_SLMODULES} slamr.o"
+	fi
+	if kernel_is ge 2 6 25; then
+	    if use usb; then
+		ewarn "slusb module will not be installed because is not compatible with kernels >=2.6.25"
+	    fi
+	elif use usb; then
+		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
+		CONFIG_CHECK="${CONFIG_CHECK} USB"
+		MY_SLMODULES="${MY_SLMODULES} slusb.o"
+	fi
+	BUILD_TARGETS="all"
+	if kernel_is ge 2 6 24; then
+		CONFIG_CHECK="${CONFIG_CHECK} PCI_LEGACY"
+	fi
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNEL_DIR=${KV_OUT_DIR}"
+}
+
+src_prepare() {
+	cd "${WORKDIR}"
+	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
+
+	cd "${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}"
+	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P%%_*}-makefile-r1.patch"
+
+	cd "${S}"/drivers
+	sed -i -e "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" \
+	    -e "s|^obj-m:=.*$|obj-m:=${MY_SLMODULES}|" \
+	    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; 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"
+	elif use usb; then
+		sed -i "s/# MODULE=slusb/MODULE=slusb/" "${D}/etc/conf.d/slmodem"
+	else
+		sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem"
+	fi
+
+	# Add module aliases
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}/slmodem-modprobe" ${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
+		exeinto /$(get_libdir)/udev
+		newexe "${FILESDIR}/slusb-udev.script" slmodem_usb.sh
+		echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout" RUN+="slmodem_usb.sh"' >> \
+			 "${D}/etc/udev/rules.d/55-${PN}.rules"
+	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/.udev" ]; then
+		ebegin "Reloading udev rules..."
+			udevadm control --reload-rules
+		eend $?
+	else
+		cd "${S}/drivers"
+		make DESTDIR="${ROOT}" install-devices
+	fi
+
+	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
+
+	if use alsa; then
+		elog "I hope you have already added alsa to your startup: "
+		elog "otherwise type: rc-update add alsasound boot"
+		elog
+		elog "If you need to use snd-intel8x0m from the kernel"
+		elog "compile it as a module and edit /etc/modules.d/alsa"
+		elog 'to: "alias snd-card-(number) snd-intel8x0m"'
+		elog
+	fi
+
+	elog "You need to be in the uucp AND dialout group to make calls as a user."
+	elog
+	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"
+}