[QA] Remove old ebuild with dependency on removed emul-linux-x86-* packages, bug 552168.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

9 files changed, 48 insertions, 307 deletions

diff --git a/games-fps/doom3-demo/ChangeLog b/games-fps/doom3-demo/ChangeLog
index e16855c0626b..62735ce7b51f 100644
--- a/games-fps/doom3-demo/ChangeLog
+++ b/games-fps/doom3-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/doom3-demo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/ChangeLog,v 1.33 2015/06/14 19:38:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/ChangeLog,v 1.34 2015/06/18 15:07:12 ulm Exp $
+
+  18 Jun 2015; Ulrich Müller <ulm@gentoo.org> -doom3-demo-1.1.1286.ebuild:
+  [QA] Remove old ebuild with dependency on removed emul-linux-x86-* packages,
+  bug 552168.
 
   14 Jun 2015; Ulrich Müller <ulm@gentoo.org> doom3-demo-1.1.1286-r1.ebuild:
   [QA] Remove emul-linux-x86-* from dependencies.
diff --git a/games-fps/doom3-demo/Manifest b/games-fps/doom3-demo/Manifest
index b83b751f764b..45e32df08952 100644
--- a/games-fps/doom3-demo/Manifest
+++ b/games-fps/doom3-demo/Manifest
@@ -4,20 +4,19 @@ Hash: SHA256
 DIST doom3-linux-1.1.1286-demo.x86.run 485257318 SHA256 b42260fd08feb13c2f035a3746f8c1e3472151f0f781b8a2d1da231dae818083 SHA512 9eeada64b60ef06c8380411050ea794a863c9672578bf4593a35835c6d4b7dc5d0ba8e8cb5e5c46cbbdfd7410483e5f6321ac1393655f29b481aea99dc00b3db WHIRLPOOL 090ecbb4a049a6def58cedea831c4595026087bd6f5ae2920d7a82f269fa26972aad1b383e7a004cc7d9f131f66967b604a85230dddcd72ee5fb4a15938a58f1
 DIST doom3.png 6502 SHA256 c9a701498a7b0f923182bf9f11aac8d2193026e509ae3643a5bc118b1a458c6b SHA512 9a2b3831babbf3fa0d354e1a4a779c972676edbcc0b287de9b9f3eb830e0a00d557ba9645fbf0e58e07d5705efb0ef2b7ab96cd92493e2a0afc30c8842c0043b WHIRLPOOL e568cdcf3ea510b9865a4c1f1577713c6a63954a22e572311a321c8c73cf70ca68b76134d45a9f1c77e2d6b464ec29e098b7fe39ce1eb38889f83fc3c9bfc05f
 EBUILD doom3-demo-1.1.1286-r1.ebuild 1591 SHA256 ff7e26a1471ccb5f4110ffdefffa2e87a09ea593a1c87697a1f911905a69228d SHA512 ec99247690d8b68aa3bb8729c0c0c83dd48e523290b40eb227e5f69ee4428b36fb96ad1797247e3300b0c9a3eb909de30ececcf245c568c847e92fb30d4ead0f WHIRLPOOL 4ea3decdcb76831305c30cb4e81428cb749087b3e58565231106d2da8188e0de19870b5d644e519bd3b7f99ae2f96d9e237363e25be17e0d79ec526cd14e6e46
-EBUILD doom3-demo-1.1.1286.ebuild 1842 SHA256 7dfb857ae52f38243b993c4a43a5f8047b2a9bf16639b464afa552c02b38a6be SHA512 fc2e8706d4fa85bb90e5bdebc286e180657444d86dfedf469d011b2fafc1fc4ee73fbc566c27935668888ed702e869fdeaa5e33565a6c487974458ac53f0295f WHIRLPOOL dc6aed4a16bb6f88cb9e7d3420e80a978ee53b4ae9d30f5b52335d962be9d6e66f18f5ea8687b9ab58702c3bbce492b7217bf5dc247bb7aeac21e994252a8abe
-MISC ChangeLog 5289 SHA256 4597530b4eaf7d9748b495014235d5ead6829fee21793dceca4b4b0a23f9096f SHA512 a283c722f7758c1a07fe5e1d6cfe1f718d15e3d59288f4ea466a6fca0d14ea40ee40e69b1360c4f5cc27ecd46a3b80f8eed73b34e2b92e450ffaed13a1b24766 WHIRLPOOL 2316b8eb891065f9c0ec464ef725ae96cee9ba7a5a908458b00d59e36d7b1b74025a71912e731a60d6477230c29a5872280cb4d1b4417cb74888494241152acf
+MISC ChangeLog 5459 SHA256 0ac21c3b8d9969a82a7b38abb9db0ed5e5c96738fbffea05d1f1194884055010 SHA512 aa4022c546f451624a7d144a3bd7ea2a9fd07b9b837b8dbe68ed22ba577032d8817cadad2c955e9b9516579628f3080c5c06e9a4ede1c426d2b73bd24f4594e6 WHIRLPOOL 531a239b673289da44aa9c3526c86ad219ab6cdb054a3d5441c2154e9012dec11cba02d4e4830c166e4d9a72a8ed0448d053120a0cbca482bdff1c47225f00a7
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVfde6AAoJEJQzkH1pP7W4gHML/ikDaJqBpM3M83q/7ebEiKDt
-SJMa+/wCXjSKW2ttbMMKri0qp5bDfdyp6npEdKmSrUmsnpF7810susfF1bqpFMwJ
-687P0K7AjKogHSF0CYfeolOTkASCwnlJ/eFRDvDyb6GPVPjMH3GjlvchvTDwyj2B
-Q8PAlMv3HeS0nMym5p9i8ICEDKnWPr6LKdxngSUtanlfP7ZCqOxfmuhwquXjljSK
-piWorELeO6k0Z/5yjnvP6gKYodIER+gTpsqtuGVBmS+5zGaPfFMlvzronDu70XZR
-h9WWOOm8NmkV7WaoQo8desQ30xWj3wcytm9pm5xmF0ggNLF2rEyzgmXirj22s5M5
-2C4K7WFzX57h3beeVVmhRUlOmq/ogEiDUeltPYgS0d5pbAITr9kfUgK2uLCa4tQP
-9lsDbFxirfn2un6UCnamYwTPLHuhnut7jylNNkR7doeSmL+ErqeMTYTxW4hpTm37
-T5Tl4nRQTcTHXc0V0cyiCnl8sbtQTfEnGrA4wp6UEA==
-=ukKa
+iQGcBAEBCAAGBQJVgt4pAAoJEJQzkH1pP7W4owEL/iM3E2oTDZbqy8Xe3cCfoFNr
+g6skuNNIkxxXondbOI/A1pRaOQJ7f6fZU9r6m9dZysoXvHpIKXEcywOiZPvig+M5
+BNlvC82SRJoXSsxQzXwZzcgFm1A68qABvgzD0EKE9oEeKsGJxItTklbm54tzAE0o
+E+qeJwW7SBVKVqB8u8mzV1OKWb/j4yNcWXSK2rS0ixJ5csm9LsWHBqBR5VNZRpib
+QayFfcY65T+vkONDboK5tG4Qi3OXz1L9bFE0sSMDuBOzqqg/yJYZRiKKsR2IxNw0
+2RglUQTX6wTzqiO2gCeUep6mG6jdoirVq1ekAK4zWV1KZ3QPpPL1snDxCQ7JMT9W
+SjYx/28Gc8hihyXu/Ijt8VpnbG15AH6lDibXXgMc0jklcnTzPqn2YgzeSMzsmp/Z
+sQkjwIKcetP9VXx7fqf0g/uYq5OGsUHAMm934IG2lw5kewXkczTxwIFCvBmTMhaz
+61mwfHzLWZXPO4KkBcb7n43dpbIIfh+KHN41ejMdsQ==
+=hgw9
 -----END PGP SIGNATURE-----
diff --git a/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild b/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild
deleted file mode 100644
index c9f11c260f3d..000000000000
--- a/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild,v 1.24 2012/02/05 06:02:06 vapier Exp $
-
-inherit eutils unpacker games
-
-DESCRIPTION="Doom III - 3rd installment of the classic id 3D first-person shooter"
-HOMEPAGE="http://www.doom3.com/"
-SRC_URI="mirror://3dgamers/doom3/doom3-linux-${PV}-demo.x86.run
-	mirror://idsoftware/doom3/linux/doom3-linux-${PV}-demo.x86.run
-	mirror://gentoo/doom3.png"
-
-LICENSE="DOOM3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="opengl dedicated"
-RESTRICT="strip mirror"
-QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/${PN}/*"
-
-# Do not remove the amd64 dep unless you are POSITIVE that it is not necessary.
-# See bug #88227 for more.
-RDEPEND="opengl? ( virtual/opengl )
-	sys-libs/glibc
-	amd64? ( app-emulation/emul-linux-x86-xlibs
-		|| (
-			>=app-emulation/emul-linux-x86-xlibs-7.0
-			x11-drivers/nvidia-drivers
-			>=x11-drivers/ati-drivers-8.8.25-r1 ) )
-	dedicated? ( app-misc/screen )"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unpack_makeself doom3-linux-${PV}-demo.x86.run
-}
-
-src_install() {
-	dodir "${dir}"
-
-	insinto "${dir}"
-	doins License.txt README version.info
-	exeinto "${dir}"
-	doexe gamex86.so libgcc_s.so.1 libstdc++.so.5 || die "doexe libs"
-	if use amd64; then
-		doexe bin/Linux/amd64/doom.x86 || die "doexe doom.x86"
-	elif use x86; then
-		doexe bin/Linux/x86/doom.x86 || die "doexe doom"
-	else
-		die "Platform not supported"
-	fi
-
-	insinto "${dir}"/demo
-	doins demo/* || die "doins base"
-
-	newicon "${DISTDIR}"/doom3.png ${PN}.png
-
-	games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}"
-	make_desktop_entry ${PN} "Doom III (Demo)"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "To play the game run:"
-	elog " doom3-demo"
-}
diff --git a/games-fps/doom3/ChangeLog b/games-fps/doom3/ChangeLog
index c5d549b89120..2400314ca4dd 100644
--- a/games-fps/doom3/ChangeLog
+++ b/games-fps/doom3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/doom3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.43 2015/06/14 17:27:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.44 2015/06/18 15:06:44 ulm Exp $
+
+  18 Jun 2015; Ulrich Müller <ulm@gentoo.org> -doom3-1.3.1304.ebuild:
+  [QA] Remove old ebuild with dependency on removed emul-linux-x86-* packages,
+  bug 552168.
 
   14 Jun 2015; Ulrich Müller <ulm@gentoo.org> doom3-1.3.1304-r1.ebuild:
   [QA] Remove emul-linux-x86-* from dependencies.
diff --git a/games-fps/doom3/Manifest b/games-fps/doom3/Manifest
index be5f761cf46e..0c9b8cff4243 100644
--- a/games-fps/doom3/Manifest
+++ b/games-fps/doom3/Manifest
@@ -4,20 +4,19 @@ 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 2580 SHA256 6b72740d4187a1da419794441f7f40134194e7b015c0a6dc2e6f0af773db1046 SHA512 0943617ac9f1742db86432994137a36e152891cc3954830c001f07a83a1450f8c3d598ef6460d93abaa73c470ab5434b7ef2d2c1099ed112aede22cc832ddc21 WHIRLPOOL cf9c3fe8b7447314433b00b2f4da992b99021f021ff86f6021c9062c77e834db01c02bacb4b55bbdc343d6d2b95a155d0e73f2da099b2afdb6b71e72f48b6d48
-EBUILD doom3-1.3.1304.ebuild 2639 SHA256 cab2cf60045a878b329198ed8e3589d753e377992e025a32808eb71a2ba6561f SHA512 9b42f6a527f39f139f9da5ee24e0ec5254b4d9a34f94705dcee5dad10904062a07c4ef1e1e87ebe526b1169239f694e70150104a1b6484789ab6dde9d2f77eb5 WHIRLPOOL 4b319dba1f33eb39120416bea45d67b228e9ec9c19218bf99cedd6d3a7ede45787a0ecdf046465849a1b65c6230ee5f11a7bc4d1f0e26585a8ec58d20c3c9c8b
-MISC ChangeLog 7041 SHA256 4d4698fe50132090bacb8e097cb7bc3bf98bc202428a0f47b2182c2f2190e147 SHA512 8176d9ae1dfdb8a5d439d1267b7384f34a0094cc499a7e780ab65fb3d42d494805cb17d1757ab53e546483fed592a0b5ac66459022916c63a6d42a2d780c6ccd WHIRLPOOL 3929071d1fdfa325f666ec2702bafcb87c9648cdbcbc3c7056ec2a25664a7ae01908f790dff296d8e3476836f7c6cac781763541cdd81a851071a6a78a8c1598
+MISC ChangeLog 7206 SHA256 8b4faa9929c9aba443bdfccdd5653cd4469baa988ced25b343825d0a3cc0556f SHA512 72ee9c1e94e0be90db3591b04df562a642fdf6ac54d05dd6c10ab6be57e1fd155a9021b4428176e3197737e2c1f95e80b9e024b770463261ebf1d9c8089ddfb8 WHIRLPOOL 53116abc4c4dca64c2ea710de1213bce16496b817813264a98f30cfc03a1afff8ae9d1b99d6a205a097b0bf9281f90ce9fe16217a66dbbf977b859398ac7d2c1
 MISC metadata.xml 792 SHA256 0c19863526c455245d8f6aba66d092fcd76525b517769e22fae60890ce7c20bf SHA512 6cee41ba49042199003afb3e47d85d54762ac56b19195905ad6f8af43f46e2673b4aa3a8a8b1ef89d0d803029e2f97b7912e83398e3d55d1383fffeed6b94531 WHIRLPOOL 7a1bdac48fb4f4651919689485a08cec1c302e9dbcb3ebb1527cb6996cabdb3d0a31345192687282c6b42fbb21adee88d32a8b6c178e69ab3291d45dda0f7ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVfbknAAoJEJQzkH1pP7W46PsL/jlSKNUr1EVYNgXLwZB/oJBw
-WQqiNWQnvYgBwglRaoOT3krVtHQQ4eO7aN8YbIN9gaSFo9lur2/lEfUM7GHBwbJ2
-2Lds0lJ7+VLdirMnH4/ePoP7r8g7OMi4aWuCGVxX3zgNEnhDWxR6yhopIXOYNL5M
-NA+lkGMm7YHsNzKiK5zl0yK7Sbb3FRKKPP8+AZZYdExHdtaNk0a/haz2YRsRjpVR
-zhWbKcFBSPyyyPC+UOh+47FUELXv8vGpzv1rJjdPQ+hZa1M7scKpXs1XPTALilyw
-huFRkFF33tLL9O5qBi5wiMnSysq2fPcVxNu5hmJcHRwdle9HC2Fz3s+Yyw0FHcfi
-E4pzifQvLnTIZcpTasFqvLdYF7zakvMqu3DAasjfm3nPnHyj/km5mZ1nji7YRpc0
-FmjnnhXWwEuBRKlvZfJJvs3vtM2qbh5PYBzReFe8fB/7nlb10j2lP6CtEQFpeFpn
-5UZn7Dhq7A3cpZ4xXuI7dg2IVaHbiwmy+q0YSbjHHg==
-=6W9f
+iQGcBAEBCAAGBQJVgt4aAAoJEJQzkH1pP7W4IXQMAJ4pGJ0k+/yVw4CvChWyWxli
+diyI8Z+GTfRhwxo2Hl3IojmFYhCDkcHMAar+irvF9Uv9IyrYm/EIqXh0Qt2QJ0dF
+/alb8B5tPw/3VTMS5gFLbIAwq6Wx5bmuUvM8WXPmFrNEDQmzpnGsA9Wi5DjWCJnW
+zJ7YeARqrI3Bvvb14N4eUdT2br8xpc2WE6IOJdQosAUDRz3P3bPISCR3yUL1GzQ+
+T3xq5cDtxQ16/fyGAk/qcCzYaye4S6CeQZsNDy1nFiKfC77iPmdlhW4iilzQboup
+MYwyUHpHtObWo1xLOTafpneBB++DxzrVyQiYM7Mme0k/1q8GJDw9KIIPd9zjOAO2
+3OjjUDbkOtAZAlPsdVeBUIDg2XTOB0N5h5KQKTuVHNcdI1lnhQDZUCybinEAGFMt
+N/BN3q3KP7DZOexF1IGw+E1jG517CFuYMtzvn3O0O06rfIpL2iJu0AUJbfD2L+PL
+WwpCwgLTmbtn7/45F2cpKt7B7t2oRzY4Nu/ftyVpRw==
+=PJcB
 -----END PGP SIGNATURE-----
diff --git a/games-fps/doom3/doom3-1.3.1304.ebuild b/games-fps/doom3/doom3-1.3.1304.ebuild
deleted file mode 100644
index dd48ed925f19..000000000000
--- a/games-fps/doom3/doom3-1.3.1304.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.6 2012/02/05 06:02:13 vapier Exp $
-
-inherit eutils unpacker games
-
-MY_PV="1.3.1.1304"
-
-DESCRIPTION="3rd installment of the classic iD 3D first-person shooter"
-HOMEPAGE="http://www.doom3.com/"
-SRC_URI="mirror://idsoftware/doom3/linux/doom3-linux-${MY_PV}.x86.run
-	http://zerowing.idsoftware.com/linux/${PN}.png"
-
-LICENSE="DOOM3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdinstall dedicated opengl roe"
-RESTRICT="strip"
-
-DEPEND="app-arch/bzip2
-	app-arch/tar"
-RDEPEND="sys-libs/glibc
-	opengl? ( virtual/opengl )
-	alsa? ( >=media-libs/alsa-lib-1.0.6 )
-	cdinstall? (
-		>=games-fps/doom3-data-1.1.1282-r1
-		roe? ( games-fps/doom3-roe ) )
-	amd64? (
-		app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-soundlibs
-		|| (
-			>=app-emulation/emul-linux-x86-xlibs-7.0
-			x11-drivers/nvidia-drivers
-			>=x11-drivers/ati-drivers-8.8.25-r1 ) )"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-QA_TEXTRELS="${dir:1}/pb/pbcl.so
-	${dir:1}/pb/pbcls.so
-	${dir:1}/pb/pbag.so
-	${dir:1}/pb/pbsv.so
-	${dir:1}/pb/pbags.so"
-
-QA_EXECSTACK="${dir:1}/libgcc_s.so.1
-	${dir:1}/libstdc++.so.6
-	${dir:1}/doom.x86
-	${dir:1}/doomded.x86"
-
-src_unpack() {
-	unpack_makeself ${PN}-linux-${MY_PV}.x86.run
-}
-
-src_install() {
-	insinto "${dir}"
-	doins License.txt CHANGES README version.info ${PN}.png || die
-
-	exeinto "${dir}"
-	doexe *.so.? || die "doexe libs"
-	doexe openurl.sh || die "openurl.sh"
-
-	if use amd64 ; then
-		doexe bin/Linux/amd64/doom{,ded}.x86 || die "doexe amd64"
-	else
-		doexe bin/Linux/x86/doom{,ded}.x86 || die "doexe x86"
-	fi
-
-	doins -r base d3xp pb || die "doins 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
-
-	doicon "${DISTDIR}"/${PN}.png || die "doicon"
-	make_desktop_entry ${PN} "Doom III"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use cdinstall; then
-		elog "You need to copy pak000.pk4, pak001.pk4, pak002.pk4, pak003.pk4, and"
-		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
-			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
-
-	echo
-	elog "To play the game, run:"
-	elog " doom3"
-	echo
-}
diff --git a/games-fps/quake4-demo/ChangeLog b/games-fps/quake4-demo/ChangeLog
index 688abb6f1b65..8e7c3f7f5ee2 100644
--- a/games-fps/quake4-demo/ChangeLog
+++ b/games-fps/quake4-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake4-demo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/ChangeLog,v 1.21 2015/06/14 17:05:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/ChangeLog,v 1.22 2015/06/18 15:07:31 ulm Exp $
+
+  18 Jun 2015; Ulrich Müller <ulm@gentoo.org> -quake4-demo-1.0.ebuild:
+  [QA] Remove old ebuild with dependency on removed emul-linux-x86-* packages,
+  bug 552168.
 
   14 Jun 2015; Ulrich Müller <ulm@gentoo.org> quake4-demo-1.0-r1.ebuild:
   [QA] Remove emul-linux-x86-* from dependencies.
diff --git a/games-fps/quake4-demo/Manifest b/games-fps/quake4-demo/Manifest
index 0b5c908fd1f6..fe9daeac86ac 100644
--- a/games-fps/quake4-demo/Manifest
+++ b/games-fps/quake4-demo/Manifest
@@ -3,20 +3,19 @@ Hash: SHA256
 
 DIST quake4-linux-1.0-demo.x86.run 337276597 SHA256 69e69e8cb22dd1496bcc98dc63f244d35c516c2e770aba64c72275827814bc73 SHA512 c7fa64ca9f95ab61fd02f2d7d3a85c718a5dea9f60a89ba8b46e7500f090fe45bbe498775e41541e33a0bb3483b75da10529755bef3a97d3e362d1c173a02abe WHIRLPOOL 96103978541635dbc5c24718debbc0e2b631a54f2e61ed4960f6c73cc3c10309827c1be7f9d10994e69699956eca77c5ebfc20d612d9f7968cdb16068fcfb6dd
 EBUILD quake4-demo-1.0-r1.ebuild 2601 SHA256 3c889f42c59b90735b8587cf67ea6ac2930f525bd9c51b5c5311b3795a959b55 SHA512 b196ace343cabffc6b3a4d18fa7d0a03937220bd9c368a4f00ef3a5e2f279e44e7c471a7b6d695b8acc73eb462255822598c917e9d68bdac4330f9684c0c0702 WHIRLPOOL 56de61200da1fedb6e7ef55535e77e3ed807d12b9af1572fa2db1e0c8a2d1273964e530ba31163c6b02751c0ee3fa8e5a3b7a849219d2b71dab5a967252e0db2
-EBUILD quake4-demo-1.0.ebuild 2664 SHA256 02f83f2e2ff0d5bf7556643cbd7b4d6e13ea58772c0e449ef290dec3c8a5c493 SHA512 fe025809b7656ef6743fea85d2246c5a899fcc2ef16ffb972b25e04f3f3d3a72f676a3a8dfa93828f080498932719ffecb726cf569f799c4e52787aa6d9f61e8 WHIRLPOOL af1aa737109ec027441430048a5e374b75e27a44c0a94645690808384033263db98e0d8970fdd17b018c3026f254eb1a1d225cee601c836af231dea77c22eac5
-MISC ChangeLog 3248 SHA256 97b2f66e9b005c92d67439feace3df89f4adecc34fa63e6752372270cfc18e3e SHA512 696332f8bc446641419bdb26578c555f3be32a99948b278d45527b7b2a6f3f1512866b5e33f7afe09f477228d299b9d0051e9018cd2dcf21ce63f28001e2d23a WHIRLPOOL 17b8084e99b4e132539c999479935103b0155396cad35a2839af9aae1137e54194520c7911dc1a0cd7626972b545ebe6d186ba0dcd8c2416034a839677c78d84
+MISC ChangeLog 3414 SHA256 6388cbdb57b88a88b62d7114d9ca9aa3367100b75e950e7c2dd1badc252b7403 SHA512 7239581b3c93d9ff7b81357df04d76fdabd0c26840852761bc8192dd9a14af35002e7cf6b4687117aa0f263637f61ab53bb541c8587a55924043fa3f71ba625f WHIRLPOOL ee2c6e5df2686b46b61ed7e932ba9f82658781c92620ef57a071a4b396a022696a7de7f67fc10482874a1a60e95c00b8e36f2652e7c69c305e20364157ef1b90
 MISC metadata.xml 999 SHA256 b38d53e50b91acfd183e10a5baa7c340864b6ad7af43ec60876d5962853f89d9 SHA512 cb59ca037be148b4faa2e6221faeea1c1e4f0a94a3a0b72cfbd881f2b418d080d784efd192b32be4b9724c91ff62952c364ce649a3058e2761ed46b1b5e5141b WHIRLPOOL f108eb777a062027a1dac1afe0dd3f5125b3f6e8ac646cbf12910de4495d957ede82de69d245595bed9355c38e52ce6454ec381e480fe96757f0d7d2e9e3a093
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJVfbPnAAoJEJQzkH1pP7W4HzgL/0fGwujuOu9SsFCtOBe6ZlxR
-E7zbct46g8OABtfFZ7LcJhdR84jOw3j+IGVfrQfUGO9X1oZa2YImrZcLXAnsUtbF
-npbrtzCg+daEMZpYPK2knfkxKkUL0GDgn9pwLGXvtlsBqoESjQNvZpV/u0M5v8ga
-OyRB4RH+P+PxgWpp7ah8sIAfGQpBCEAgdQDUcZ0r4DvyCwGJrbirlMzCsfVCmZY3
-Rbra67HCmfHIrQMwGVmlT4SqsncUUr287tCrx0DVmJdGlxA2jLnOV3URt4kGEdaA
-bsv/Sp+cYJEj+XmGi2DRZkgIzkHG7pzCylC4c/hlg/gAevVPU1KeH8DstnS/T7l+
-tAmRdrh/l6axhRgtIJ0nOXj4+GFy4jyVkq3ruEIXzgNNnPpB28+mB9Fd76AEnmby
-2kHkRGmjlC1ahDIxZmTa4+h2/RXkdu2Fv06U1ADIaitulgfH2488y4NIzsbF+Fmk
-pFW7AueR4r26wrh6v9U0SVPIMvvspj2OPxEHXLQVZA==
-=rack
+iQGcBAEBCAAGBQJVgt48AAoJEJQzkH1pP7W4nFoL/30Jm4gjfXzfhEAkSvEsiQ2m
+9HSYmhg4NmQOxKTuSsmASpRLw5qe1VyghR55+dpvTKau5lU1X4+9qxcrL4HaQEEV
+KAI2aGfBz3hrHPq3yeUpMi5YXtwKbM9zyqRgowidnty1eo5lsC7QEbe7cKnrAccG
+L9/t+0l49SESOU1QG2B38kRIteq2qUPoagsm9DxBK7jblQJgw2DvebmYBuRcIPwA
+WSQLnJmSmvBMRZt8eZ++Jnj2MMgrlMvtze0DLc4vX1PhEBMiFu/dMqjbgEDSPlRI
+K1clY1MqgQKZOFhF81dsWAWK1b7kSYCeWtj4Fu2GETUk0LOAkPy9wYSLku8oH7w0
+u3J9EHHuBsMX+q3KpO1LCQrHf+BOgZjnVlY+1tEFh51+X4L2U2iq3wjtEq465cHU
+ByGasg7azV0FFmguW/Nzfg5RLq58/Q3H437GKh07rggu82Rh/xTVf5h/lPNhpyrA
+d2zEnb1k7mr9LB9yWYcmHZynk8bzc8lfrG5biyx6ww==
+=mmfS
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake4-demo/quake4-demo-1.0.ebuild b/games-fps/quake4-demo/quake4-demo-1.0.ebuild
deleted file mode 100644
index 092dfaa8ecdf..000000000000
--- a/games-fps/quake4-demo/quake4-demo-1.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.17 2012/02/08 23:18:01 vapier Exp $
-
-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="alsa opengl dedicated"
-RESTRICT="strip"
-QA_EXECSTACK_x86="${GAMES_PREFIX_OPT:1}/${PN}/*"
-
-UIDEPEND="virtual/opengl
-	x86? (
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		media-libs/libsdl )
-	amd64? (
-		app-emulation/emul-linux-x86-sdl
-		app-emulation/emul-linux-x86-xlibs
-		|| (
-			>=app-emulation/emul-linux-x86-xlibs-7.0
-			x11-drivers/nvidia-drivers
-			>=x11-drivers/ati-drivers-8.8.25-r1 ) )
-	alsa? ( >=media-libs/alsa-lib-1.0.6 )"
-
-RDEPEND="sys-libs/glibc
-	dedicated? ( app-misc/screen )
-	amd64? ( app-emulation/emul-linux-x86-baselibs )
-	opengl? ( ${UIDEPEND} )
-	!dedicated? ( !opengl? ( ${UIDEPEND} ) )"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_install() {
-	insinto "${dir}"
-	doins License.txt README q4icon.bmp version.info # CHANGES
-	exeinto "${dir}"
-	doexe openurl.sh || die "openurl.sh"
-	if use x86; then
-		doexe bin/Linux/x86/quake4.x86 bin/Linux/x86/q4ded.x86 \
-			bin/Linux/x86/libgcc_s.so.1 bin/Linux/x86/libstdc++.so.5 \
-			|| die "doexe x86 exes/libs"
-	elif use amd64; then
-		doexe bin/Linux/x86_64/quake4.x86 bin/Linux/x86_64/q4ded.x86 \
-			bin/Linux/x86_64/libgcc_s.so.1 bin/Linux/x86_64/libstdc++.so.5 \
-			|| die "doexe amd64 exes/libs"
-	else
-		die "Cannot copy executables!"
-	fi
-
-#	insinto "${dir}"/pb
-#	doins pb/* || die "doins pb"
-	insinto "${dir}"/q4base
-	if use dedicated
-	then
-		doins q4base/* || die "doins q4base"
-		games_make_wrapper quake4-ded ./q4ded.x86 "${dir}" "${dir}"
-	else
-		doins q4base/*.pk4 || die "doins q4base"
-	fi
-#	doins us/q4base/* || die "installing us/q4base/*"
-
-	if use opengl
-	then
-		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
-
-	elog "To play the game run:"
-	elog " quake4-demo"
-	echo
-}