clean up app-emulation/emul-linux which has been removed

Package-Manager: portage-2.2.18/cvs/Linux x86_64

15 files changed, 80 insertions, 117 deletions

diff --git a/games-arcade/aquaria/ChangeLog b/games-arcade/aquaria/ChangeLog
index 5348a32befc7..1e5eedfaf622 100644
--- a/games-arcade/aquaria/ChangeLog
+++ b/games-arcade/aquaria/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/aquaria
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/aquaria/ChangeLog,v 1.8 2014/08/25 20:46:39 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/aquaria/ChangeLog,v 1.9 2015/06/01 21:44:39 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org> aquaria-1.1.3-r1.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   25 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org> -aquaria-1.1.3.ebuild:
   old
diff --git a/games-arcade/aquaria/Manifest b/games-arcade/aquaria/Manifest
index 4fa26f01631e..11fd3259b2ab 100644
--- a/games-arcade/aquaria/Manifest
+++ b/games-arcade/aquaria/Manifest
@@ -1,4 +1,4 @@
 DIST aquaria-lnx-humble-bundle.mojo.run 209499691 SHA256 1001a5bbc66cd72e64963afbb3f866432ca1b6e880d9da969ebd5fd224202fdd
-EBUILD aquaria-1.1.3-r1.ebuild 1259 SHA256 62924a15943e0fda3f930d22d3d2f21fca189a7cecf73d7a3f190a6daaa5f873 SHA512 4f33b8f4f0ff07eab76cb70d377a67dd2e8892d7b66ceb6594b0aed6db03936c85c10275fdabfee68b113e37222f15c6c304b6db1a71391c7f74ff7dab422311 WHIRLPOOL 902b48253f7f1f34763b65323e06a2e35edd6b5771a64e716addc04fb5f26ff1239d3d8d5fb8d9ca52e965be06d58d4a879a1dd86c84d21ce0b83e7366eb883b
-MISC ChangeLog 1372 SHA256 28db5565c1c793ac7dfc4264adea539632ee97f6d732455d4caa3fc46e5c96cb SHA512 3367066a1cd61ffdfac9bbcfcfa107928c14989148fa7b4d46ebc31b49fb3dd147a9d085d7a37c622670f6c993d360ba80fced17ec8a958d8748fb339f0cec98 WHIRLPOOL 0115cf0e6f7ce6c158febe73174e9b57da3dd96a6104af0349369e8ae375cc8471adc431e12a3583cf741f1f16ee77839f9ee167734a35c51756146295c2ca5c
+EBUILD aquaria-1.1.3-r1.ebuild 1189 SHA256 14bebb8826ac811f7a5d57eb450dfeb3ed13d94e73f4d616ac5ccc0d7fc50ed6 SHA512 1b9591d211e50de89311d4d4b4a3b45aa4e4ed65a559f941240668127199208571d253af0031ce34047057e2233ca67e5e450d5b06a6f6d1ccfb160f84272d56 WHIRLPOOL cce061f9525329c5c3942747ecfda99bdff1a08cc28b62209a3a76f3ad3f8f6e8770604cf9f92fbca6f6ac88cc67b77b1c732fae565a73bd4d6b836e19431aa7
+MISC ChangeLog 1512 SHA256 2045cbdbb3d0161cad715fc5f911d2b5489561401065c6388f0531b305fcb8c0 SHA512 be5904eac76b9fba605e91bcf48a15d61afb0c74462fd63c07c624bd62387b454c5458fa324ecd7faa1634005e68c32227231159ebaa3ad87836a62bb53df13f WHIRLPOOL b378806d60e077339d08da6eaae7daf517966a3bd376890b9c0e6589beb0f425f9db59b1ff4fdc53afaa0b81896355059bf71f228030bc3f11808335d4b9b17d
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild b/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild
index fc16a21584bc..ade13515ac8c 100644
--- a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild
+++ b/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild
@@ -1,9 +1,8 @@
-# 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-arcade/aquaria/aquaria-1.1.3-r1.ebuild,v 1.1 2014/06/26 18:51:54 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild,v 1.2 2015/06/01 21:44:39 mr_bones_ Exp $
 
 EAPI=5
-
 inherit unpacker eutils games
 
 DESCRIPTION="A 2D scroller set in a massive ocean world"
@@ -17,13 +16,9 @@ IUSE=""
 RESTRICT="strip fetch bindist"
 
 DEPEND="app-arch/unzip"
-RDEPEND="|| (
-	(
-		>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
-		>=media-libs/openal-1.15.1[abi_x86_32(-)]
-	)
-	amd64? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-)"
+RDEPEND="
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
+	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
 
 S=${WORKDIR}/data
 
diff --git a/games-arcade/barbarian-bin/ChangeLog b/games-arcade/barbarian-bin/ChangeLog
index 5102876114f1..9ae89b2b7bea 100644
--- a/games-arcade/barbarian-bin/ChangeLog
+++ b/games-arcade/barbarian-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/barbarian-bin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/barbarian-bin/ChangeLog,v 1.13 2015/02/05 03:48:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/barbarian-bin/ChangeLog,v 1.14 2015/06/01 21:43:44 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  barbarian-bin-1.01-r1.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   05 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
   -barbarian-bin-1.01.ebuild:
diff --git a/games-arcade/barbarian-bin/Manifest b/games-arcade/barbarian-bin/Manifest
index 3de2d24d0193..d2d67a4a0a51 100644
--- a/games-arcade/barbarian-bin/Manifest
+++ b/games-arcade/barbarian-bin/Manifest
@@ -1,4 +1,4 @@
 DIST barbarian101_linux.zip 925199 SHA256 0a559b2d930b9ceb54f32e5e1adc5be176290c025a2228d3372fa5bf413322c6 SHA512 9b46c75666359ed5102a89d29e8b6afacf07ccfa6175f6df27b5acc48b0e0119106f1c1376b124ff761d373bf04145e804659b81503b2834ba09ac05fad5c4f4 WHIRLPOOL a1e42954e52e1b26ad85b928ee92a9a137f982b194b5d0d71066be0428097b721d2d38bb78767edf5ecfaf4962046f38ff1a24f85fdf7ef4edd9f977e5f79562
-EBUILD barbarian-bin-1.01-r1.ebuild 1467 SHA256 8a77e664197aa6442c2f2342efdca3655856631b7ebe1f4c5089194b69ac3244 SHA512 910c74991f96aab47da71a2d873495d3390a772ba16e8e5409d0a4fce9eae56856e5f7b6e8cf77b81be8c4c711e336158b0e2ee871916931722f961c5f42f6d3 WHIRLPOOL 8167d74781e433c516f33d260327656be648375a435db972e6640c0923991b1f9527af51b500768e354a32c3d6581f291ab3185ac9b7db7201a62df40c4213b8
-MISC ChangeLog 2023 SHA256 b30c9e8da5ea1bbd59781a24bd39fe8840ec839e0e9775c6ad97a26b9d318e36 SHA512 5c3f4fbb18fdb5de97dbb8028615097d869345ce7526bb0502cb877de9da6221aa2c938ba64e97d337ec77683fb7cebd0dd164ce05ba35916263a8a6ea26436b WHIRLPOOL f02706eb946ae9b6fc7e7a3ee29e2951822bdba5af8c1d95d660ffa35ce0a75f347ddfc280cdcea411eac41254d0892c65131b53f172358094ad5500ed2dfc51
+EBUILD barbarian-bin-1.01-r1.ebuild 1373 SHA256 cdfa99ae25639065baa835917fe4c115e4c39b254a6ccede4115e454009bb7cc SHA512 4347d63f6bcd6c06a55f8800b2ff2fa156a2acb8dcfdbc4cdffe17a4931ffa6ff853f214f6d945d1b2d70de4f515ebb39fa31047f2bb0178485fa894f5ca8941 WHIRLPOOL ffcf5b3df7988353e011ec3b9b1e7909bb814790344b734b7b7c7822521a77cb842fc7b7bc2917546edad1896e166020f2cce8697a96a86f3f415dac243fe3f9
+MISC ChangeLog 2170 SHA256 ec9e825e76e3a26dc038941699dacb5056f4551b82c6b0c74e0bd8cf043383e0 SHA512 4a3a05525204a3fa80fa910597ff8c178793dc0bca789588a0208cde4abe5a9222876dfc4053dfd119554def1699566a2e8dda53a0a5af7116915f0074229c58 WHIRLPOOL deda9b2c7f0e8b68a0c5faa6c98716b6bb83941810fc2d879cfc8f6a5604aab1f39e9009f221c9b992994c494dc0af35b2f1fbf75d9d5a19b2ac5a652546b356
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
index 142f0157fcd1..8b53cae6283e 100644
--- a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
+++ b/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild,v 1.4 2015/02/01 11:40:26 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild,v 1.5 2015/06/01 21:43:44 mr_bones_ Exp $
 
 EAPI=5
-
 inherit eutils games
 
 MY_PN=${PN/-bin/}
@@ -20,10 +19,7 @@ IUSE=""
 DEPEND="app-arch/unzip"
 RDEPEND="sys-libs/libstdc++-v3:5
 	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-	|| (
-		>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
-		amd64? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-	)"
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]"
 
 game_dest="${GAMES_PREFIX_OPT}/${MY_PN}"
 QA_PREBUILT="${game_dest:1}/Barbarian"
@@ -32,7 +28,7 @@ S=${WORKDIR}
 
 src_install() {
 	dodir "${game_dest}"
-	cp -r gfx sounds "${D}${game_dest}/" || die "cp gfx sounds failed"
+	cp -r gfx sounds "${D}${game_dest}/" || die
 
 	exeinto "${game_dest}"
 	doexe Barbarian
diff --git a/games-arcade/dynamitejack/ChangeLog b/games-arcade/dynamitejack/ChangeLog
index ef35527b4399..a901032727a5 100644
--- a/games-arcade/dynamitejack/ChangeLog
+++ b/games-arcade/dynamitejack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/dynamitejack
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/dynamitejack/ChangeLog,v 1.10 2015/05/27 11:23:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/dynamitejack/ChangeLog,v 1.11 2015/06/01 21:41:33 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  dynamitejack-1.0.23-r1.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   27 May 2015; Agostino Sarubbo <ago@gentoo.org> dynamitejack-1.0.23-r1.ebuild:
   Stable for x86, wrt bug #539392
diff --git a/games-arcade/dynamitejack/Manifest b/games-arcade/dynamitejack/Manifest
index 675e10f0f77e..7800af5429e1 100644
--- a/games-arcade/dynamitejack/Manifest
+++ b/games-arcade/dynamitejack/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST dynamitejack-1.0.23.tgz 54195417 SHA256 aa5fbc27d6931753373e7af99a9521e335a4a5b38a7be0fc8e82c2191b3302e2 SHA512 57897194244ded8d41ef0e7704fd973a58fe52dbc01b7dceed2a47694f7cc3e75d732547532bc7be4dd7d510572dedb85188da413b5857f52182799427243c4d WHIRLPOOL 78d09068461ff8d11cb1a73ec94d160e085636f3d6f1933f0210b12505319c74a0d23daf66814fc23ad0c1c6e1a1dc6cb45adf783376d5573a949d5c3f9a1f4d
-EBUILD dynamitejack-1.0.23-r1.ebuild 2106 SHA256 ceec53ddc7922cc6c9d9c8213a017aa67ee87e66052f93c6b631298225ad4f64 SHA512 948263089a116b4766c977d686e60991f6430de01767c7635c008d4fbc1a1d176e6e82ae54faf4518893ce606738ce35294a2d5fb34f985436bc4248a4343c6d WHIRLPOOL d3e1cc7d460923653dd671550e6c6d64acdd9acc47bd057d511f606a7d105ff5444dd006be137cbc91e0d03de70a7d75103ff42e6c99c479bb7ace28ed1c9e67
-MISC ChangeLog 1529 SHA256 6ae74b060bcf4e61981a696eebe2cb8b631ff991ab6ad2cee293ccd96a4f9115 SHA512 b0d3df3cce57b4131aee29954a40deea2f62721670a51f4653c9ae7adf87767c359113a0afd072184b5213b02d849511108767ea7cd71367f1e90c14f375e555 WHIRLPOOL 3c17773c0959b003c3130427ebab42ed53b239cb71edae2ce8205ab2d7586c155fbb9116fabf29399e61b569322b33e8edc04d10e33057fa483d436811dd0654
+EBUILD dynamitejack-1.0.23-r1.ebuild 1848 SHA256 1ccdac4111aa3e8cfe1251435acf9b9265ce74e47b3d668602aa8861f8e6f9e1 SHA512 1cdbbb3db627b70ab10b132500450b2d313189efa04c2981e34561287d658c6aa792eadca3042c79fa18c1db8e408d1e1bc6924b5fb0d71a68dc542a76ab69b1 WHIRLPOOL 2acd05c132056a5de96be3bbbeeb80ca285d9e440c025c1eb81dc7f6ace63164ae610f82b3e2aeeed75f5f925e51be8dedb77e94de68f67f71b3842f9f58ac74
+MISC ChangeLog 1683 SHA256 8f4c2d79523f34dc8986285384b706ae393266325ab0799da5d983d6e8e40d30 SHA512 07fcb7434ef122b55b40f1616e8e077e6a0cda0819cfaec9bf56df3c94a1cbbdaa139b06ea872b36d58e4ad7b11032749da5440afe67582414732606573840f4 WHIRLPOOL 605c73e4cdb0b7839446ff66eed0a00d642be831ad42e1514383e822eb636cd2a2780b9a4e4cd80036765dc1681947614c1032700d4bbe35d80f32c1d66120b6
 MISC metadata.xml 160 SHA256 03e34b6506e114bf8eee720498f15d09a5344e83b766a45c59ee7ea1d633b38b SHA512 80110e2b6ef0090c930e59a08f8fc233483a32660cc6017b0ce74d9a6fb56ff8b45f2548d68af5773f7f2d746bd1a910c8c6b9ab369f8e1ffcee5bd5741a6c63 WHIRLPOOL fb75ede00e701e3ce31b5f7638062b35fdf47e0cc59eca112c82273c366a4b2aa9ad4063812373713212617a73127c75daa1c545655e8021fd96322ad2aed809
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVZalLAAoJELp701BxlEWfJdIQAKM/7nxhfxzqYVd0m1uQpRgC
-yQfd8BAJM8cGdRM09cItKP5ipp8FKxpqy/tgORNlXNE9Gn6iOXyHnEEkJdoVeZSi
-Is7pzINnWCLDubtfWaNTFLylYOdfFVTMSO7/Y0rRRDvJpxdnKPhnVDcRi/9Pi0S3
-FLISxe2EuObnasyc3D3RWlpX1HJBgxo+SiPRkwbdNIh6TQ2Hy8/2GWb1U4+IxrXd
-qbvBCpoEzVWEufLIyp/4tJkQg/KcVgwsoiGVGKqVWiMXkko818ob6zwEfsReUAwS
-ToABPJkfi4OdxrCVXoR6QrHnp3ZfmkjzEA+ReIRva7TYfFS39YgblVy00wNrmeQM
-hbKaQ6DdSkqcpfFEp/RUOfZjpamXQeTWMq1aQt2Ur0PnUjL62FjJI/POV5k3yBft
-9261qKmMk5i2kvCFZvMSI09q/DwoOErNbyspywLiJrDvP7dOvLFEGdn61N3/v1U5
-j9oWJa57/YVMIU5q1y7GjMmNhxJ1REFK07/Hzq9pwFBz30ai7TQSe+V3UcohaYLo
-FIrwMKWfgbYAoqrjT8icHI7V2Av7RDM/5BnIL2UvUlz/CS1VDMmG3FhqU5ZQQ0X7
-4krb37AJUvzIe8uBJCMKpOQ+d7zirwWw8P4180o6opCMbVIsmDLGsPYQ236N6Zyb
-ST0ZaVAfEGl4LHr32EQc
-=JwOd
------END PGP SIGNATURE-----
diff --git a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild b/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild
index ff65ce4fbb7c..fd5322a315d7 100644
--- a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild
+++ b/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild,v 1.3 2015/05/27 11:23:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild,v 1.4 2015/06/01 21:41:33 mr_bones_ Exp $
 
 # TODO: icon
 
 EAPI=5
-
 inherit eutils games
 
 DESCRIPTION="A stealth game with bombs in glorious 2D"
@@ -22,34 +21,25 @@ MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
 QA_PREBUILT="${MYGAMEDIR#/}/bin/*"
 
 # linked to pulseaudio
-RDEPEND="|| (
-	(
-		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-		>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-		>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
-		>=media-libs/libogg-1.3.0[abi_x86_32(-)]
-		>=media-libs/libsdl-1.2.15-r4[X,sound,joystick,opengl,video,abi_x86_32(-)]
-		>=media-libs/libsndfile-1.0.25[abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)]
-		>=virtual/glu-9.0-r1[abi_x86_32(-)]
-		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
-		>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
-		>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
-		>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-soundlibs[alsa,-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	)
-)"
+RDEPEND="
+	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+	>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
+	>=media-libs/libogg-1.3.0[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[X,sound,joystick,opengl,video,abi_x86_32(-)]
+	>=media-libs/libsndfile-1.0.25[abi_x86_32(-)]
+	>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
+	>=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)]
+	>=virtual/glu-9.0-r1[abi_x86_32(-)]
+	>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+	>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+	>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+	>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]"
 
 S=${WORKDIR}/${PN}
 
diff --git a/games-arcade/jardinains/ChangeLog b/games-arcade/jardinains/ChangeLog
index 94a542a9b956..408d7851950a 100644
--- a/games-arcade/jardinains/ChangeLog
+++ b/games-arcade/jardinains/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/jardinains
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/ChangeLog,v 1.13 2015/03/12 18:44:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/ChangeLog,v 1.14 2015/06/01 21:40:34 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org> jardinains-2.0-r1.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org> -jardinains-2.0.ebuild:
   old
diff --git a/games-arcade/jardinains/Manifest b/games-arcade/jardinains/Manifest
index 605222c0ca60..ecff2c16da6d 100644
--- a/games-arcade/jardinains/Manifest
+++ b/games-arcade/jardinains/Manifest
@@ -1,5 +1,5 @@
 AUX strings-pt.patch 8378 SHA256 353d4a2a8d4553e60ebf6a451e8f33334eb2dcab0fb16bd274493221f085eedb SHA512 ed7b93a0aea20d164f00aed1760fbf8ec775e3e9e65262099c4c16dcec1c91dc24f6ad845da43b4dba554237e5c8a95831a206dabb9847b57addae6c298e2dc4 WHIRLPOOL 5505fefb7b7a3516dd8e4a77d6cea8eb35c88db982be03cf5d38dab333dea309fa8168b08afee4dc611441d8978ded258b01aa9cee688979b8da54616b9ccfbb
 DIST JN2_1_FREE_LIN.tar.gz 17433159 SHA256 635eb4eb7813522e5d4ff737719c92c97d605712c3b1b94d5a32863889e949d8 SHA512 ddb6e48e071b42b7871cb6396c61fdf9bfb85e9bb9f88720e8ac1b7bff499c43784de6bf3f67d3fe61bc05ed0e3f6a24f646aa6c54e387b95e744c16525978e8 WHIRLPOOL 4d4a726afa60cc962d06b93fa0ea98523016e1831833eb4128dc9d218bd924a671d72d5fa5e902fc888c6518d3ecd72f44cd347633827337f8c9ebb0ec8eda85
-EBUILD jardinains-2.0-r1.ebuild 1917 SHA256 19a304740384e7a29fa71e3965b499184678fbc7087c78f60e7ebf8180379ff7 SHA512 69fea8b82ab52793c1f39d115880649f645d431c96b61bcbcb6b937956a2038afede1be543cae46a6b706a317514ced26c8ff33c938afc739a98c7345482c21b WHIRLPOOL 36f8b3c9860d684f0220279efff3ed9d8001812ec203e503b681254866fc16de5436cbbb12918c65f1d3d4bb9c0d6e45d3c50cca92792abd9f03e4118592687b
-MISC ChangeLog 1882 SHA256 c13d7cf17cd9e164ae137d58601bb219249c1c64c0d157c6a39df299d02bd55a SHA512 469ce29a70bcfcfbfcdd5c845eb5487ff25b6544a69b45012176f17280591fe2d14e50cd59e7159e011aa219819df8c0a447f48ec58a8b8d2d924a8ec7f95ba9 WHIRLPOOL bbac3fb1ef94cde8619da890ed23e3642cc2bba3cd42f1f4ad1e0ad9fe9c1ace3cf5fa7fd2e7c00315e6fd176ff6c7bb71f603b882735a15fa8ae7ce4a63e6c3
+EBUILD jardinains-2.0-r1.ebuild 1748 SHA256 0a0913bb96531444ebb5fb40a4043bce3ed7bd15cdaca48d16fea1f3ba6ae1b0 SHA512 979f6d592961701d03306bc321d7e50c0d734203f303d05b5e031ebfe0ee4b37901d1d406d99d624f00e4b54bb4ce425485631cfabd1ccd0f7590cb108c33b28 WHIRLPOOL 44d52a71d50b2960c0322d1467fcf5d2a350e6288020b158cfaff1053623e0ab23a2fe5c474809adb0a0a46e37a94c5afc2b5cd4965e0bce46d718edbdf4a193
+MISC ChangeLog 2023 SHA256 4bf495eb4203c48a1fbdadb1741e3873e711b4a705801201dfc646a4a954d480 SHA512 da2a5fc030f3506ef77d532834a1e761693878ff65dbf1f6bf0b1899e247c7611558dcb5204f516169545c6160e5c3f466f9377f78d7ed1f1705463af7801b90 WHIRLPOOL 8014acd11795b5a9c3ff605979d8143f9e90e932689f2f93903adee1aa07151a79406bf54e9aa2d24409471e57ea286aa13cdeaae6c1c332c965d0c1d18263b2
 MISC metadata.xml 526 SHA256 f9054c45fda980d7627f06c8bb3ad44e91f35e4c8314b7282a43b023ae866cc4 SHA512 b56e1b9e84ff546511ff0228b18053fb17523085fabd751aae2b0aabe14fadf868a9d884987752a211b0dc5032d6e8e474d987035ce2967c846a584bf5566320 WHIRLPOOL 4336e4be973b26a2627f2f06fe07cacb1be9c821102e1d130d82fc5718e2dc29ea0fe89b611086af819c2c2929c098566bff96ab16532242a6669709ce43a18f
diff --git a/games-arcade/jardinains/jardinains-2.0-r1.ebuild b/games-arcade/jardinains/jardinains-2.0-r1.ebuild
index 6fb1f612c231..befd3f8fdf32 100644
--- a/games-arcade/jardinains/jardinains-2.0-r1.ebuild
+++ b/games-arcade/jardinains/jardinains-2.0-r1.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-arcade/jardinains/jardinains-2.0-r1.ebuild,v 1.5 2015/02/25 15:57:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/jardinains/jardinains-2.0-r1.ebuild,v 1.6 2015/06/01 21:40:34 mr_bones_ Exp $
 
 EAPI=5
 inherit eutils games
@@ -19,26 +19,18 @@ QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/jardinains/jardinains"
 DEPEND=""
 RDEPEND="sys-libs/libstdc++-v3:5
 	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-	|| (
-		(
-			>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-			>=virtual/glu-9.0-r1[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
-		)
-		amd64? (
-			>=app-emulation/emul-linux-x86-xlibs-1.0-r1[-abi_x86_32(-)]
-			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-		)
-	)"
+	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+	>=virtual/glu-9.0-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]"
 
 dir=${GAMES_PREFIX_OPT}/${PN}
 QA_PREBUILT="${dir:1}/${PN}"
 
 src_unpack() {
 	unpack JN2_1_FREE_LIN.tar.gz
-	cd "${WORKDIR}"
-	mv "Jardinains 2!" ${P}
+	cd "${WORKDIR}" || die
+	mv "Jardinains 2!" ${P} || die
 }
 
 src_prepare() {
@@ -49,9 +41,9 @@ src_prepare() {
 
 src_install() {
 	exeinto "${dir}"
-	doexe jardinains || die
+	doexe jardinains
 	insinto "${dir}"
-	doins -r LICENSE.txt data help || die "doins failed"
+	doins -r LICENSE.txt data help
 
 	games_make_wrapper jardinains ./jardinains "${dir}" "${dir}"
 
@@ -66,6 +58,6 @@ pkg_postinst() {
 	games_pkg_postinst
 	elog "Due to the way this software is designed all user preferences for"
 	elog "graphics, audio and other in game data are shared among all users"
-	elog "of the computer. For that reason some files in the instalation   "
+	elog "of the computer. For that reason some files in the installation"
 	elog "folder are writable by any user in the games group."
 }
diff --git a/games-arcade/thinktanks-demo/ChangeLog b/games-arcade/thinktanks-demo/ChangeLog
index 64d52f29719e..9e7f1bde78a8 100644
--- a/games-arcade/thinktanks-demo/ChangeLog
+++ b/games-arcade/thinktanks-demo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/thinktanks-demo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/thinktanks-demo/ChangeLog,v 1.14 2015/02/05 03:58:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/thinktanks-demo/ChangeLog,v 1.15 2015/06/01 21:38:20 mr_bones_ Exp $
+
+  01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  thinktanks-demo-1.1-r2.ebuild:
+  clean up app-emulation/emul-linux which has been removed
 
   05 Feb 2015; Michael Sterrett <mr_bones_@gentoo.org>
   -thinktanks-demo-1.1-r1.ebuild:
diff --git a/games-arcade/thinktanks-demo/Manifest b/games-arcade/thinktanks-demo/Manifest
index 1f88e02260fc..58e21fc508a2 100644
--- a/games-arcade/thinktanks-demo/Manifest
+++ b/games-arcade/thinktanks-demo/Manifest
@@ -1,4 +1,4 @@
 DIST ThinkTanksDemo_v1.1.sh.bin 12115802 SHA256 07e485b936fe68d06b3b5a4fa89622fe94718ccbe0a15fad3df26969d77113d1 SHA512 9134c44c4e02df4bd7edbd3946125598c87dc3adbeff318f0b265dd2c5fbcebd49bd810d848cc5da29c86ad323fdb2c9adc0006b26680b0bd78b4d0de54419a1 WHIRLPOOL 0796f38af9a9c769265cf7508970093f1bda990c720c2a9d659c205921212793aae66b5f9ac516713101486c42be0bc13a911071893dd4a1d2634aff6d2b58ad
-EBUILD thinktanks-demo-1.1-r2.ebuild 1383 SHA256 efade022c8c224c5905db334debce60e2c5bffbd1c0db8a0ba05cf6757c998ad SHA512 008e34ed0d1e01d6524e14bca4d10d3de5fdcdb82943caa6f54c19109b3539db1b34bdfc4d327f60a9fbcb8f892788564944f2d7d6f48ad9f21ce64a7223ad7f WHIRLPOOL 3d4e763c131ccf58cfaa693f4f45d61d72ec6bdfeefe73bd38a651bd4912a0a61d793e10015e92e6046d7b834401d0c94ca62edf66acbda690e7256660a5fa26
-MISC ChangeLog 2435 SHA256 837aabe16c7be5a3f106faea945c3481e83ab18bde6515fdcba7ba813f8e9e3e SHA512 bb813d45165d35869777aa09215157eaaeea1e9fa155b33fa074b2d8cbd08b715d70e045141fa46c223f45d2b21dd91006a263f6befd801826e6377141ede044 WHIRLPOOL 2f37ffd377b082758afa97ca5c471ca0a65a999b1dd7f06111008bc98c8ac73bbaab869a29abca6efa74dd9e9e699947bf8cdf63ccfa97b8aa03b40ffd3c53dd
+EBUILD thinktanks-demo-1.1-r2.ebuild 1204 SHA256 ee835400f7bb512b573d91084d24f60c51935ccc77c9633e418b5104cec0d9b9 SHA512 c13fd2d1a316495d0ad7105b2ca0589c7cde77c90f972069b4233a5c041ed550345a0abfb8e3584fd5f7cdd839778208b64592aef9a8d33e470018906b060b55 WHIRLPOOL 96fa11f72eb27c75aead87e98e58a6f77e8a198e1b333882ade408e2a8aa3144e9cf353c044ae6122fdff379aa1d7e217cf691c95997e965f59634b777f3e1bd
+MISC ChangeLog 2583 SHA256 be542f7fb7a0f767e60e3c3add3dbb193582f8216da2916aba1d8780709c7ebd SHA512 382fa611e8bfa6f040ef8c520099abe939f8c8e71a63ce63c2074a8926ab00801201fc00cc4ef403466830ba337ef4059e80b88fedc07eadf7a2af44e3b82fc2 WHIRLPOOL 4651183cea456a04541fd8a528b6c6bd491d099cce0feb5cbaa69fdbad8ee049e4a84bb1f894c1e42940b2ce6877f1b7b89989cecb72230d2807cd120eecab19
 MISC metadata.xml 2252 SHA256 484b9c79b5a9ca3327978089e3b2d9486b98af3300910279d1cd392e0e000ab0 SHA512 af088558cc00a87c6d9443f0e2135b35bcd7fed424973f80ca3514bd9e00593e7df447ed327ca038a9d292a75652d1889a0f08ba58edbf91d70ef58ad00eba61 WHIRLPOOL 81e28dd79bbbde0827f1dce55301de4c9c16e620fc778f86827565925949cc5dcad66682b63bec1f16f7a29e2f3e9f119f93a6ba65c9cd0548d2def704746877
diff --git a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.ebuild b/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.ebuild
index f4af2e4daebb..b4df878ea4db 100644
--- a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.ebuild
+++ b/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.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-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.ebuild,v 1.3 2015/02/01 11:34:43 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r2.ebuild,v 1.4 2015/06/01 21:38:20 mr_bones_ Exp $
 
 EAPI=5
 inherit unpacker games
@@ -15,20 +15,12 @@ KEYWORDS="-* amd64 x86"
 IUSE=""
 RESTRICT="strip"
 
-DEPEND=""
-RDEPEND="|| (
-	(
-		media-libs/libsdl[video,joystick,abi_x86_32(-)]
-		media-libs/libogg[abi_x86_32(-)]
-		media-libs/libvorbis[abi_x86_32(-)]
-		x11-libs/libX11[abi_x86_32(-)]
-		x11-libs/libXext[abi_x86_32(-)]
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-		app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-	)
-)"
+RDEPEND="
+	media-libs/libsdl[video,joystick,abi_x86_32(-)]
+	media-libs/libogg[abi_x86_32(-)]
+	media-libs/libvorbis[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]"
 
 S=${WORKDIR}
 dir=${GAMES_PREFIX_OPT}/${PN}
@@ -38,7 +30,7 @@ QA_PREBUILT="${dir:1}/ThinkTanks.bin"
 src_install() {
 	dodir "${dir}" "${GAMES_BINDIR}"
 
-	tar -zxf ThinkTanks.tar.gz -C "${ED}/${dir}" || die "extracting ThinkTanks.tar.gz"
+	tar -zxf ThinkTanks.tar.gz -C "${ED}/${dir}" || die
 
 	exeinto "${dir}"
 	doexe bin/Linux/x86/thinktanksdemo