dropped opengl and alsa use flags as the deps are not actually optional; made USE=dedicated just install dedicated server as it should

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

3 files changed, 37 insertions, 23 deletions

diff --git a/games-fps/doom3/ChangeLog b/games-fps/doom3/ChangeLog
index 2a89e4e5cfa4..5172870c6284 100644
--- a/games-fps/doom3/ChangeLog
+++ b/games-fps/doom3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/doom3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.41 2014/07/03 21:53:21 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.42 2014/07/08 21:05:13 axs Exp $
+
+  08 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  doom3-1.3.1304-r1.ebuild, metadata.xml:
+  dropped opengl and alsa use flags as the deps are not actually optional; made
+  USE=dedicated just install dedicated server as it should
 
   03 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
   doom3-1.3.1304-r1.ebuild:
diff --git a/games-fps/doom3/doom3-1.3.1304-r1.ebuild b/games-fps/doom3/doom3-1.3.1304-r1.ebuild
index 3759686336fb..d3932121ba03 100644
--- a/games-fps/doom3/doom3-1.3.1304-r1.ebuild
+++ b/games-fps/doom3/doom3-1.3.1304-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v 1.2 2014/07/03 21:53:21 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1304-r1.ebuild,v 1.3 2014/07/08 21:05:13 axs Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -15,27 +15,25 @@ SRC_URI="mirror://idsoftware/doom3/linux/doom3-linux-${MY_PV}.x86.run
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa cdinstall dedicated opengl roe"
+IUSE="cdinstall dedicated roe"
 RESTRICT="strip"
 
 DEPEND="app-arch/bzip2
 	app-arch/tar"
 RDEPEND="sys-libs/glibc
 	amd64? ( sys-libs/glibc[multilib] )
-	|| (
+	!dedicated? ( || (
 		(
+			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
 			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+		)
+		(
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
 		)
-		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	)
-	opengl? ( || (
-		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-		app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-	) )
-	alsa? ( || (
-		>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-		app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
 	) )
 	cdinstall? (
 		>=games-fps/doom3-data-1.1.1282-r1
@@ -53,25 +51,31 @@ QA_TEXTRELS="${dir:1}/pb/pbcl.so
 QA_EXECSTACK="${dir:1}/doom.x86
 	${dir:1}/doomded.x86"
 
+pkg_pretend() {
+	if use dedicated; then
+		ewarn "${CATEGORY}/${PN}[dedicated] will only install the dedicated game server"
+	fi
+}
+
 src_unpack() {
 	unpack_makeself ${PN}-linux-${MY_PV}.x86.run
 }
 
 src_install() {
-	exeinto "${dir}"
-	doexe openurl.sh bin/Linux/x86/doom{,ded}.x86
-
 	insinto "${dir}"
 	doins License.txt CHANGES README version.info ${PN}.png
 	doins -r base d3xp pb
 
-	games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}"
-	if use dedicated ; then
-		games_make_wrapper ${PN}-ded ./doomded.x86 "${dir}" "${dir}"
-	fi
+	exeinto "${dir}"
+	doexe openurl.sh bin/Linux/x86/doomded.x86
+	if ! use dedicated; then
+		doexe bin/Linux/x86/doom.x86
 
-	doicon "${DISTDIR}"/${PN}.png || die "doicon"
-	make_desktop_entry ${PN} "Doom III"
+		games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}"
+		doicon "${DISTDIR}"/${PN}.png || die "doicon"
+		make_desktop_entry ${PN} "Doom III"
+	fi
+	games_make_wrapper ${PN}-ded ./doomded.x86 "${dir}" "${dir}"
 
 	prepgamesdirs
 }
@@ -84,16 +88,20 @@ pkg_postinst() {
 		elog "pak004.pk4 from either your installation media or your hard drive to"
 		elog "${dir}/base before running the game,"
 		elog "or 'emerge games-fps/doom3-data' to install from CD."
-		echo
 		if use roe ; then
+			echo
 			elog "To use the Resurrection of Evil expansion pack, you also need to copy"
 			elog "pak000.pk4 to ${dir}/d3xp from the RoE CD before running the game,"
 			elog "or 'emerge doom3-roe' to install from CD."
 		fi
 	fi
 
+	if ! use dedicated; then
 	echo
 	elog "To play the game, run:"
 	elog " doom3"
+	fi
 	echo
+	elog "To start the dedicated server, run:"
+	elog " doom3-ded"
 }
diff --git a/games-fps/doom3/metadata.xml b/games-fps/doom3/metadata.xml
index 8337c67142ca..3f1bc96b891a 100644
--- a/games-fps/doom3/metadata.xml
+++ b/games-fps/doom3/metadata.xml
@@ -11,6 +11,7 @@ frightening and gripping first person gaming experience ever created. For more
 information, checkout http://www.doom3.com
 </longdescription>
   <use>
+    <flag name='dedicated'>install only as a dedicated game server</flag>
     <flag name="roe">Adds support for the Resurrection of Evil expansion</flag>
   </use>
 </pkgmetadata>