--- /usr/portage/net-dialup/slmodem/slmodem-2.9.11_pre20080126-r1.ebuild	2008-02-18 14:04:30.000000000 +0100
+++ slmodem-2.9.11_pre20080126-r1.ebuild	2008-02-23 14:14:53.000000000 +0100
@@ -32,10 +32,10 @@
 	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${UNGRAB_PV})"
 	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
+	if use usb; then
+		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
+		CONFIG_CHECK="USB"
 	fi
 	BUILD_TARGETS="all"
 	if kernel_is ge 2 6 24; then
@@ -59,6 +59,7 @@
 	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
 	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.24.patch"
 	epatch "${FILESDIR}/${P%%_*}-alsa-period-size.patch"
+	use amd64 && epatch "${FILESDIR}/${P%%_*}-amd64.patch"
 
 	cd "${S}"/drivers
 	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
@@ -70,7 +71,7 @@
 
 src_compile() {
 	local MAKE_PARAMS=""
-	if use alsa || use amd64; then
+	if use alsa; then
 		MAKE_PARAMS="SUPPORT_ALSA=1"
 	fi
 	emake ${MAKE_PARAMS} modem || die "failed to build modem"
@@ -96,6 +97,8 @@
 	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