--- quake4-bin-1.2.1.ebuild-portage	2006-05-01 22:51:07.000000000 +0100
+++ quake4-bin-1.2.1.ebuild	2006-05-01 23:12:53.000000000 +0100
@@ -4,15 +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://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? (
@@ -53,15 +53,14 @@
 	insinto "${dir}"
 	exeinto "${dir}"
 
-	doins *.txt README q4icon.bmp us/version.info README-1.2.htm
-	doins -r pb
-	doexe openurl.sh || die "openurl.sh"
-	doexe bin/Linux/x86/quake4.x86 bin/Linux/x86/q4ded.x86 \
-		bin/Linux/x86/libgcc_s.so.1 bin/Linux/x86/libstdc++.so.* \
+	rm README~
+	doins *.txt README* q4icon.bmp us/version.info
+	doins -r pb || die "doins pb"
+	doexe openurl.sh || die "doexe openurl.sh"
+	doexe bin/Linux/x86/{*.x86,*.so*} \
 		|| die "doexe x86 exes/libs"
-	newexe bin/Linux/x86/libSDL-1.2.id.so.0 libSDL-1.2.so.0 || die "libSDL"
 
-	insinto ${dir}/q4base
+	insinto "${dir}"/q4base
 	doins q4base/* us/q4base/* || die "doins q4base"
 	if use dedicated
 	then
@@ -70,13 +69,16 @@
 
 	if use opengl || ! use dedicated
 	then
-		games_make_wrapper quake4 ./quake4.x86 "${dir}" "${dir}"
-		games_make_wrapper quake4-smp ./quake4smp.x86 "${dir}" "${dir}"
+		if use smp
+		then
+			games_make_wrapper quake4 ./quake4smp.x86 "${dir}" "${dir}"
+		else
+			games_make_wrapper quake4 ./quake4.x86 "${dir}" "${dir}"
+		fi
 #		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 quake4-smp "Quake IV (SMP)" /usr/share/pixmaps/quake4.bmp
 	fi
 
 	prepgamesdirs