4 files changed, 24 insertions, 22 deletions
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*/