9 files changed, 69 insertions, 54 deletions
diff --git a/games-fps/ut2003-demo/ChangeLog b/games-fps/ut2003-demo/ChangeLog
index aa4f6396b3fe..f0e14209892d 100644
--- a/games-fps/ut2003-demo/ChangeLog
+++ b/games-fps/ut2003-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2003-demo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.32 2014/10/15 11:29:02 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.33 2015/06/14 18:16:56 ulm Exp $
+
+  14 Jun 2015; Ulrich Müller <ulm@gentoo.org> ut2003-demo-2206-r3.ebuild:
+  [QA] Remove emul-linux-x86-* from dependencies.
 
   15 Oct 2014; Pacho Ramos <pacho@gentoo.org> ut2003-demo-2206-r3.ebuild:
   Support multilib providers for deps. Bump to EAPI=5.
diff --git a/games-fps/ut2003-demo/Manifest b/games-fps/ut2003-demo/Manifest
index efc315ac56b3..fccd7b6f4115 100644
--- a/games-fps/ut2003-demo/Manifest
+++ b/games-fps/ut2003-demo/Manifest
@@ -8,13 +8,20 @@ AUX ut2003-demo 692 SHA256 a40b124f93f8f47c5823ddec5234eef4c249e7f488a69fbb0f094
 DIST UT2003CrashFix.zip 2764 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813 SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444 WHIRLPOOL ddea25bf472d5ca7f9c9dca1346820045504c10be90e914cd0c000a04c48ad4765e4b283a35cd91c2cb9f4cd8e1d2cabac660c2bfeccff05ecc42b1379242ff5
 DIST ut2003-demo-misc.tar.bz2 31851 SHA256 215a82cc4768c93a979771b1abf6250bcbe36be466d119df41acd041ac189ced SHA512 9a1e154aac7a8ccd043135e2a617a19203f6942e8e152d06ec8ed1e6877118cfb3ddbeab7ec2617670e26f13c0e394b8b8dbc747688b8b0b244a8c404f33d7f0 WHIRLPOOL 5597c0c4444de2e50cf87c23cbe4c863258da761645d41f4693a7aa774bb68cb8f8a4bf5c8b3b4e8a670f7c8ce616728d1223dd18b20c59fde60462e413db9f0
 DIST ut2003demo-lnx-2206.sh.bin 137253079 SHA256 e7664d20d6364e4f151199e3f7e111888abeb63e1d93146c88d932c6a2b94173 SHA512 8018d58999010c17198185838e42f7cbda0f55476f1e6065b4b2957db3652fe9c1af39ba65451565f54d41507413f4e0b1edf2678c9cc7c221f2ca278ec655be WHIRLPOOL b4bd520a60385d803d7d44247a48ca80a1116d9a3b9ea9f1dcdf2d1114bcc42e8705f00e228fe50fedc95d1d1c130ceaceb0c54210f51fb03da0672d13c35758
-EBUILD ut2003-demo-2206-r3.ebuild 3953 SHA256 c428ed5c68716ca21d5becb50ba7b92c7596088e84fd846c6b2df3a881368c6b SHA512 d38a922d9b856d324dff08743fede7320a44b021cc390ef882baa332f9a7610394bc5b31eb63fe0619a720956eec745dd37b52eadcdbcf614f3a27b2686080d0 WHIRLPOOL 37f952ec4c140d69584ee6ca95796bb84419cfbdcb5107f38d86b2840ae4bc5b9c35226e3fd64161ba5a6c64a35af4eea867e1f945d4cd2e447c05db9e27a9ef
-MISC ChangeLog 8142 SHA256 0029dabdc646284dfaf065f900dc1c58284a23eccff1bb461c569365776d5c33 SHA512 5d709fe2a2b5a48fd9be1d6349d4b6887a44f99193170cc8b8101f03692d9443de6fc22a3173da2b90f8e170161b75e9b278dfcaed176080a9b3dc329258befe WHIRLPOOL 1a3776abfaad92b7acb70d6780470c6f892c5ca48528fde4bde7808216b7a06148fba7a36d845944b9314002f53297ef274c5d0b11254cee7f236d316f600e8d
+EBUILD ut2003-demo-2206-r3.ebuild 3804 SHA256 277f05d199803cb709cb23deeddd0592a430f9483c12f52b8fae2cae211e4451 SHA512 466b65e4d568d93ec356db26f755590b15fa8133212274eeb5165fdc363cfb841164bf4b7776f07f550d25bd485bc224885316ca1af1836287354c1e24209ec1 WHIRLPOOL 1617d0bfa8cde9e03f6ada2f0db86be866cfef9b9490777f91abab218fb52b7ddcf8fa62038f2a952fb26d2612f71632693dd8366514d185f8dc18903eee21e2
+MISC ChangeLog 8266 SHA256 46607ae6eaf0b9f71b7570b485c665c82c20efa9f46088a012ede6b1752b8b26 SHA512 afadb78533216d83cd594550682ad6ea8b7f01d8d3c50086498236d92150944b58fe2fd76887868f7c4fa380cd68eb0c49641f5f13c8c44b2255f09bb3fd57ed WHIRLPOOL fdc23004daa4a9db1e320d26d141ed022f01f2e046e1fd81b606c96d6a1b28ed8f33c553ddb1f3ffb41a68cc867931b263758b136d3f2f34aa1c1a58210d46aa
 MISC metadata.xml 511 SHA256 2881e8831da5fa288ce13e4b425e921e01896b4a9bac421f612971f20712e9a4 SHA512 7afba1391583dab3c7d1e992811fac287ba52016e971884738abbad84986c035bad24c0adb244b1a6bb71fa7591a832ef16541800b773435f25190104c8fa0d7 WHIRLPOOL ab8ffdcfa073bcb9b6de9655122659f2ee5647f18cb5d9d23dc730625b06e065211ea6d0b78f20e409ad50d4a1269d8c5a005e681ea9180a034c6ce1e4531fe3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ+Wn8ACgkQCaWpQKGI+9T/wwCfYxi37XPw4vdBNlJbsTR3NuRu
-3lsAnRudBLFqUzBZHW3SW6h3qsY+qkz4
-=dGL7
+iQGcBAEBCAAGBQJVfcSiAAoJEJQzkH1pP7W4ptgL/iDmmyTNFL+hrL9Lqa+yC11a
+nHTMqeXOy9r9WMD39de7pgzlKIZyEjfUn/VrdM4gOV8Plp2BiEIrHGjAOKa98VuJ
+e3w1yFC4bCIN4OfjZxLG5ppT19WHtFyyUYqE5rtZKa6pMy2TEYHsmu9vRq4vbIP4
+KfV5ipJG4kdz3JLDU6i9+yM9qgu4PoctYpkgucC96/J5XmUIFhzjXW1t8PYDwbWs
+xUs50/2/T7YUbN7Mqt8zDmHW/rLFFvDO7aGvQPEMJt8NZ5lJDqPpAUsJZoTBi4SQ
+ULxTG0AiTwG6Ajchgr8nWkwpSxY6vbSRXcvEq7Lc+tpb56a0Qr3o+VjQF4eu0YmO
+K+jGQRUC9OkESxgSJC/Afby4AEN0eTrSh2hi4EOCny7HsVaKS6xNB7qfyNlkt1xU
+sTEt42sOQ502DXza6qZ29gN+R9iq+s8Y9W4KqqJE+eQYZwbOKtQF7cS2x+brgFNY
+jlgdtPDf10gasJROaG+vDv15thzJQbl+tvU7bX/Ddg==
+=LPYJ
 -----END PGP SIGNATURE-----
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index cd2615ca3b44..e221c05156a9 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.27 2014/10/15 11:29:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.28 2015/06/14 18:16:56 ulm Exp $
 
 EAPI=5
 
@@ -22,17 +22,9 @@ DEPEND="app-arch/unzip"
 RDEPEND="
 	sys-devel/bc
 	virtual/libstdc++:3.3
-	|| (
-		(
-			virtual/opengl[abi_x86_32(-)]
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
 "
 
 S=${WORKDIR}
diff --git a/games-fps/ut2003/ChangeLog b/games-fps/ut2003/ChangeLog
index 6d4793ea83c9..ef8942a319da 100644
--- a/games-fps/ut2003/ChangeLog
+++ b/games-fps/ut2003/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2003
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ChangeLog,v 1.50 2014/10/15 11:34:01 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ChangeLog,v 1.51 2015/06/14 18:15:46 ulm Exp $
+
+  14 Jun 2015; Ulrich Müller <ulm@gentoo.org> ut2003-2225-r4.ebuild:
+  [QA] Remove emul-linux-x86-* from dependencies.
 
   15 Oct 2014; Pacho Ramos <pacho@gentoo.org> ut2003-2225-r4.ebuild:
   Support multilib providers for deps. Bump to EAPI=5.
diff --git a/games-fps/ut2003/Manifest b/games-fps/ut2003/Manifest
index 9def897b7dfe..f4e82f60ba8c 100644
--- a/games-fps/ut2003/Manifest
+++ b/games-fps/ut2003/Manifest
@@ -2,13 +2,20 @@
 Hash: SHA256
 
 DIST ut2003lnx_patch2225.tar.tar 10039316 SHA256 0c2d851e39b4491698f6fb3aefb9bf83340de85085f3b670d93a8cba29aefec3 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d WHIRLPOOL dcdd705e9a69612d4672b38a00080063fca7a80123f7152fee8490018c080e0dbdbf7a74acf316f194d182acda2e6f092d1edcab56f4bc073df1f99e9b4832b0
-EBUILD ut2003-2225-r4.ebuild 2854 SHA256 9d6efcd6dfda9102e0f9650fc5e7cab94bcaa3e676d1f5ab2df741f6b0bddbdf SHA512 a522cb84628ae3a77c8b770a2201a23bed6b1099c4485968a2b4ef7dd73dc8e83e5973045011f8b452c8fc5fb0f9095a10ab10b2a31e9ce54adfc6bab41e72b7 WHIRLPOOL 0b1a1a9f8968e49f4a33e3196bb757722f6f7905d142c0823f782f2f155829aaa36d3925fec54ee8b3b964a5faa5f58c3ae9c0f314d4a11dc5b62a08861dab13
-MISC ChangeLog 7971 SHA256 20c8524ab8cbbf5ac6c99f6a17f41988df1dd209dc0bee08a7408f2e93570e3e SHA512 8ee10e04edf662539391a02ec422a5506903c25dcf84bb3742530b690389ce9f2d343f84bbb0d2de7ed77751d91a2861b08cbaadd91e460482781a49087b502d WHIRLPOOL ccc84d5bac70d175f8ffee2cec66e11bb60a1c42770a26741e5cacc70704c637f4ef7e6e1e78707358824a3df47c30df9cb0d805f48a4472a3dd62ec15554bda
+EBUILD ut2003-2225-r4.ebuild 2752 SHA256 2d631646934d60cf691d986878fd3c1e540472111c2fc75c71ce1c68bc866058 SHA512 c7f2bf899817cbd905fc6f49d0cd2681bb8b2f222b301282a45f9106fbe20ad75ee3612a7618b382f3fbbc43eb0ee0c05068d7115968182cd7768bb9517813e5 WHIRLPOOL 9d4ae9f9029ccdb0b27bc407f7bc4a6f229888f4025afecc78e722a06f507940c4dfe813560d8d5cd2c032c2a30c24625d94e4ef20eb5e1e314b7be3fb80e333
+MISC ChangeLog 8090 SHA256 e58c097222b6b8b41f49d789a9a225ef48f9cff3a4f4896a14a42b590fbc4469 SHA512 b9f6baa63a0187dd9f3a085b417497f1a962d55a8380b089d70c6d5ec1af62af98d17d5241b439008da36c21d19c1750a39b1e146061f1ad474303f4abca8c54 WHIRLPOOL e671af55da3e4003ecc4153e3ff4cb22e38134fbee42a891eda32a8369b22e39fe929d62be8e2adc4e32b6622c0c7fdad24e5e7ac64f7595fed4384d2b9ddfc7
 MISC metadata.xml 680 SHA256 d579438bd0fa2677691b542c2aebd87502cccb277a61c4fcad8b895cbeec28a6 SHA512 b1ceebd53c9f4f8508e2dbf53abf975cfd3adaa548637ea935da1fb5201aea7fecb911298ccede75e2b762bf13aab9036d4d8cd252c12965e011a4f72c86dcd9 WHIRLPOOL ea079c31dabbdab692d744d9d593ccf3fb9217cdc42055525ec34ddeb858b23613a9a510da3789b29916abcb758f7c64c5c1bc953e4ca8b3b642227d313d6d61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ+W6oACgkQCaWpQKGI+9SS0ACeJ0RiB2KkLQt7Va8c4q5Lzza6
-FgEAniCtjRzqVajq+xxQJeO85ghXMtK5
-=UO46
+iQGcBAEBCAAGBQJVfcRcAAoJEJQzkH1pP7W4rikMAJkYsb+giFK5lCXJxaLnqK8Y
+ICbx6UPk9J7ijSDSEIiPYtdWZtTO39VqB8zSa77x24fnqs4BUBlPbRJRKS/ucy5q
+ktbojBecUUpj378M2+0sJAIUrI/DOGOfMZV5wJjLWiNCSeqjxrA0AY6t0u+wS2Gq
+d4ot2dnPhcWlqxjPOE+12ca/bhepcoQ2ZId6Kqhvzcru5CiZJGU0ZktAQpHKwt7+
+P/WmIwx8K6h4/0JzQRHn4skU+PisCo8EO2AjcIONXzG18BUw3jaREhwbVTdoVlVe
+4IERpjWwwgBBBto2lYox1sQcmsnbY+ZCrKM3xTGFlu4sBVY3B3CXrTlF+ipgocyc
+3P0cLv9AVizZVda4PVhzS1hdem0S1uHTxw5LGDBJOkdev/Gc/DBy4kKd3KAdTgYq
+5NNepYp3eaaXyDF7M0MpRqYNI9kIN/msKjFJigo7kkQrHcF3QufOGBfp9eFAcwVC
+sWC7an0z66XONUyYeaTbu9ffShUFp4A2kTpvzuzoVw==
+=67gQ
 -----END PGP SIGNATURE-----
diff --git a/games-fps/ut2003/ut2003-2225-r4.ebuild b/games-fps/ut2003/ut2003-2225-r4.ebuild
index 33a0ce6b9b02..27d41b533f1f 100644
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.17 2014/10/15 11:34:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.18 2015/06/14 18:15:46 ulm Exp $
 
 EAPI=5
 
@@ -19,16 +19,7 @@ RESTRICT="strip"
 RDEPEND="
 	games-fps/ut2003-data
 	dedicated? ( games-server/ut2003-ded )
-	!dedicated? (
-		|| (
-			(
-				 virtual/opengl[abi_x86_32(-)]
-			)
-			amd64? (
-				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			)
-		)
-	)
+	!dedicated? ( virtual/opengl[abi_x86_32(-)] )
 "
 DEPEND=""
 
diff --git a/games-fps/ut2004-demo/ChangeLog b/games-fps/ut2004-demo/ChangeLog
index dd24faf6158d..f7455c4dc2f2 100644
--- a/games-fps/ut2004-demo/ChangeLog
+++ b/games-fps/ut2004-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2004-demo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.50 2015/03/26 23:09:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ChangeLog,v 1.51 2015/06/14 18:17:51 ulm Exp $
+
+  14 Jun 2015; Ulrich Müller <ulm@gentoo.org> ut2004-demo-3334.ebuild:
+  [QA] Remove emul-linux-x86-* from dependencies.
 
   26 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> ut2004-demo-3334.ebuild:
   remove unused empty dodir (bug #534584)
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
index 18ef333475f1..f143300e7793 100644
--- a/games-fps/ut2004-demo/Manifest
+++ b/games-fps/ut2004-demo/Manifest
@@ -1,4 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ut2004-lnx-demo3334.run 288950743 SHA256 c7065a758e91fdf5cf79cb8f9646e4360928ba9de4460ab7011c08e22a240cf3 SHA512 4cdd61901f4c082d1e02caf301a24f1e18e89f4efc9fbce0e4496178916b6c14245131b62f27deb17f1763cd4b8bf68ee60cc7af5ece5fa2b39d1bf349361da0 WHIRLPOOL 07749d100e601967ed581725290f67479252a4a5393b43d44037513776306432d20e1ed7cc05fa747be90cd04065eb3ba6484095d630c9ceea599d8f83b429a9
-EBUILD ut2004-demo-3334.ebuild 2134 SHA256 2f6b1daf4f7f37c850e4a7dc3867534bdaf93b78721b7b032d83d9f23610ed15 SHA512 d5364a9e1ca87f48661c0c7dbea4df37eee41b91770f61399f3d1dedb53b91f436eb69e771be8bb591db16db05c61c2126a5c808688f7743dc3e9d1c0bb08f53 WHIRLPOOL e74b2e8a6aceff3724188276248f92a41a77c096c6cb4ba6927c97f75f766ebfd7cdddfd6ff65dc0f1838fd5c72c985300f772fa00a61f46aca67d6e55665bd6
-MISC ChangeLog 5714 SHA256 dd374f58cc10eeb915dd465720f43f193c34931c706c093e306ee08358771e01 SHA512 fa0c86e9e9c56a96a30c2af753a29bd63a40a9843f84bab635aabef4ddd04b6332715b03fad7926765dca42692e42b46b717ca4b6796ac98b0db73e53e9f4b21 WHIRLPOOL 2a3394c05fe177211dc786b088e6e6ace560ee01982865bc7e369559ee2d2630e0d9ff57482979cad68aee52a017ee67907d8d42398649d1b3dfa88d1cedb8b9
+EBUILD ut2004-demo-3334.ebuild 1981 SHA256 d24c7f40870061f105e868dc44324b4f3825d8fe809ff3cb1be1b01f5b1e711c SHA512 1b95e0f0cd72a14557c03053e08316fbed8cb81d47f078ddeae656866f8ecdd0040bdcdebe337537d6f70317b69fe8a6632a69c698d8e80f81fa2ca71a5e3b63 WHIRLPOOL b2774ffacd9e88df36230c8318b1283fe5bccdaea33ef82e46983ff958f150b9d945e993368344134a72d2e0df32e37730e0ad15605d41b015378eb0cecf6fd2
+MISC ChangeLog 5831 SHA256 b31af3f9c125e940f4523b6b5e7fa06b2c1db5d378e61be3f3b46cdc233cc02e SHA512 6a48bb73e0f58b8cbcb63dd121d66ee786576d06cb4704a29ad2c045c41e1f59d2c5003045cf43c8ce946249b04a043229d4bf7cea45a188a9768627648e8910 WHIRLPOOL 8d49f123795a84021c9b4f49a0076551562e838c8bd9b09a04f2d00920295a3428ac0f651a08119148b78307522e862bdfcf30f5021fbc8e2739f35329b4af2e
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQGcBAEBCAAGBQJVfcTYAAoJEJQzkH1pP7W4l7cL/2cJm1XB9yzlqmSfi5j/hBgm
+Xh/YLbwiquWhbaZZc5yMlz7DntAuvs2ASQ1jQ5S2+9rDZQB+npNhOWHo7REc2D9U
+eCF3ui5Q5YIld8GJYVZqSPqOh4yzxYPTYAIYDdmRLzCWpHCua0lcLNaBWHcwzY0e
+hP1RftDRwfa5sQlaCFzpeu5zlMUjqQshBaEfgGqW1Cb2L8zmlifbmPvOfipnaSUI
+Wz7rUl3ZnY1PAL/WiOd9I3Y5FHnbxsyvA2LUpNfpL3QWim/7ZjtRZ6/vKz/0dCWS
+maZUnMGtYuZu60wgTah49heQLygSM3XMlDsb3JR2znAOmR6XcArZAIFf9sGLqKZL
+jruaa62WliU3R5owKsy73HXhz4mh73AgzynOQLBxaV1zDcp1DZflqFDYFSfZ7rDE
+wIMNEPfmltnfqGxaca1JmrdXoCEct9FrU+bBWJBPQ2WueUPp3677d4imfyqzGgwr
+4IB17trssb8TLjGNsmBM4o/cRMzd0RTeo14Cki+mgQ==
+=lJbA
+-----END PGP SIGNATURE-----
diff --git a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
index 2bdc18c72d8b..1094df525fc7 100644
--- a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
+++ b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3334.ebuild,v 1.24 2015/03/26 23:09:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-demo/ut2004-demo-3334.ebuild,v 1.25 2015/06/14 18:17:51 ulm Exp $
 
 EAPI=5
 inherit eutils unpacker games
@@ -19,17 +19,9 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	virtual/libstdc++:3.3
-	|| (
-		(
-			x11-libs/libX11[abi_x86_32(-)]
-			x11-libs/libXext[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-		)
-		amd64? (
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-		)
-	)
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
 "
 
 S=${WORKDIR}