Bumped EAPI to 5, adjusted deps for gx86-multilib, added s3tc support message and dep, made USE=dedicated install only the server as it should, ensured dedicated server does not collide with that from quake4-bin, dropped embedded libstdc++

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

3 files changed, 119 insertions, 22 deletions

diff --git a/games-fps/quake4-demo/ChangeLog b/games-fps/quake4-demo/ChangeLog
index d9738b40681f..c5869c802900 100644
--- a/games-fps/quake4-demo/ChangeLog
+++ b/games-fps/quake4-demo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-fps/quake4-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/ChangeLog,v 1.16 2012/02/08 23:18:01 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/ChangeLog,v 1.17 2014/07/09 19:57:50 axs Exp $
+
+*quake4-demo-1.0-r1 (09 Jul 2014)
+
+  09 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +quake4-demo-1.0-r1.ebuild:
+  Bumped EAPI to 5, adjusted deps for gx86-multilib, added s3tc support message
+  and dep, made USE=dedicated install only the server as it should, ensured
+  dedicated server does not collide with that from quake4-bin, dropped embedded
+  libstdc++
 
   08 Feb 2012; Mike Frysinger <vapier@gentoo.org> quake4-demo-1.0.ebuild:
   Move to new unpacker eclass for unpack_makeself.
@@ -64,4 +73,3 @@
   01 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> +metadata.xml,
   +quake4-demo-1.0.ebuild:
   Initial import.  Ebuild by me.
-
diff --git a/games-fps/quake4-demo/Manifest b/games-fps/quake4-demo/Manifest
index b60d25480a7d..c33e483108ed 100644
--- a/games-fps/quake4-demo/Manifest
+++ b/games-fps/quake4-demo/Manifest
@@ -1,24 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST quake4-linux-1.0-demo.x86.run 337276597 RMD160 7a4c37ee2384eef874c6549dacbd8be473fa167a SHA1 609c00ffdc1a638c472c62cc1ab3491b1e9e17fb SHA256 69e69e8cb22dd1496bcc98dc63f244d35c516c2e770aba64c72275827814bc73
-EBUILD quake4-demo-1.0.ebuild 2664 RMD160 2a742886955254e3dc59ab954b57baf01b6c136e SHA1 8f4e5c478f2e68a8ea8b8cbea0efbfd55ceacdcd SHA256 02f83f2e2ff0d5bf7556643cbd7b4d6e13ea58772c0e449ef290dec3c8a5c493
-MISC ChangeLog 2440 RMD160 576993cda44fb3d9f2780da347ae863a2e5fc1c0 SHA1 a5a22a77ba82b930051317a00de48bee7b52dc24 SHA256 fa628701833c9b26ced6fc2c156fb4827977dc3457b131881344b9eb1ad967a3
-MISC metadata.xml 999 RMD160 15aa8429dcf28e4f3902c4a3686991c5344dfc7b SHA1 c6b145af2f42935f35696bc3195bf9c0005642e0 SHA256 b38d53e50b91acfd183e10a5baa7c340864b6ad7af43ec60876d5962853f89d9
+DIST quake4-linux-1.0-demo.x86.run 337276597 SHA256 69e69e8cb22dd1496bcc98dc63f244d35c516c2e770aba64c72275827814bc73 SHA512 c7fa64ca9f95ab61fd02f2d7d3a85c718a5dea9f60a89ba8b46e7500f090fe45bbe498775e41541e33a0bb3483b75da10529755bef3a97d3e362d1c173a02abe WHIRLPOOL 96103978541635dbc5c24718debbc0e2b631a54f2e61ed4960f6c73cc3c10309827c1be7f9d10994e69699956eca77c5ebfc20d612d9f7968cdb16068fcfb6dd
+EBUILD quake4-demo-1.0-r1.ebuild 2887 SHA256 cc198eba1d38cd013d6d4080e0a70d65f586240db2b5a046e91818aaba4fa350 SHA512 f52b8460e9523b83f386af7ce93902fd73a3b729f1cba1bc2940ffcb8085b3b4df805e0bd044c149b0404f794d283eefe1836f30ab94b6ab8b60c240ef210d05 WHIRLPOOL a4e177c7f63e807c49bad86ef5a95da3953c12ff2ab3d919f80393015cc99939578218baaa6f7abd2ed18242922527f8214762ef70e3e54a0e50a87ce2da42e0
+EBUILD quake4-demo-1.0.ebuild 2664 SHA256 02f83f2e2ff0d5bf7556643cbd7b4d6e13ea58772c0e449ef290dec3c8a5c493 SHA512 fe025809b7656ef6743fea85d2246c5a899fcc2ef16ffb972b25e04f3f3d3a72f676a3a8dfa93828f080498932719ffecb726cf569f799c4e52787aa6d9f61e8 WHIRLPOOL af1aa737109ec027441430048a5e374b75e27a44c0a94645690808384033263db98e0d8970fdd17b018c3026f254eb1a1d225cee601c836af231dea77c22eac5
+MISC ChangeLog 2807 SHA256 5c26c764cb8a55ab5e6475b7af73e0d13813e2935aebf06b521dc950ec65fa4e SHA512 20bdf4fdf7e659735959124ffb72207fb213f545b9b553590d5bcc986f5f92166a1ca9d7524daf30e973b148cb5774bc5752e8a7888cc2fe7506cdaaa682725b WHIRLPOOL 70bdad3b00c8ad243b2e5bf57e4e84864592e19b4106d0412233088fa5b79b8a7a7101fc3abc9a7735266937e0f91dff4a01863b358c37995fa519a4b6991a5c
+MISC metadata.xml 999 SHA256 b38d53e50b91acfd183e10a5baa7c340864b6ad7af43ec60876d5962853f89d9 SHA512 cb59ca037be148b4faa2e6221faeea1c1e4f0a94a3a0b72cfbd881f2b418d080d784efd192b32be4b9724c91ff62952c364ce649a3058e2761ed46b1b5e5141b WHIRLPOOL f108eb777a062027a1dac1afe0dd3f5125b3f6e8ac646cbf12910de4495d957ede82de69d245595bed9355c38e52ce6454ec381e480fe96757f0d7d2e9e3a093
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPMwKxAAoJELEHsLL7fEFWRVQP+gOdZTAkuUkAXSL9SxZQ2D78
-1YA7/qYrRjCP9Rntf87mXJebCmYehzuV3hk3DKoj6Q2GbUS/Ri0X+DwIgGEC+jkb
-3rkxo6WDcxRNzRJ5HXwT+mF2FioeWo3CKfjG0QKamjiEqR1Qg/iUIGeTULOwXjov
-r2lrrs/UESu6WnkJLsWFwjlgMnvfZnPMfSF0OxLYQu4qqIEYdOo99Amanc/Yn5AR
-ICljkHDbjI8ifLhfdEPHmvVVEo87NgzANwWSLScDGVX8On4nff5Tqf7svd4IYXnN
-6UUY8cXyy611hayXCgZlSzHvGMnc3fBWc/FvSRgvTanC5wcwrN0rt6NwlVfS+vqG
-UjWLeUK1JvipNEsBxVuty5ZpnNygaiJ8RYOUQkeWM9JSRLb7UR77XiVn5I8/Zpjg
-Md/7lQcGyjWy6ggwlWgpvh68I74NyPQO1gnzZBjo6Uac51j0dp6IGgZYTEL1wDua
-998/omln10pbfjdr+6BWsk4DYS3eEaV2woQ36QmKCLqRzgWJLb1fLU6/3lOH7bmH
-4AIKdCtyMn+4g0MCCZh3dGLODVmY6xNDsJbl19h1TyPQrOCtCxQW5NgATqMpueQH
-ueRPQb1iFjh8soboXcSffoFl1+87hdjtvL4/osmpAvsNW8xaUfLfYU9y3a1r7tJ6
-ejzDncKRlqqYEtw+hWbm
-=u13c
+iF4EAREIAAYFAlO9nrsACgkQ2ugaI38ACPD6kAD+PzwOwIMN0SGtOXEntsbH05H2
+IH0dK/Zux5wQij5+mEUBAKAxXvGXMUgMCyx2ksB8/9dOCNIyDDI58BEVqngGswjQ
+=n4Oc
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild b/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild
new file mode 100644
index 000000000000..dbd609615ce1
--- /dev/null
+++ b/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/quake4-demo-1.0-r1.ebuild,v 1.1 2014/07/09 19:57:50 axs Exp $
+
+EAPI=5
+inherit eutils unpacker games
+
+MY_P="quake4-linux-${PV}-demo"
+DESCRIPTION="Sequel to Quake 2, an Id 3D first-person shooter"
+HOMEPAGE="http://www.quake4game.com/"
+SRC_URI="mirror://idsoftware/quake4/demo/${MY_P}.x86.run
+	http://www.3ddownloads.com/Action/Quake%204/Demos/${MY_P}.x86.run
+	mirror://3dgamers/quake4/${MY_P}.x86.run
+	http://filebase.gmpf.de/quake4/${MY_P}.x86.run
+	http://www.holarse.de/mirror/${MY_P}.x86.run
+	http://sonic-lux.net/data/mirror/quake4/${MY_P}.x86.run"
+
+LICENSE="QUAKE4"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="dedicated"
+RESTRICT="strip"
+
+# QUAKE4 NEEDS s3tc support, which can be obtained for OSS drivers via
+# media-libs/libtxc_dxtn and is built into the proprietary drivers.
+# depend optionally on them but elog too, in case a user has both
+# proprietary and OSS drivers installed and sees the segfault.
+
+RDEPEND="sys-libs/glibc
+	sys-libs/libstdc++-v3:5
+	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
+	dedicated? ( app-misc/screen )
+	!dedicated? (
+		|| (
+			>=media-libs/libtxc_dxtn-1.0.1-r1[abi_x86_32(-)]
+			x11-drivers/nvidia-drivers
+			>=x11-drivers/ati-drivers-8.8.25-r1
+		)
+		|| (
+			(
+				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)]
+			)
+			(
+				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+			)
+		)
+	)"
+
+S=${WORKDIR}
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+QA_EXECSTACK="${dir:1}/quake4.x86
+        ${dir:1}/q4ded.x86"
+
+src_install() {
+	insinto "${dir}"
+	doins License.txt q4icon.bmp version.info # CHANGES
+	dodoc README
+
+	exeinto "${dir}"
+	doexe openurl.sh bin/Linux/x86/q4ded.x86
+	games_make_wrapper ${PN}-ded ./q4ded.x86 "${dir}" "${dir}"
+
+	insinto "${dir}"/q4base
+	doins q4base/*
+#	doins us/q4base/* || die "installing us/q4base/*"
+
+	if ! use dedicated ; then
+		doexe bin/Linux/x86/quake4.x86
+		games_make_wrapper ${PN} ./quake4.x86 "${dir}" "${dir}"
+		newicon q4icon.bmp ${PN}.bmp || die "copying icon"
+		make_desktop_entry ${PN} "Quake IV (Demo)" /usr/share/applications/${PN}.bmp
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	if ! use dedicated; then
+		elog "To play the game run:"
+		elog " quake4-demo"
+		echo
+		elog "If you get a segmentation fault or an error regarding"
+		elog "'GL_EXT_texture_compression_s3tc', you can obtain the"
+		elog "necessary support for your mesa drivers by installing"
+		elog "media-libs/libtxc_dxtn (for abi_x86_32 if multilib)."
+		echo
+	fi
+	elog "To start the gameserver, run:"
+	elog " quake4-demo-ded"
+}