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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

4 files changed, 43 insertions, 29 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/Manifest b/games-fps/doom3/Manifest
index 16f8d58b3b99..f1b6c1e16d65 100644
--- a/games-fps/doom3/Manifest
+++ b/games-fps/doom3/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 DIST doom3-linux-1.3.1.1304.x86.run 21145838 SHA256 2f90dff20f2d3c0c47f17b3d6d45c4f0e7d27b986bf6084f21b85180cd1e03b4 SHA512 f2a42478d84a6242a7982d1acd726b746596b7a13147acbd920d618223d6f52ab4c49aa7d7f07067674da2881372a181396a0bdd476e3956fb702c76eebb0d02 WHIRLPOOL e80d54176763c37ba21750dbd57cb02beec8cf3fe7d90916ee4024541966b14e7919fa41624dc9fabb44eb824cabcc862fefdf3e58316302a01042d5ee443382
 DIST doom3.png 6502 SHA256 c9a701498a7b0f923182bf9f11aac8d2193026e509ae3643a5bc118b1a458c6b SHA512 9a2b3831babbf3fa0d354e1a4a779c972676edbcc0b287de9b9f3eb830e0a00d557ba9645fbf0e58e07d5705efb0ef2b7ab96cd92493e2a0afc30c8842c0043b WHIRLPOOL e568cdcf3ea510b9865a4c1f1577713c6a63954a22e572311a321c8c73cf70ca68b76134d45a9f1c77e2d6b464ec29e098b7fe39ce1eb38889f83fc3c9bfc05f
-EBUILD doom3-1.3.1304-r1.ebuild 2543 SHA256 08286545b21dc0aa22d3b2aa8cf7bced8389732a8773ed5551aca6286844a286 SHA512 8dc5d092386a49e8e70b232cfe31fec85ef7da00814ef98d5f125e75781fa4bc9cf7e0a8b2dd1742069f96a1a901b6228dc07250ed26270878af26921de833d0 WHIRLPOOL d8a98e42bddb4110d2b6be8a2b5bf4ae3a19b2058b5e6282663248632d52e716c544782147745a7da91da2e4b1aaebff0e0283c8754ade1977bea030dd5e47bf
+EBUILD doom3-1.3.1304-r1.ebuild 2774 SHA256 28635e02ce3a79006aabccb5c8385f8872064920494ff2dde873d4f2fa19f2f5 SHA512 35e317627bc54128bad0b3ba0b06312aa9033cfa74e8b886d36253f9ee458b6546df6320e36f78eecea22fa33023dd6bcb394896fa4e09fa32be9b535c995369 WHIRLPOOL e9ce0e94cef09209b3da8822b22484800629b11ae73ed8967aa764d7caa49e570c222639cad25d4b6039d2b8f724d455e182e46d5380a8ef743f9c3622a0c6b1
 EBUILD doom3-1.3.1304.ebuild 2639 SHA256 cab2cf60045a878b329198ed8e3589d753e377992e025a32808eb71a2ba6561f SHA512 9b42f6a527f39f139f9da5ee24e0ec5254b4d9a34f94705dcee5dad10904062a07c4ef1e1e87ebe526b1169239f694e70150104a1b6484789ab6dde9d2f77eb5 WHIRLPOOL 4b319dba1f33eb39120416bea45d67b228e9ec9c19218bf99cedd6d3a7ede45787a0ecdf046465849a1b65c6230ee5f11a7bc4d1f0e26585a8ec58d20c3c9c8b
-MISC ChangeLog 6678 SHA256 d3c92590b55306b6b1ecb85b96544130f97c07018b584f355c645e6c091c081a SHA512 1c986d94d4ee88d2810418bb0d4e5e31bb9f4d1f78713baa5994ba68a604bd4cbe5b3c5888be78f27b9f242cf880969e27a64ddd72c9524c941c870463d63548 WHIRLPOOL 0992db01dcd2bb04a10860eaee61923f7313fd7fbdbf3587d624e2bce3a48a61b149b2d74a7d15d5c645bb49577869e39b02bcff0195ceeae0f2740e12b79f75
-MISC metadata.xml 718 SHA256 7014956fc4b0fe457f59438e7ef6a664167a59af9edfcf6d390c82f6e9121465 SHA512 0921ac965a285ca7dde2996f3b0b6cf90b653a1d098ef6f4b8d461edd67cb904af50b20389cdbc4a5f1f6c5dbbb20ab1d2e92e7c64bb5bbe3d2c54fcf21a428f WHIRLPOOL 85d400d40e26befae413e7585b4d389879d050dededecdafa92c50f4009bf373aebc5b58e315da2b6e7cff926fd5162a3a26081c1267157d05ab596df4e1131e
+MISC ChangeLog 6917 SHA256 179102712d6de8bde5ffa115bdf09bcae17ca62017382daa7f0d0dfd00a72b8d SHA512 0f4789fd5246659208a40c1d993a607773041df4c348d7ecaa4b718e2b87da3fb1a0fb94f0c9dbbc7bcc1eb7aa972afcf61fd979d814015396f8881bd603deff WHIRLPOOL d6692b87dc90853fc29916ec83c22cb7edd1bfbf5c7238afd4c41db07c6142082bfb9b7cc7e47f1aed3bebd036487f08e685cf7888442015f7c2028f628d6199
+MISC metadata.xml 792 SHA256 0c19863526c455245d8f6aba66d092fcd76525b517769e22fae60890ce7c20bf SHA512 6cee41ba49042199003afb3e47d85d54762ac56b19195905ad6f8af43f46e2673b4aa3a8a8b1ef89d0d803029e2f97b7912e83398e3d55d1383fffeed6b94531 WHIRLPOOL 7a1bdac48fb4f4651919689485a08cec1c302e9dbcb3ebb1527cb6996cabdb3d0a31345192687282c6b42fbb21adee88d32a8b6c178e69ab3291d45dda0f7ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlO10M0ACgkQ2ugaI38ACPBotQD/Qy8LPqHT2XfvQ95C2ZhtW3lF
-XWb1d1LpLhtwSf2DA+YA/i4WGVFR941vnMVqRDYJTnW6YRIsozVVcnOIvxn2QfyV
-=wCCD
+iF4EAREIAAYFAlO8XQUACgkQ2ugaI38ACPD2ogD9HgkfIaggfWrX9HXmqJpcaMso
+pCubJnpdhHHbBBbrKO4A/RhHzo9xHOxpszGB5L/9b8JqkF1hEf3nfvbf4lFY1xjO
+=E/0R
 -----END PGP SIGNATURE-----
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>