gentoo resync : 02.05.2018

4 files changed, 22 insertions, 19 deletions

diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index 4ffe2b7f2468..7f42c1695386 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -1,6 +1,6 @@
 AUX monsterz-0.7.1-64bit.patch 1093 BLAKE2B a27d602e4087926e053abd4f1cefb22a88fa37f8a3a773e13ea2f5db0914d6589db5fb09c78551da2f6f5b78d5cfd6c46bf08b9d77e6cfed99a451ffb9311c24 SHA512 3098e5a287c2b3e5e415a06e9e671fb4e56ebd4405a4580c5bb3529c1708ada9efdb40b1369040c7dba50ee1e0c33b6f088da898a8eec7f2997e4d376b67dea4
-AUX monsterz-0.7.1-blit.patch 1294 BLAKE2B b15375963839fc1732be67512d65eb9fd06954040769e26e4ad42076d54facd22b6635ddb35bd89eb976790a74fa2075c9c934f55e081e7a8b1bf108d20d3ebb SHA512 aa7e63d7a67afea475f1c26976da46828232075231f939d4e478f1975bd192de8ee7b848a914567f915ef3c1394a11acb183a84b548732ed55389d3cd764614f
-AUX monsterz-0.7.1-gentoo.patch 966 BLAKE2B 414401bdcda06d33155d178bff220392ee89ba61a6e3dc63bc14826fa770af072707afae020281f1a11bf18b8ae82af11c832f22335cd972f23ed3d8ecf4ec96 SHA512 69cea5fef337a6a2f8105dfc1cf6e308569852ead7701b6898582c51b5a740ff80f9900956e3fa0325a37fd963e62acc62a4c385b7669b4cf634a90136a484a7
+AUX monsterz-0.7.1-blit.patch 1298 BLAKE2B ef1c5961a0a1c48ab01a289f7504355b445beae6f7387f68a901b75d403c2422b53fd1c7a4923d954320de73555fd649ff913ddd68336fc1233f94655fb34b8b SHA512 682542801240d7b32497105774ed240b08eefd9a92dfd20caf66d00fb1d77ec563c97262ed323c96a71fa19e5c2f9a13cffd7a8698aae92b2dfd858d35d8ed98
+AUX monsterz-0.7.1-gentoo.patch 970 BLAKE2B 658224adbc150cf01dfe72a3f1ea5fd14d0122eb1ac3b55f1d52c1f89ecbefeafa88e3aff08d4d832f8b2b6b2922890514609652e0c8f3cee26889f66b0ca5bc SHA512 1dc1994cb03f794b9f015d8d812b8519c826b0a0d02ecb3a9f4bb0e25d69aeb8f3784dcf1fbc1624ca18f645b55e0889f0d2ce8f1339639e8ed55d305af0f3e1
 DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
-EBUILD monsterz-0.7.1-r3.ebuild 1147 BLAKE2B 56466d6d2ebb451b092ae224787cb0162cda6c0f3e832316b72131433e729f2a4e6f8551d119633227db6814b156478cbec709e9e5abfbec13954451e976395b SHA512 1f576538e17b39eb9bb35cf026bf2534bce1f1cdcd66e1b83fb2b2d4b9cec2fa0ab49521ba1a3a97c2e1d07bbd5fd02aaaaea0a3135c2e19e7160146c4d8a0d0
+EBUILD monsterz-0.7.1-r4.ebuild 1100 BLAKE2B 9eee9e6e0cb08ac23cc78abea1981877d017046ea3dbe3136bc3ac2ff1c6ce53752729a5b53ee2ca12bd6853dc930154954596621e2f6ce9f147f34a8a44a8ab SHA512 6d83c1ad052d362b6e364fec40eb321696e68a70fdeb2138018f1a316dd9c2d4b528bea8e54777022d50ab6ed82274af4d2106bba0ae634bce30b3995ad96808
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
index 8e55b23a327c..d0847d6c2c10 100644
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
@@ -1,5 +1,5 @@
---- monsterz.py
-+++ monsterz.py
+--- a/monsterz.py
++++ b/monsterz.py
 @@ -829,10 +829,10 @@
              pass
          else:
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
index 652450bf190b..6920e0e36971 100644
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
@@ -1,5 +1,5 @@
---- monsterz.py.orig	2006-05-12 18:55:51.000000000 -0400
-+++ monsterz.py	2006-05-12 18:57:44.000000000 -0400
+--- a/monsterz.py.orig	2006-05-12 18:55:51.000000000 -0400
++++ b/monsterz.py	2006-05-12 18:57:44.000000000 -0400
 @@ -1907,7 +1906,7 @@
      print '          (C) Mike Kershaw <dragorn@kismetwireless.net>'
  
diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
index e8e78eba8638..4cff31b75f8c 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
@@ -1,44 +1,47 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 games
 
-DESCRIPTION="a little puzzle game, similar to the famous Bejeweled or Zookeeper"
+inherit desktop python-r1
+
+DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
 HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
 SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz"
 
 LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
+
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/pygame[${PYTHON_USEDEP}]
 	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]"
+	media-libs/sdl-mixer[mod]
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-gentoo.patch \
 		"${FILESDIR}"/${P}-64bit.patch \
 		"${FILESDIR}"/${P}-blit.patch
 	sed -i \
-		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+		-e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
 		monsterz.py || die "sed failed"
 	rm Makefile || die
 }
 
 src_install() {
-	insinto "${GAMES_DATADIR}"/${PN}
+	insinto /usr/share/${PN}
 	doins -r graphics sound
-	newgamesbin monsterz.py ${PN}
+	newbin monsterz.py ${PN}
 	newicon graphics/icon.png ${PN}.png
 	make_desktop_entry ${PN} Monsterz
-	dodoc README AUTHORS TODO
-	python_replicate_script "${ED%/}${GAMES_BINDIR}"/monsterz
-	prepgamesdirs
+	einstalldocs
+	python_replicate_script "${ED%/}"/usr/bin/monsterz
 }