6 files changed, 42 insertions, 25 deletions
diff --git a/games-puzzle/xpired/ChangeLog b/games-puzzle/xpired/ChangeLog
index 669d94e6b96c..c0b81de00d61 100644
--- a/games-puzzle/xpired/ChangeLog
+++ b/games-puzzle/xpired/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/xpired
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpired/ChangeLog,v 1.8 2014/08/10 21:21:13 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpired/ChangeLog,v 1.9 2015/02/27 20:28:32 tupone Exp $
+
+  27 Feb 2015; Tupone Alfredo <tupone@gentoo.org> xpired-1.22.ebuild:
+  EAPI 5
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> xpired-1.22.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/games-puzzle/xpired/Manifest b/games-puzzle/xpired/Manifest
index 06f34bd17b47..a892a317900f 100644
--- a/games-puzzle/xpired/Manifest
+++ b/games-puzzle/xpired/Manifest
@@ -3,13 +3,13 @@ Hash: SHA256
 
 AUX xpired-1.22-ldflags.patch 868 SHA256 3c528e9d093c547bf68e77e6d9b9e881deaf4dd6a9c87318ee13c59f60ffc3b7 SHA512 81987d60466c459a98ac03b8f4bdf8da7c6004a716a83051b58ec35657ab3a93672305ff9a8edcf9e056784919c9ea235f81c71176bf6d4b75d5dabc72b1b7f9 WHIRLPOOL 18cfafd2ef2c82601fe02e5aa5fcd1482edf9b64f874982fd71e3b0ec46a65fa49d9841b64f38571c6089bdc83b98df200ed74c8218a3c4ffc74ef6420fc59eb
 DIST xpired-1.22-linux_source.tar.gz 478593 SHA256 7a2c0dd8bab0dc2b937684bbb3d213754921bf2d6bd891d9be00bf2db7bbb505 SHA512 08e506e6206be9346bde083a9cdd25a890c0100826a7fb2b515b60180cfd0b885712261db2e7a5d589078c0b74f2b9ad659b39d9378cb3dc92af111ab499ee10 WHIRLPOOL 166f0149290c7bcd3ae24d26152f502b157a84439c79fbcd4a34e425b857dc8965584e60c455de2b387427e3f89c841f5a52c7f1ae20ee02bc9d5c0e17d77e2a
-EBUILD xpired-1.22.ebuild 1008 SHA256 962c1515a202de77255a828d78aa455089a0b40a794d7fc55490172a5f1799f0 SHA512 9dd7ba8060e30b1ed95c613dbac1ba2891c6025b8044d77fe4a72269a6fff8565fb7f68ae1a1f21c7f3a7ed2b6ac907f09bbe139875740eb8f743c8d8125e940 WHIRLPOOL a2e414475fb7507d28fa0977ef41745bb01f9c31af43c6baf7e461e1e88e19e091ba0ca4117ae945b8067df54f270a576b34532b328b7fb4faadce7bb177a13e
-MISC ChangeLog 1103 SHA256 70f36a7cead010bed2b79ff587503c293988b3a88f3c8bd2f7664ca4a037eb9a SHA512 fd673e60b770d0f5cee36042eae7e9f6578054fe432a124feda1a54273ec7bcc5fc44ef95f899bb5b7532f28221ab41312162879666b3fe351fe7f89f739d2dd WHIRLPOOL d2b5c6ca88e9e5d3aa03bf334713117454562906ef353d4f625297709f401df276d8c8370cdda410f55b93e8c56ce17eb25690d3516c96b7c2c1c6ff0b295181
+EBUILD xpired-1.22.ebuild 1010 SHA256 d42f40f7cc0f527b397686c25cce04e3bca81a33081526a9e402effbac77115d SHA512 8a5bca09d64e12922ad057a57e6b9d1927f781e5ba40bf55e8a5f8257957df123572e927f7575f9ccccb2d246e2124a175fea09d01ed877041ffcbfcaf294891 WHIRLPOOL 062ae552cc871f33249a7aaf9ed8ac36ad28a9acf4914137d9fd58ada27fc33784cf6db3e3f200b995e10362891d711d2f12253364655b464ce94c1ae1eafa4b
+MISC ChangeLog 1183 SHA256 a500a4815c36ece446aaf434f0699eb6dab4820a02198d73646cc6950cf9aab3 SHA512 c9487c851413b30dcd33731774fcfa80badcee1f63964eef75d7c4be01606da47896f6f5bb9d5845625861468117b55a406c09f87f24a61db3a440042c0ab672 WHIRLPOOL dbc9fe869b821fe22eecd8d9aca268e0ff9d4965748ffda414f746559a81b45a386c56cc236593df28ba49bb5a0dc694cd07e18c52a7135367b8d8cf9c15e5ed
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn4koACgkQcaHudmEf86qZ6gCfQ+drdikcqTiePwOpPEAhN+rD
-aaYAnR8R+v2XvaTvKpln4D333be05Wtr
-=shkE
+iEYEAREIAAYFAlTw03EACgkQIY77eQFFFC18tgCeNwYS8dKfZaUIh7v4MCRICDYb
+a5cAnRJTlqw5JyEqMt45qxDBRuD0mb9S
+=iQwF
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/xpired/xpired-1.22.ebuild b/games-puzzle/xpired/xpired-1.22.ebuild
index c6c13618d67c..08832849a82e 100644
--- a/games-puzzle/xpired/xpired-1.22.ebuild
+++ b/games-puzzle/xpired/xpired-1.22.ebuild
@@ -1,8 +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-puzzle/xpired/xpired-1.22.ebuild,v 1.13 2014/08/10 21:21:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpired/xpired-1.22.ebuild,v 1.14 2015/02/27 20:28:32 tupone Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils games
 
 DESCRIPTION="A Sokoban-styled puzzle game with lots more action"
@@ -17,6 +17,7 @@ IUSE=""
 DEPEND="media-libs/sdl-gfx
 	media-libs/sdl-image[jpeg]
 	media-libs/sdl-mixer[mod]"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/src
 
@@ -25,15 +26,14 @@ PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
 src_compile() {
 	emake \
 		PREFIX=/usr/games \
-		SHARE_PREFIX=/usr/share/games/xpired \
-		|| die
+		SHARE_PREFIX=/usr/share/games/xpired
 }
 
 src_install() {
 	emake \
 		PREFIX="${D}/usr/games" \
 		SHARE_PREFIX="${D}/usr/share/games/${PN}" \
-		install || die
+		install
 	newicon img/icon.bmp ${PN}.bmp
 	make_desktop_entry xpired Xpired /usr/share/pixmaps/${PN}.bmp
 	make_desktop_entry xpiredit "Xpired Level Editor"
diff --git a/games-puzzle/xtris/ChangeLog b/games-puzzle/xtris/ChangeLog
index 1f0acdb6e3fc..ce4ff0888228 100644
--- a/games-puzzle/xtris/ChangeLog
+++ b/games-puzzle/xtris/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/xtris
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xtris/ChangeLog,v 1.8 2008/02/29 19:33:05 carlo Exp $
+# Copyright 2000-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xtris/ChangeLog,v 1.9 2015/02/27 20:31:36 tupone Exp $
+
+  27 Feb 2015; Tupone Alfredo <tupone@gentoo.org> xtris-1.15.ebuild:
+  EAPI 5
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> xtris-1.15.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-puzzle/xtris/Manifest b/games-puzzle/xtris/Manifest
index afe26efd086e..2a3a31dcfdfb 100644
--- a/games-puzzle/xtris/Manifest
+++ b/games-puzzle/xtris/Manifest
@@ -1,5 +1,15 @@
-AUX xtris.xpm 1403 RMD160 1d53fc85901b2858d8bfc538982d49c097e8eddc SHA1 5a64f0ee483cae85b474e63743aa2ba65fe614bd SHA256 60dc5ec114d394f6c9e7b69e93fad11213100148aa02ee51f7ba91f8f7500749
-DIST xtris-1.15.tar.gz 52130 RMD160 7d5fe32c8187e653fa40451e51c6ddd7fd58ab33 SHA1 157eb642ada6d72290acf3d4d2638ec04f8de878 SHA256 5791b30795382a18536201c95c686f62ade6975fc4e63c651bff36226c933d68
-EBUILD xtris-1.15.ebuild 921 RMD160 25c2bf27c40efae08c50c0bf45eb4b005dd6110b SHA1 a0346499fa46400456bf30e9ce4e0fe15cc4d4f9 SHA256 6e53247f8026ca32e8e92a86f6746a65739fe5be5b2d8881a2abf663f754b942
-MISC ChangeLog 1118 RMD160 4874748196da2ee25dde312260084f6eabc8a5cb SHA1 c01d0126e897339568c2c23cf47850a55ddae6b1 SHA256 ab0a37da8f7b80c28bd6fc912afba76dc3ba79b051ab69e58e307a613f986204
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xtris.xpm 1403 SHA256 60dc5ec114d394f6c9e7b69e93fad11213100148aa02ee51f7ba91f8f7500749 SHA512 1956a02d844b517df41a5cc82e236a04ec9609849c4d7b097af5bbb4b03c1e16bc8d6f0491c6cb1c8920bec578beab07381b15cee468079c5e474c80c07d30a3 WHIRLPOOL 6fa31269796c17ee7c61bf589b7733f19592adba71a5cb2cd321003ce3d75c54b38670c9584334acff35c1eee6add6295617179583cfd964870e601cf5ee9bed
+DIST xtris-1.15.tar.gz 52130 SHA256 5791b30795382a18536201c95c686f62ade6975fc4e63c651bff36226c933d68 SHA512 a5d5c32a7e1650561464f0fda08c7040ca0061e59b374359894e7f181a2e9dfece7f6bee6ed82295779f3e4ac8e7a607c668c31eeb017d6b641c1fe09dea4791 WHIRLPOOL 2a183a7eadc062fe658ca45b414067b117476386c47d3b9b4791fc32e0c35ada8ea2aa9dfb3928155c08ab29e1eaea86193c457d65b8248a7849fce45cda15fa
+EBUILD xtris-1.15.ebuild 896 SHA256 7b60da4d83f7ed0174fd301d4ec739448135841f30da434a6eca92011db60d3f SHA512 a7f3914ec2a891d05690428fa38af2ce4a977173579433139af2e8c06060ed3e680de0cdb556b53c5473aee8663e96ff8ccfbf7fc0ad98ddb83e1c0463079c89 WHIRLPOOL aa1421c6a6ef1578e2d14aacfe4d40213856cb270b767022f1302724e2f6bdd5ee3405f5f1a188d097c687fb1eb816bdc2416cd2afd28758874f1d32da376bc0
+MISC ChangeLog 1198 SHA256 e8ed319fc807e6f0a52e00bf155bb370829dbe814070779ec80943da7eb5181e SHA512 e25ec0ddd596d9801d5fc7161b5c608e66b6aad4f5b82116fc54131ebdb5de9ecceb07dde5264b1d2f3a0075aa52e27a99eb0c207f1086ad961b54cd2821c794 WHIRLPOOL 2e5eadb3a3e13c8db9b8bb3bc6dfc668f7079277e24e3dcb2efc7e95aeb4afd8f2ea3d9277359c63322fed7e725abe34dd1caede543cd1fd8522ca9b1d079c5c
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlTw1CkACgkQIY77eQFFFC2AHgCeLuapErifEfkHMPKYy+gjHdoR
+JrsAn1alNeFNf8oXnnOxN8MJl1to7ssx
+=JnFf
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/xtris/xtris-1.15.ebuild b/games-puzzle/xtris/xtris-1.15.ebuild
index 9e1b841182b2..6e90904293fe 100644
--- a/games-puzzle/xtris/xtris-1.15.ebuild
+++ b/games-puzzle/xtris/xtris-1.15.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xtris/xtris-1.15.ebuild,v 1.8 2008/02/29 19:33:05 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xtris/xtris-1.15.ebuild,v 1.9 2015/02/27 20:31:36 tupone Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs games
 
 DESCRIPTION="a networked Tetris-like game"
@@ -14,6 +15,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
 
@@ -23,12 +25,11 @@ src_compile() {
 		BINDIR="${GAMES_BINDIR}" \
 		MANDIR=/usr/share/man \
 		CFLAGS="${CFLAGS}" \
-		EXTRALIBS="${LDFLAGS}" \
-		|| die "emake failed"
+		EXTRALIBS="${LDFLAGS}"
 }
 
 src_install() {
-	dogamesbin xtris xtserv xtbot || die "dogamesbin failed"
+	dogamesbin xtris xtserv xtbot
 	doicon "${FILESDIR}"/${PN}.xpm
 	make_desktop_entry ${PN} xtris ${PN}
 	doman xtris.6 xtserv.6 xtbot.6