--- /usr/portage/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild	2006-06-05 23:05:56.000000000 +0100
+++ quake2-icculus-0.16.1.ebuild	2006-06-21 22:33:07.000000000 +0100
@@ -5,30 +5,28 @@
 inherit eutils toolchain-funcs games
 
 MY_P="quake2-r${PV}"
-DESCRIPTION="The icculus.org linux port of iD's quake2 engine"
+DESCRIPTION="The icculus.org Linux port of iD's Quake 2 engine"
 HOMEPAGE="http://icculus.org/quake2/"
 SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
-	!noqmax? ( http://icculus.org/quake2/files/maxpak.pak )
+	qmax? ( http://icculus.org/quake2/files/maxpak.pak )
 	rogue? ( mirror://idsoftware/quake2/source/roguesrc320.shar.Z )
 	xatrix? ( mirror://idsoftware/quake2/source/xatrixsrc320.shar.Z )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
-IUSE="aalib alsa arts dedicated ipv6 joystick noqmax opengl rogue sdl svga X xatrix"
+IUSE="aalib alsa arts cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl svga X xatrix"
 
-RDEPEND="opengl? ( virtual/opengl )
-	svga? ( media-libs/svgalib )
-	sdl? ( media-libs/libsdl )
-	aalib? ( media-libs/aalib )
-	X? ( || (
-		( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm )
-		virtual/x11
-	) )
+UIDEPEND="aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	arts? ( kde-base/arts )
-	media-libs/jpeg"
-DEPEND="${RDEPEND}
+	opengl? ( virtual/opengl )
+	svga? ( media-libs/svgalib )
+	sdl? ( media-libs/libsdl )"
+RDEPEND="${UIDEPEND}
+	cdinstall? ( games-fps/quake2-data )
+	demo? ( games-fps/quake2-demodata )"
+DEPEND="${UIDEPEND}
 	X? ( || (
 		( x11-proto/xproto x11-proto/xextproto x11-proto/xf86dgaproto x11-proto/xf86vidmodeproto )
 		virtual/x11
@@ -38,6 +36,30 @@
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	games_pkg_setup
+
+	local alert_user
+
+	if ! use qmax && $( use opengl || use sdl ) ; then
+		einfo "The 'qmax' graphical improvements are recommended."
+		echo
+		alert_user=y
+	fi
+
+	if ! use sdl ; then
+		ewarn "The ALSA sound driver for this game is broken."
+		ewarn "The 'sdl' USE flag is recommended instead."
+		echo
+		alert_user=y
+	fi
+
+	if [[ -n "${alert_user}" ]] ; then
+		ebeep
+		epause
+	fi
+}
+
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd "${S}"
@@ -85,7 +107,7 @@
 	# rogue fails to build
 	local libsuffix
 	for BUILD_QMAX in YES NO ; do
-		use noqmax && [[ ${BUILD_QMAX} == "YES" ]] && continue
+		use qmax && [[ ${BUILD_QMAX} == "NO" ]] && continue
 		[[ ${BUILD_QMAX} == "YES" ]] \
 			&& libsuffix=-qmax \
 			|| libsuffix=
@@ -140,10 +162,10 @@
 		&& rm "${D}/${q2dir}"/sdlquake2
 
 	doicon "${FILESDIR}"/quake2.xpm
-	make_desktop_entry quake2 Quake2 quake2.xpm
+	make_desktop_entry quake2 "Quake 2" quake2.xpm
 
 	# q2max files
-	if ! use noqmax ; then
+	if use qmax ; then
 		dodir "${q2maxdir}"
 		cp -rf my-rel-YES/* "${D}/${q2maxdir}"/
 		newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax
@@ -164,7 +186,14 @@
 
 pkg_postinst() {
 	games_pkg_postinst
+
 	einfo "Go read /usr/share/doc/${PF}/README-postinstall.gz right now!"
-	einfo "It's important- This install is just the engine, you still need"
+	einfo "It's important - This install is just the engine, you still need"
 	einfo "the data paks. Go read."
+
+	if use demo && ! built_with_use "games-fps/quake2-demodata" symlink ; then
+		ewarn "To play the Quake 2 demo,"
+		ewarn "emerge games-fps/quake2-demodata with the 'symlink' USE flag."
+		echo
+	fi
 }