gentoo resync : 16.04.2018

17 files changed, 66 insertions, 121 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index e220233392b7..7c500a1a40f3 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
index 8527a6fada6e..88c3507409a8 100644
--- a/games-puzzle/amoebax/Manifest
+++ b/games-puzzle/amoebax/Manifest
@@ -1,5 +1,5 @@
-AUX amoebax-0.2.1-aclocal.patch 1532 BLAKE2B 3444d44488291d196015149e48f31e79eca0d6457fb878149215fbdb22175eda6e7d61c603537c063d8d97773dc4a937a3077c82a0564e390e8e245de8a214cc SHA512 d2bf1de8c773074eb7b69c188b3a8e242bc03bd6d80d770a1db8cd4fd5ac2cdd5bc96e807713211b19efd839df0344c8318f259cc2f95be3abd55a1523bb54f5
-AUX amoebax-0.2.1-compile.patch 223 BLAKE2B 092506bf019fe27799f6d144bf29097e2f040246a7f470885c0ebc24eefbbe20c8125dd326b099c8a46b346177ae1dadfb96415cc428c1e3de54acf41c957ae1 SHA512 90fccf04bf3567c5f5773870c447e331b15a0d275a95eddca3c911fffbd7fe580aa1441a009bf0667fb2279e56e9d2c425c3070c24692dc4acc7f719ab052c72
+AUX amoebax-0.2.1-aclocal.patch 1536 BLAKE2B bb83bfc7e254ca1f649a735121ba8f9bc71abe35c7c935083d50682ee7cbd77b6eeb5f87ac35b5235f46d5abf8b0a995796548401ed2b943b3acf374bd6e18d9 SHA512 f5f501b0bbe76902c65d404e7aebf830d84c329cf8d84ee5c769660bb4a30cbfbae9a0e16eb2697bd693de77ef38811ac52e68fe799add00b97292c2e79a2d27
+AUX amoebax-0.2.1-compile.patch 227 BLAKE2B de56259f5d58fd3509b2fe2b6d51e7ecd3bdebee4196d03ca3529a24e10123f005529b6e0e9fb434a45c7a8caaaf8197ce9e730276bd3631ad5e3c1b47df2ffc SHA512 fe6b2b3b7d61f5548fc9959dce491e25cdf51313bc46141615e3ea5e96edff34084ac8294b0b8ddace6dc6a374a02cd173e3a4308cb9d56018535f62dfa6defe
 DIST amoebax-0.2.1.tar.bz2 10645579 BLAKE2B 0e8f5d5bb92dd20444bfcb735fdc28142bc359676e057471089b94a6df8a8b45cdecdb1462022909f025310fbc9da1946a50a4d716aa75e34ffc71b4fbc8cfbe SHA512 f8cd20cb35e2456487f55ebc89411ebd47b25cf549d35c36041a27e1d96ef30702151f303dbb457afbf8583f67c53143c30becdea00a26fddad20555e0c7d181
-EBUILD amoebax-0.2.1.ebuild 983 BLAKE2B cc743065a7864fb1c15b1a0e553583253680c18ecef32ff66f2321c4fc28d4440c324763ddb68f03b80d2df486155ac37b0472c44fff0e1a3eb21372a6e724a5 SHA512 468fabe4342c3550545aec163b4de716777dbbb5e353cb79beb06d3287c65d16772edfc29465589961c4c846941aa55f1a422442507155fd6280b93bb7b16a45
+EBUILD amoebax-0.2.1-r1.ebuild 937 BLAKE2B 796983bbdbe49edcb964bc15095e2a049599ec0f523223277f124c42d3310369d176738ec99ab0834a063585b4e34134aed72cd005d96ab4b7da06a43fe27bdb SHA512 5f7de2cdf5fe0f91b32f012f61f8d3cd8a589e88dcf70d44b4139372e6e0df4541188c71e4bb3c1d4ec90fd1ee427ac91129802514587c9f95e7533c9c7c9ea3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/amoebax/amoebax-0.2.1.ebuild b/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild
index 687f1d8f9057..316d438bcddd 100644
--- a/games-puzzle/amoebax/amoebax-0.2.1.ebuild
+++ b/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils games
+EAPI=6
+inherit autotools
 
-DESCRIPTION="a cute and addictive action-puzzle game, similar to tetris"
+DESCRIPTION="A cute and addictive action-puzzle game, similar to tetris"
 HOMEPAGE="http://www.emma-soft.com/games/amoebax/"
 SRC_URI="http://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2"
 
@@ -19,7 +19,9 @@ DEPEND="media-libs/libsdl[sound,joystick,video]
 RDEPEND=${DEPEND}
 
 src_prepare() {
-	epatch \
+	default
+
+	eapply \
 		"${FILESDIR}"/${P}-aclocal.patch \
 		"${FILESDIR}"/${P}-compile.patch
 
@@ -36,8 +38,3 @@ src_prepare() {
 		data/amoebax.desktop || die
 	AT_M4DIR=m4 eautoreconf
 }
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
index 4cafc8d44de8..11d903516c19 100644
--- a/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
+++ b/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
@@ -1,5 +1,5 @@
---- m4/objc.m4.old
-+++ m4/objc.m4
+--- a/m4/objc.m4.old
++++ b/m4/objc.m4
 @@ -448,32 +448,32 @@
  
  # AC_LANG_SOURCE(Objective C)(BODY)
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
index 79c66a8c95b8..6be301674149 100644
--- a/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
+++ b/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
@@ -1,5 +1,5 @@
---- src/binreloc.cxx
-+++ src/binreloc.cxx
+--- a/src/binreloc.cxx
++++ b/src/binreloc.cxx
 @@ -739,7 +739,8 @@
  char *
  br_dirname (const char *path)
diff --git a/games-puzzle/arrows/Manifest b/games-puzzle/arrows/Manifest
index e28c70664e2e..14cbc0307882 100644
--- a/games-puzzle/arrows/Manifest
+++ b/games-puzzle/arrows/Manifest
@@ -1,3 +1,3 @@
 DIST arrows-0.6.tar.gz 53374 BLAKE2B ba31d4ef1bc6e48ada197a13a359004a661a6dcf8875933da2a74f57ad90c3b0d422fd4c2427c4eb340fb26870952ebaa679ff8b0f88d7470f012bc3b8c0f868 SHA512 f6c55d616283ad25d9d830440deaa11de81bccfc2d8eabe627104626ea111d986e522f73d61e5aed58476cc34a3e2b3fe2a20ab1538b7ecef04ecb941f34d83e
-EBUILD arrows-0.6.ebuild 930 BLAKE2B 913b8955e2c7577c1541aae747d8ae3d18d4cc592e2cf44b5bca4f1c3a5c24dbbe7acabaf7abf963af21e8453a0bf3b1988ca6a3cf9593d5f7101e4e8702acfc SHA512 e35045325188f8019c696414f65f98d541c8ac47692f791e82b5895180ce1b9016f661e8d179938919e957b22d3f5e38c35d4931b1f572d784aaf938de4663f2
+EBUILD arrows-0.6-r1.ebuild 895 BLAKE2B 2aab21a3b6e89451fe1972cd0eace456542641a47bde688958ee0602c75bce6b1fde432603c17c41e97ece3535a71eea7ad4da586dfce99928c4dac224e6e15e SHA512 bf8e71f225251531348c42b99cbd2718a9c68975e26f66f5b8ca16418f0efe4c0664bf00c7d86986d1e3bbc5fef344d413ba824ea03ea2b7131a29278c00d9cc
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/arrows/arrows-0.6.ebuild b/games-puzzle/arrows/arrows-0.6-r1.ebuild
index 33023848a4c7..5e3b5c6834b5 100644
--- a/games-puzzle/arrows/arrows-0.6.ebuild
+++ b/games-puzzle/arrows/arrows-0.6-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=6
 
-DESCRIPTION="simple maze-like game where you navigate around and destroy arrows"
+DESCRIPTION="Simple maze-like game where you navigate around and destroy arrows"
 HOMEPAGE="http://noreason.ca/?file=software"
 SRC_URI="http://noreason.ca/data/${P}.tar.gz"
 
@@ -15,12 +14,15 @@ IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.4:2"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
+	default
+
 	# Modify path to data
 	sed -i \
-		-e "s:arrfl:${GAMES_DATADIR}/${PN}/arrfl:" \
+		-e "s:arrfl:/usr/share/${PN}/arrfl:" \
 		-e 's:nm\[9:nm[35:' \
 		-e 's:nm\[6:nm[30:' \
 		-e 's:nm\[7:nm[31:' \
@@ -39,9 +41,8 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin arrows
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin arrows
+	insinto "/usr/share/${PN}"
 	doins arrfl*
-	dodoc README
-	prepgamesdirs
+	einstalldocs
 }
diff --git a/games-puzzle/biniax2/Manifest b/games-puzzle/biniax2/Manifest
index 499184d17778..574da8e3dffc 100644
--- a/games-puzzle/biniax2/Manifest
+++ b/games-puzzle/biniax2/Manifest
@@ -1,6 +1,6 @@
-AUX biniax2-1.30-build.patch 525 BLAKE2B 6f23c1f11ee5f095b6743d77fa2fd8bde181c7479dc6a2ff118d33d563db2e6ca6dc61399fb542b45155cb511cb6f9c21f1b04604b757b7600fa709ff8ef1b74 SHA512 ca1ac942308228a6a7a6ec1a09366ba43da88fb6d438edfab2177cd192741f7d2cd98a1f66064c0f42fdf8138de3b4cd70adf30709a4807d7f62cdd2b1ef1fb9
-AUX biniax2-1.30-dotfiles.patch 1356 BLAKE2B 3c8c48bd1afec2d0ed7a4f729213cfd0fadfe39d8385f6298c4d8f10cec7fed5c63aa0aff8854e1ab308ee7a44b2368404d55ef8fcf26f4bb06080f3e024cb1c SHA512 9d5b53be3b267897aa1a49bc45bced24e7a0e998adf9a48934da5223cd763a3c1b3a7fc7d68771ff0ef0648f6cca17adc915f33d9f15309356db8f31d4be1f15
+AUX biniax2-1.30-build.patch 529 BLAKE2B 4c1a391a9d4534d83b017962c62d8cc776cf44a53f942d468f5e033287158ad7781451a174901e06103f73af216eb1792bb0f18f7941367c2ba9d1d2eaf7ec63 SHA512 3f335b2e71c81f46298c188a1cd3fc5e74210ddb79c4ec514156bfc581125aaf3aaee792f1f86b2b87edc6f8507cee577d817d3c15ce6691c45624c9def11b50
+AUX biniax2-1.30-dotfiles.patch 1372 BLAKE2B 2e33067d9fa951d371093ef33c61303e93760707730ce513f951235b3dad0ff146c6b8132f722da29ec05c61fb5a50eeb58e92ea50251a09e56bfcbd538a1b19 SHA512 7cc2c04ee62931038afe7b89eaeffef33e7e9312a206b987817760c6537c1923945634243abc380b059fc332d12b220d83660f5158f832d1dadb854dc1ea5fa3
 AUX biniax2.xpm 1292 BLAKE2B de60ee16f9229155b2a31682f759b025822eed85bfbe2b7c3d83cd18df230dd3a62bff7d5a5c11e496715a4e3565bee1e565cfbfae15b634993a3c26ec29b070 SHA512 5a53233b27f5e8dd792cd697d8233c8d34adaf00dda51944caad186deb50311e55bd76916f4aa6e352973fe14855d34a27bcf9a91a8f6a56238f5fe18f5d3b58
 DIST biniax2-1.30-fullsrc.tar.gz 3072220 BLAKE2B 7a62f9cf625e7f7d59ac6b84528911f939e489da131a7b414fcdc7cb4acffe1877363983a190aacbc2ce8ca87ae5a631ecc1f9bc937c103b65b6c0543c3cb641 SHA512 180564b24051b629c29bc6245664a36b7ff9881ac5003b03b91eeebff86c89b9507c028c1155387c42debaa51482d8f1e2b08e9e9236b77da1c3f286b78be8b5
-EBUILD biniax2-1.30.ebuild 829 BLAKE2B 3becc290569bd4543dbddbeb1d202bbd400231cc8bac5bcfb4eef82f09742cf47c505c6c9002dbde753f1fa06305987183fbaf8bf454157f1eafb84cfa82777e SHA512 40c01797d058800cd82be4a013f599b32d2bd352b3d387b3d38c0bc9e6d4d3a19a522f47b018deee21a25c7420f29d02ef3d82f2e266d4d0a00caba2946982fc
+EBUILD biniax2-1.30-r1.ebuild 805 BLAKE2B e3277770de490616fa92e5e2f6bfac4f469a2ae6c31726f9e6e1818702a39248026550c7c4282df0a224d298ba8717e4d44facc43868159e81fcb33f0788f87d SHA512 d8f89846c14ff7232284a097032674d164ede3ce12b563be2a0afce5305deddcd1c460f42f299d798da235c56e098c31ee376dda47b0e41f190f5c3968a3b245
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/biniax2/biniax2-1.30.ebuild b/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
index 8c89af60317a..e4710407e8e7 100644
--- a/games-puzzle/biniax2/biniax2-1.30.ebuild
+++ b/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="Logic game with arcade and tactics modes"
 HOMEPAGE="http://biniax.com/"
@@ -17,24 +17,26 @@ DEPEND="media-libs/libsdl
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[mod]"
 RDEPEND="${DEPEND}"
-S=${WORKDIR}
+
+S="${WORKDIR}"
 
 src_prepare() {
+	default
+
 	rm -f data/Thumbs.db
 	sed -i \
-		-e "s:data/:${GAMES_DATADIR}/${PN}/:" \
+		-e "s:data/:/usr/share/${PN}/:" \
 		desktop/{gfx,snd}.c \
 		|| die
-	epatch \
+	eapply \
 		"${FILESDIR}"/${P}-build.patch \
 		"${FILESDIR}"/${P}-dotfiles.patch
 }
 
 src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin ${PN}
+	insinto "/usr/share/${PN}"
 	doins -r data/*
 	doicon "${FILESDIR}"/${PN}.xpm
 	make_desktop_entry ${PN} Biniax-2
-	prepgamesdirs
 }
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-build.patch b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
index 26c053c2e98e..cce8abe91a93 100644
--- a/games-puzzle/biniax2/files/biniax2-1.30-build.patch
+++ b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
@@ -1,5 +1,5 @@
---- makefile
-+++ makefile
+--- a/makefile
++++ b/makefile
 @@ -4,7 +4,7 @@
  # To execute the game you need the runtimes of SDL, SDL_mixer and SDL_image.
  
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch b/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
index 2cd212d6857c..00391677ce8a 100644
--- a/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
+++ b/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
@@ -1,5 +1,5 @@
---- biniax.c
-+++ biniax.c
+--- a/biniax.c
++++ b/biniax.c
 @@ -47,6 +47,8 @@
  INCLUDES

  ******************************************************************************/

@@ -18,8 +18,8 @@
  	cfgInit();

  	hofInit();

  	if ( gfxInit() == BNX_FALSE )

---- desktop/cfg.c
-+++ desktop/cfg.c
+--- a/desktop/cfg.c
++++ b/desktop/cfg.c
 @@ -36,7 +36,7 @@
  ******************************************************************************/

  

@@ -29,8 +29,8 @@
  

  struct BNX_SETUP

  {

---- game.h
-+++ game.h
+--- a/game.h
++++ b/game.h
 @@ -37,7 +37,7 @@
  DEFINITIONS

  ******************************************************************************/

@@ -40,8 +40,8 @@
  

  /******************************************************************************

  CONSTANTS

---- hof.c
-+++ hof.c
+--- a/hof.c
++++ b/hof.c
 @@ -34,7 +34,7 @@
  #define chCursor		'_'			/* Cursor ON */

  #define chSpace			' '			/* Cursor OFF*/

diff --git a/games-puzzle/braincurses/Manifest b/games-puzzle/braincurses/Manifest
index ceaccc3545eb..2cf5850d9cde 100644
--- a/games-puzzle/braincurses/Manifest
+++ b/games-puzzle/braincurses/Manifest
@@ -1,5 +1,5 @@
-AUX braincurses-0.5b-as-needed.patch 692 BLAKE2B 2e8d91d1288530f5f7e1d9dd409ff4e1ec33c510d9e45d03c0ff840482b3c51a56ff0eef892262de384d3f9707b0ed6a848365e4c50178d8250ac3f4b99dd37c SHA512 d4067011081e587ccc07baf6dd6597bfbdd8d118e14b0a1b8c83d8384332132edd21d079a2f60ea1003f588a88191662f6445e047bb9121141b2b83856051855
-AUX braincurses-0.5b-gcc43.patch 188 BLAKE2B 6707de0a32237c7db96e0ba44cec5d484486408ddd64dbca0ca36cfeef28dd0b021acc02288b371ea4f834181fae773589de322f56a167a5ee88d063cd37f340 SHA512 212165591b422cde8c9aebbe7fb14b34903e7fff0a6fee4310c953b11154ae1900d8444fbbc6f37c2accff4023f5fca87a50121d9abe51b7d634001d1301758f
+AUX braincurses-0.5b-as-needed.patch 696 BLAKE2B e0d234562842a30aceec3b686c9315be7f856e14b0398c14a3f7c7350a9ccf34d9bd96d7a10e62978b372a28e99178ce81b54960416e08c23bb347935eebd2c3 SHA512 8788fe4ef94d3b501104e66dc31a4df43b55b0949ef35b1fe9d6acf936e178d8a7bacbc331af6db093a056218658e845a816e51746000085581f8e623fbcd42c
+AUX braincurses-0.5b-gcc43.patch 192 BLAKE2B 4f557c7666e4d1b772feb1de5a793868aaf38dcdec583f9feb795bc72b98262078924a5734e137cd5719cdd77cc35c596f758677d0682035859f6575b6c8eb6d SHA512 94a6664162be766918280af07201ba3eb55c22e0eabbf8701aecb5c7f0eb5151e24d7b65aadb6db4262373c1323b170c332f3700f5e90a74f048511600f88f64
 DIST braincurses-0.5b.tar.gz 18487 BLAKE2B 4d3874eb6625781e866ba2250da45ff165d662abaeabda2c4525bb300479b33e1efb91f997165310b7a4edc61f81ac841b00b940d319ef0c18b8684dd5355d60 SHA512 7f90da3a5c480e0bf736dd4a53efc08abeb85969e727882e3d06f888b2a4b6002f9fd9bc1554ac2256c9821dea5fabf2638eba4a672046a09c1adb8690803a0e
-EBUILD braincurses-0.5b.ebuild 696 BLAKE2B 992a4d7785ad9487fd4caaf72a0844ba492c4883c46c970f1b8a3dc5f929a076b61958989c158d8a02777ec5a3f5e42bf178d2bdf240f563eb6597d0098bb0e6 SHA512 7cc5412df00b8e9c5b57d28613d8d817900cb9e9322a30ef870ac7ad31e32be758534cee1f08aacb80a9695c1150978d71811a2ec7253809798cb9ec25209aac
+EBUILD braincurses-0.5b-r1.ebuild 650 BLAKE2B aa7d73dd33fd0c1ee69b24c2de0aba5b73a926c1d35a724f7e5a2538b3f8e7a121c8b30ad02c268baa9f883ec891c2bf93dcb13694dce14407deb00b396198d2 SHA512 799cd2186eff518fb5c3ced616a2d42c1e56c22d487012e0794bd1e33f1c382999ddee8251a901679339eecfbbcc1c05ac886d594336a18a73473dd7ed2cae17
 MISC metadata.xml 388 BLAKE2B eb17cdee5b9a933eb9ee52b34a7b6085394d76fa182a1e696014a16fa32eea47c4c5372b342e203296dcc4cc590c1c90833a1ba1681b70c9c65aa20ed037c974 SHA512 22fb2671d0f2029bea4e513d469b2d9940fef9a5ed6a6d9b47dfc80aae50b41bae3d89a620ff4be028ab46ab2dcca801a4653e95feca142c3b2921d436e2e6c0
diff --git a/games-puzzle/braincurses/braincurses-0.5b.ebuild b/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild
index b29db61b473d..609bfa218305 100644
--- a/games-puzzle/braincurses/braincurses-0.5b.ebuild
+++ b/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
 
 DESCRIPTION="An ncurses-based mastermind clone"
 HOMEPAGE="http://freshmeat.net/projects/braincurses/"
@@ -15,9 +14,13 @@ IUSE=""
 
 DEPEND=""
 RDEPEND=""
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
+	default
+
+	eapply "${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-as-needed.patch
+
 	# fix buffer overflow (bug #301033)
 	sed -i \
 		-e 's/guessLabel\[2/guessLabel[3/' \
@@ -26,7 +29,6 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin braincurses
-	dodoc README THANKS Changelog
-	prepgamesdirs
+	dobin braincurses
+	einstalldocs
 }
diff --git a/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch b/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
index d1f36152403f..2101602c6372 100644
--- a/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
+++ b/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2009-02-09 16:04:47.000000000 +0100
-+++ Makefile	2009-02-09 16:14:41.000000000 +0100
+--- a/Makefile.old	2009-02-09 16:04:47.000000000 +0100
++++ b/Makefile	2009-02-09 16:14:41.000000000 +0100
 @@ -1,22 +1,9 @@
  # Makefile for braincurses game
  # written by Brian Derr
diff --git a/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch b/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
index eafa39e4b9b8..6fa5509a7786 100644
--- a/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
+++ b/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
@@ -1,5 +1,5 @@
---- braincurses.h
-+++ braincurses.h
+--- a/braincurses.h
++++ b/braincurses.h
 @@ -12,6 +12,7 @@
  #include <cstddef>
  #include <cstdlib>
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 0e5f1f9edcfb..2045a56bf0eb 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -4,5 +4,4 @@ AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15
 AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
 DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
 EBUILD pingus-0.7.6-r1.ebuild 1253 BLAKE2B 25eed15f964e23218a4b4630f983363905ca979bd52095313bf4ba03315bb452e85881cd7753983864abf17de6ffb01dbd6ee021bfd612bd3f4c06d07d1aa3ee SHA512 25be9d4a2ac75ecf92ed0e98246d040d3ead20e3fccb8e8066e9c2254779225085629ead3f2663eb4090ef2bb6d3bbfb9590d29a35d03cbf7234eff1e4732878
-EBUILD pingus-0.7.6.ebuild 1226 BLAKE2B edbf7d1ab7eb2c771478fbf96c5c7a8d5448ea80a4bee4bc1a565e2ee452c68050e76b4d286daec1b84c56f30c1520a5e7c586677ee1ec13619dc314fdbb5ae4 SHA512 8546fc592c8dc7462b64535b70572ff45e828efb6e05b5dac4c059921c0428c998feba6a80e0788925e957a557c2beadfbbae6908379eacd145286d2a731606c
 MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild b/games-puzzle/pingus/pingus-0.7.6.ebuild
deleted file mode 100644
index f5f3d77af9fe..000000000000
--- a/games-puzzle/pingus/pingus-0.7.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils scons-utils toolchain-funcs flag-o-matic games
-
-DESCRIPTION="free Lemmings clone"
-HOMEPAGE="http://pingus.seul.org/"
-SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl music"
-
-RDEPEND="media-libs/libsdl[joystick,opengl?,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-	music? ( media-libs/sdl-mixer[mod] )
-	opengl? ( virtual/opengl )
-	media-libs/libpng:0=
-	dev-libs/boost:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-noopengl.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-echo-e.patch
-)
-
-src_prepare() {
-	strip-flags
-	epatch "${PATCHES[@]}"
-}
-
-src_compile() {
-	escons \
-		CXX="$(tc-getCXX)" \
-		CCFLAGS="${CXXFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		$(use_scons opengl with_opengl)
-}
-
-src_install() {
-	emake install-exec install-data \
-		DESTDIR="${D}" \
-		PREFIX="/usr" \
-		DATADIR="${GAMES_DATADIR}/${PN}" \
-		BINDIR="${GAMES_BINDIR}"
-	doman doc/man/pingus.6
-	doicon data/images/icons/pingus.svg
-	make_desktop_entry ${PN} Pingus
-	dodoc AUTHORS NEWS README TODO
-	prepgamesdirs
-}