gentoo resync : 02.05.2018

5 files changed, 27 insertions, 24 deletions

diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest
index e12b61893c2c..bfd2a6a44442 100644
--- a/games-puzzle/mirrormagic/Manifest
+++ b/games-puzzle/mirrormagic/Manifest
@@ -1,9 +1,9 @@
-AUX mirrormagic-2.0.2-64bit.patch 888 BLAKE2B ef8d9ab723b79c213211953b2e44f5f5f650c12825c9ae881896710abb03ece530e0924980e10da5b65b7e0b0d8a3aa7f98f779e9e1c01e13dd886fcd1611341 SHA512 ff81626db66f62213184402bcb8b47393c6463c4db3daf41eb5008a5358775b95446a9f5dfdbd38535c6a3e15cfc09d2543aea6e84868a31f3f0be7bae8356c0
+AUX mirrormagic-2.0.2-64bit.patch 892 BLAKE2B afadf37d81290831ebd6c479d98520e2e3e80df12c84d7fadab93d78d720c9ec1d926a948fc424fa57b64d3d861c16bb5ecd246bfaf07496bb25c07c606f785f SHA512 c625eb00098c4d7c41ce58ed2ca3ee28f34f6a06025d20e0533f6b171cfc2f2b0cb01ce80fb057902d839868303aa20329452c67f7c7e86809472207aeba6207
 AUX mirrormagic-2.0.2-editor.patch 499 BLAKE2B 9b09e8e9962b018945fae2a1c5c6e72134b80e267c189e60774889761b0d5264410ce4015523edce73de1e313e780c2fdf0f62d263d8d3398dd8162eb365be60 SHA512 2d2d497402596b0108b0b79f8ce93d4e7404a64f20107582d40ac5d72291645379f920af5bd156e607f724e0427817bf6557223a7c152ebdf41b6787e81fb353
-AUX mirrormagic-2.0.2-gcc41.patch 267 BLAKE2B 606a9f47d0202381d7c5fbb856e1642fea6ac4fb56a5bd3c9101e2bd850ba5b56dd035c86e1c4c1e093c09baa3644e89a46da4e8ef55eaa28b176dd3a1474fdd SHA512 8cd454154f877257eaa252ee3e5250354ed73ea0e4533048fbac48e6db7bfade345b8740815b8ffde3707df9be71a22655c8982bfe05e74ddfde6814610a2c84
+AUX mirrormagic-2.0.2-gcc41.patch 271 BLAKE2B c9af7a0ca7cbdfeb752b914def445de7089d541e8c0a37b4cb17d6a5c0d2e60ff46c539d32bddf36c7c57ab1ed1adcdbf803e2967dd5932cedee07e3bbe2415a SHA512 7ff5419ecbf4598c30241dc68cf0191abe4b806226628533d261e10eb33b90c1f5909c7b6afedd2f2fad87bea7cc6a06dceafe513ec3a93e4ea9d6bda1d8eaea
 AUX mirrormagic-2.0.2-gcc5.patch 14581 BLAKE2B 70ead8b2ae5fef95d7c465c2dc80380789377f8d59df9a8f24ab641e8ee3fd0c4891de18ad2d85cbfa55fa940f698f19c7ab9395e16e0eff96672452f35aa59b SHA512 bf71d63c5bef22cb49f2dd9b63d7e8150ea6e6a49cc2430a834ebd31f07f9b2e26411330550ff181386654b9695682fd9a71a3975df24ead8e1386746756b59b
-AUX mirrormagic-2.0.2-parallel.patch 234 BLAKE2B 76f3db6cd1a8f59d3b78de16d43a2c85a79b626b595fb8bfcf01abecaefe2544ca8a88ceb4e98999d0a3caea57412f55d0fb2d9c2a17b18e685f38bff5b3cce7 SHA512 34317534acb00fe9947eb53d3c16373866f4ecfd913489b4b9da6e9714ce4b04b0b3ce2680b03ea2fb22913147ac154b4eb0d83f46e76a9bc45c6aaac439c250
+AUX mirrormagic-2.0.2-parallel.patch 238 BLAKE2B 76e437bc253ec82381161748b24ff2b08d5723fc8ce9e6beb294904f8263f95ed06afb648f35898997f6b53524c5f921f3b4c4e4b49c46f892e2b56fc7ac0830 SHA512 54cd926d2278878b7647ef790138e5f9f77ac9086c7d86d047bbea7481e39efd760393c3aa5657070e1fb0d07fb82cab64d63a593234e9dc6eff7ba7794ec5ee
 AUX mirrormagic.xpm 6347 BLAKE2B a5bf1e854b3d0f379567649ddae43891c6929301472618cc5f2beeef0f46e1faa05f8f726825a94714fbe1b77d13ec68663299b4edb8903e812a6759d2cde6eb SHA512 5040a6232ba047fe0038276bf574ca22b5270827c21e9dbba0f130f0b25c2157be611cca1e662af2ff8cc43ab78f69a925b6687fcaedc4778672ebfedfe00227
 DIST mirrormagic-2.0.2.tar.gz 1168098 BLAKE2B 0feefa2e7af82b212c3c08a347154d701a8492c2fef35cf625f4176e4893888904d88a2ee6d36c4e239fbf2cb6f1f77aa8e273023a86dce04dce8f5b77b62946 SHA512 cd49b1325485b68f2b59341e91f0564693dd12117aa3d6b5078c0a7f0e074114196870af11f0a154a0934cfce7106ba9685d886611f2efeff665ea030d705e03
-EBUILD mirrormagic-2.0.2-r1.ebuild 1295 BLAKE2B 8de15f1b9100d798a7ffce03c271d9d69d8a50fa81da4ba9f91ff0d90354b80c48010a9b435885d8a9ac408506a5c0c531b20cd9a282dd8a4b388e4abe2a9355 SHA512 ac95c497b62d1ec484df42697581a50935ecd54c15eddd35484545651a2f6da6d71bede26055ec83b22fd90f22e369857c67047f5d7a9e52757c9b4844dd9370
+EBUILD mirrormagic-2.0.2-r2.ebuild 1231 BLAKE2B 49d51d7b6a58f7eb04619445ad3cf1c4c82e25916649ff997f816d9732d6fea70c4c0cbdaa003d3bd972cb728f2535bb50920f9afefa59fd701861c411b883fe SHA512 96f248137e83883402c99854debe17869524763d7766a093ddd29baf40c54f4e8059f5648761f3f7bf9d20d95cd9651359480263ec50b901304dd7377c503516
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
index e9b313423699..4817f75786f8 100644
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
@@ -6,8 +6,8 @@ unsigned long.  Should probably really be uint32_t but I'll leave
 that decision to upstream. Thanks Pelle Nilsson (and son).
 64bit check borrowed from bug #496863.  Closes: #498912.
 
---- src/libgame/gadgets.c
-+++ src/libgame/gadgets.c
+--- a/src/libgame/gadgets.c
++++ b/src/libgame/gadgets.c
 @@ -18,6 +18,12 @@
  #include "text.h"
  #include "misc.h"
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
index c8d386f4e581..be7f701de42f 100644
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
@@ -1,5 +1,5 @@
---- src/main.h.old
-+++ src/main.h
+--- a/src/main.h.old
++++ b/src/main.h
 @@ -459,7 +459,6 @@
  #endif
  extern struct HiScore		highscore[];
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
index 9b538a688816..a7effd4b6984 100644
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
@@ -1,5 +1,5 @@
---- src/Makefile.old
-+++ src/Makefile
+--- a/src/Makefile.old
++++ b/src/Makefile
 @@ -146,7 +146,7 @@
  endif
  
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild
index 88a24e7a64e5..812835fd25d0 100644
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.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 eutils toolchain-funcs games
+EAPI=6
+inherit desktop toolchain-funcs
 
-DESCRIPTION="a game like Deflektor (C 64) or Mindbender (Amiga)"
+DESCRIPTION="A game like Deflektor (C 64) or Mindbender (Amiga)"
 HOMEPAGE="http://www.artsoft.org/mirrormagic/"
 SRC_URI="http://www.artsoft.org/RELEASES/unix/${PN}/${P}.tar.gz"
 
@@ -13,17 +13,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="sdl"
 
-RDEPEND="!sdl? ( x11-libs/libX11 )
+RDEPEND="
+	!sdl? ( x11-libs/libX11 )
 	sdl? (
 		media-libs/libsdl[video]
 		media-libs/sdl-mixer
 		media-libs/sdl-image
-	)"
+	)
+"
 DEPEND="${RDEPEND}
-	!sdl? ( x11-libs/libXt )"
+	!sdl? ( x11-libs/libXt )
+"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-gcc41.patch \
 		"${FILESDIR}"/${P}-parallel.patch \
 		"${FILESDIR}"/${P}-64bit.patch \
@@ -40,17 +44,16 @@ src_compile() {
 		RANLIB="$(tc-getRANLIB)" \
 		OPTIONS="${CFLAGS}" \
 		EXTRA_LDFLAGS="${LDFLAGS}" \
-		RO_GAME_DIR="${GAMES_DATADIR}"/${PN} \
-		RW_GAME_DIR="${GAMES_STATEDIR}"/${PN} \
+		RO_GAME_DIR=/usr/share/${PN} \
+		RW_GAME_DIR=/var/${PN} \
 		TARGET=$(usex sdl sdl x11)
 }
 
 src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
+	dobin ${PN}
+	insinto /usr/share/${PN}
 	doins -r graphics levels music sounds
 	doicon "${FILESDIR}"/${PN}.xpm
 	make_desktop_entry ${PN} "Mirror Magic II"
-	dodoc CHANGES CREDITS README TODO
-	prepgamesdirs
+	einstalldocs
 }