Bumped EAPI to 5, adjusted deps for gx86-mulitlib, dropped opengl use flag and made USE=dedicated only install dedicated server as it should; tested fine as-is but did not have any maps to load to test gameplay itself.

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

3 files changed, 96 insertions, 8 deletions

diff --git a/games-fps/rtcwmp-demo/ChangeLog b/games-fps/rtcwmp-demo/ChangeLog
index 74a1e9b58c44..5ffbb06de0c8 100644
--- a/games-fps/rtcwmp-demo/ChangeLog
+++ b/games-fps/rtcwmp-demo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-fps/rtcwmp-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwmp-demo/ChangeLog,v 1.13 2012/12/21 21:30:29 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwmp-demo/ChangeLog,v 1.14 2014/07/09 22:23:25 axs Exp $
+
+*rtcwmp-demo-1.1-r1 (09 Jul 2014)
+
+  09 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +rtcwmp-demo-1.1-r1.ebuild:
+  Bumped EAPI to 5, adjusted deps for gx86-mulitlib, dropped opengl use flag and
+  made USE=dedicated only install dedicated server as it should; tested fine as-
+  is but did not have any maps to load to test gameplay itself.
 
   21 Dec 2012; Tupone Alfredo <tupone@gentoo.org> rtcwmp-demo-1.1.ebuild:
   Use QA_PREBUILT. Bug #429150 by Diego Elio Pettenò
@@ -50,4 +58,3 @@
   +files/rtcwmp-demo-ded.rc, +metadata.xml, +rtcwmp-demo-1.1.ebuild:
   Initial import. Ebuild by Alexander Nicolaysen Sornes
   <alex@thehandofagony.com>. Closing bug #115712.
-
diff --git a/games-fps/rtcwmp-demo/Manifest b/games-fps/rtcwmp-demo/Manifest
index 8d39baa4a326..69118e706248 100644
--- a/games-fps/rtcwmp-demo/Manifest
+++ b/games-fps/rtcwmp-demo/Manifest
@@ -3,13 +3,14 @@ Hash: SHA256
 
 AUX rtcwmp-demo-ded.rc 610 SHA256 9d1ccc384bf17e3699b4c29cbba2ca17dd7fafa97edf84974389434246beb38a SHA512 50fb67e981625db6fc1a77d25a85d086c336002de93ad8b71b49dc2c02364acdafc09b1686af3d14f2f2db2ef46c5fa054070fb110ecad83b52175d4707c6f76 WHIRLPOOL 789c0370877a32325d724793e6a587b5c3b10473430d6833626eb417ca12b08a2bacf499df4d050e8d47c9e96103440643a06080a9b95ad71960e0abbc901db9
 DIST wolfmpdemo-linux-1.1-MP.x86.run 69650634 SHA256 44638cf2d98db4ac583aa4878645e171a7c4b462b44961629aeb8d8d78188da8 SHA512 2e497ca8cb0552dfbc90bfd10544b44f0dca2b7dc74ad6428041fd9885926a03cfdae72d6e5ccbd61b0d0c5b051355c567a9101746838110ebeb0f3fdcaf3ad5 WHIRLPOOL 6087920c0d63f5060292adcb575fafb1113b82e9e8e1a557cf740c649dad7b54ae4fae44ce698ccdcfafa4749964ad174cd3731634235fa0f27ece375a67a5ca
+EBUILD rtcwmp-demo-1.1-r1.ebuild 2079 SHA256 d514db3d4eceaf2fac0aff9227ccafe8fa92d84787e8cf4975e6f698ce3ee187 SHA512 1ee9c2229b65b6b8a4d0f2b29e912b732dcdf11da95fcdfc07723081a563f7c1dff4da2e8248acdf5d36d9bf05c37786734ad580849f99f374458567e796e1de WHIRLPOOL 6bde914c55dcb0bd35cb682fd36be55dcfeac95dc847c5e7ba06ba19517235872201d2cbf06d8a68561d899214a45523c896495e2a0d96fb90b32927857f95ea
 EBUILD rtcwmp-demo-1.1.ebuild 2071 SHA256 38664171608b5d2c7c7e8c92e751c1e962d2308dc9841a2f41b292deb93853c8 SHA512 010fec7fdf259c1a7b552b5d4959970bd0304aff9105db594497038c1b160d4d8487e59a110d3d3dcb2ff26ca3abeae8d5f1ad624a5d69e7f1f1d516686bdf2f WHIRLPOOL 064d8954df2be300e0caa0c8ad114f2db68a48ff2c35242d9ea189fb7be989ca95fde9868cf19965cabe0fc10b577d2e304c52a05fa99fb33fb881e611f79afe
-MISC ChangeLog 2008 SHA256 83379cddf330fd3ff304e8e80be91edb366efa7db0844a094f552f27c0270bf8 SHA512 73454b18d99c15dc4b8b7e2c253d563456281e765b702bec900b40de7478108cf7e4920e75a7171f9c3683800a89de8a5b99071bf13b9c3d69b8ef3c2c880a9d WHIRLPOOL 788a771f4cb996dcccefcc1b5059fff19c3ffd791dea84206849be7f1f6ea7fa67d7a0b77c6e8931303d15a86b67d5fbcb8eeaf84767471fbfda0812557d2f74
+MISC ChangeLog 2353 SHA256 2af44e7f2e442e607e274f8fd7d29911c3c7306d3c8ec83bcfd6da799aec2507 SHA512 4fc816f9d502e22af1e67f6c9a65a43ebc5118146e1c1e59c3513bc08289cc2c48cf73b34e4c5aea5306e8e2e68cb1ae337d863aeddfb96fffa8507467d3234d WHIRLPOOL 3b9cbcbb1314344334fb83d69d1f327faf49aa8dcd03a06bde53534ca05a198f2dc4ada736b22e27dfbe792bdf1df9c5970b3de818d7f1749ee26d78731e3caa
 MISC metadata.xml 300 SHA256 c23e03ac8d15ec78ae34ae2d9faaf9c9581f39968fb4c7c833e54fc4af7a19f1 SHA512 e997379013ab9d322471f315cb8abcfef3db415dbaaaa4d6105ccf9f0b8461538cb4f571f6e527636679d844e03795e9ac968fb2cb4991c9501c00adff11c852 WHIRLPOOL f076d910bfee0c1f4e7bdd75e8d7f271367ac9969aa3d15519a1acf0f1336081f4f0c18a15d69a94bb6fc92b5b3bc1ee33b9cd6af87215b788558100aab01b40
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlDU1PsACgkQIY77eQFFFC1J5gCgrR4PhUcV91OKxgXVPB8+RWVt
-LPsAnRXFY2RbrEdLtzQnt1VEyGs/jQsS
-=kbxM
+iF4EAREIAAYFAlO9wNkACgkQ2ugaI38ACPANHAD8CAManq9Np7ZPOOwDUA1/Kk3O
+nJfum3B5E+I6N3Z+JdgBAI9ytSLbMYdK5kRrDtLXZivqJ9TRZyhYKLKSJ923zj8D
+=I5a0
 -----END PGP SIGNATURE-----
diff --git a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
new file mode 100644
index 000000000000..3d1e7a08a6f2
--- /dev/null
+++ b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r1.ebuild,v 1.1 2014/07/09 22:23:25 axs Exp $
+
+EAPI=5
+inherit eutils unpacker games
+
+MY_P="wolfmpdemo-linux-${PV}-MP.x86.run"
+
+DESCRIPTION="Return to Castle Wolfenstein - Multi-player demo"
+HOMEPAGE="http://games.activision.com/games/wolfenstein/"
+SRC_URI="mirror://idsoftware/wolf/linux/old/${MY_P}
+	mirror://3dgamers/returnwolfenstein/${MY_P}"
+
+LICENSE="RTCW GPL-2" # gpl for init script bug #425946
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="dedicated"
+RESTRICT="strip mirror"
+
+RDEPEND="sys-libs/glibc
+	amd64? ( sys-libs/glibc[multilib] )
+	dedicated? ( app-misc/screen )
+	!dedicated? ( || (
+		(
+			virtual/opengl
+			x11-libs/libX11
+			x11-libs/libXext
+		)
+		(
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		)
+	) )"
+
+QA_PREBUILT="${GAMES_PREFIX_OPT:1}/{PN}/*
+	${GAMES_PREFIX_OPT:1}/{PN}/demomain/*"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+src_install() {
+	insinto "${dir}"
+	doins -r demomain Docs
+	doins WolfMP.xpm
+	dodoc CHANGES QUICKSTART
+
+	exeinto "${dir}"
+	doexe bin/x86/wolfded.x86 openurl.sh
+	games_make_wrapper rtcwmp-demo-ded ./wolfded.x86 "${dir}" "${dir}"
+	newinitd "${FILESDIR}"/rtcwmp-demo-ded.rc rtcwmp-demo-ded
+	sed "s:GENTOO_DIR:${dir}:" "${ED}"/etc/init.d/rtcwmp-demo-ded || die
+
+	if ! use dedicated; then
+		doexe bin/x86/wolf.x86
+		games_make_wrapper rtcwmp-demo ./wolf.x86 "${dir}" "${dir}"
+		newicon WolfMP.xpm rtcwmp-demo.xpm
+		make_desktop_entry rtcwmp-demo "Return to Castle Wolfenstein (MP demo)" \
+			rtcwmp-demo.xpm
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "Install 'rtcwsp-demo' for single-player"
+	elog
+	if ! use dedicated; then
+		elog "Run 'rtcwmp-demo' for multi-player"
+		elog
+	fi
+	elog "Start a dedicated server with"
+	elog "'/etc/init.d/rtcwmp-demo-ded start'"
+	elog
+	elog "Start the server at boot with"
+	elog "'rc-update add rtcwmp-demo-ded default'"
+}