--- /usr/portage/games-fps/quake4-bin/quake4-bin-1.2.ebuild	2006-04-20 00:01:17.000000000 +0100
+++ /usr/portage/games-fps/quake4-bin/quake4-bin-1.2.ebuild	2006-04-28 23:01:56.000000000 +0100
@@ -4,18 +4,15 @@ 
 
 inherit eutils games
 
-DESCRIPTION="Sequel to Quake 2, an Id 3D first-person shooter"
+DESCRIPTION="Sequel to Quake 2, an id 3D first-person shooter"
 HOMEPAGE="http://www.quake4game.com/"
-SRC_URI="mirror://3dgamers/quake4/quake4-linux-${PV}.x86.run
-	mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run
-	http://filebase.gmpf.de/quake4/quake4-linux-${PV}.x86.run
-	http://www.holarse.de/mirror/quake4-linux-${PV}.x86.run"
+SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run"
 
 LICENSE="QUAKE4"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa cdinstall dedicated opengl"
-RESTRICT="strip"
+IUSE="alsa cdinstall dedicated opengl smp"
+RESTRICT="primaryuri strip"
 
 UIDEPEND="virtual/opengl
 	x86? (
@@ -59,17 +56,11 @@ 
 	doins *.txt README q4icon.bmp us/version.info
 	doins -r pb
 	doexe openurl.sh || die "openurl.sh"
-	if use x86; then
-		doexe bin/Linux/x86/quake4.x86 bin/Linux/x86/q4ded.x86 \
-			bin/Linux/x86/libgcc_s.so.1 bin/Linux/x86/libstdc++.so.* \
-			|| die "doexe x86 exes/libs"
-	elif use amd64; then
-		doexe bin/Linux/x86_64/quake4.x86 bin/Linux/x86_64/q4ded.x86 \
-			bin/Linux/x86_64/libgcc_s.so.1 bin/Linux/x86_64/libstdc++.so.* \
-			|| die "doexe amd64 exes/libs"
-	else
-		die "Cannot copy executables!"
-	fi
+
+	local arch_dir="x86"
+	use amd64 && arch_dir="x86_64"
+	doexe bin/Linux/${arch_dir}/{*.x86,*.so*} \
+		|| die "doexe exes/libs"
 
 	insinto ${dir}/q4base
 	doins q4base/* us/q4base/* || die "doins q4base"
@@ -80,11 +71,17 @@ 
 
 	if use opengl || ! use dedicated
 	then
+		local default_wrapper="quake4"
+		if use smp
+		then
+			games_make_wrapper quake4-smp ./quake4smp.x86 "${dir}" "${dir}"
+			default_wrapper="quake4-smp"
+		fi
 		games_make_wrapper quake4 ./quake4.x86 "${dir}" "${dir}"
 #		doicon ${FILESDIR}/quake4.png || die "copying icon"
 #		make_desktop_entry quake4 "Quake IV" quake4.png
 		newicon q4icon.bmp quake4.bmp || die "copying icon"
-		make_desktop_entry quake4 "Quake IV" /usr/share/pixmaps/quake4.bmp
+		make_desktop_entry "${default_wrapper}" "Quake IV" /usr/share/pixmaps/quake4.bmp
 	fi
 
 	prepgamesdirs