gentoo resync : 19.04.2018

4 files changed, 18 insertions, 16 deletions

diff --git a/games-arcade/fishsupper/Manifest b/games-arcade/fishsupper/Manifest
index e452ef36b7e7..03add5472e32 100644
--- a/games-arcade/fishsupper/Manifest
+++ b/games-arcade/fishsupper/Manifest
@@ -1,6 +1,6 @@
-AUX fishsupper-0.1.6-asneeded.patch 293 BLAKE2B bcfb9c6252b359468bb6cb04ef021907cc440ddd618a70d45a8df16cf9f5d4b55405daee25b1225143c602fc961232f3fc4eded048f0144d412728d7d773bf19 SHA512 984e73390e46a826ac0a0ae5da653123587ccc2b59b489bd78b46c18bab1c719617ddce1f75d4747da5b8fb03092ed8f33f9a8cefa1b44c658adc2b15957b305
+AUX fishsupper-0.1.6-asneeded.patch 297 BLAKE2B 18b749a0e6733ee92bbe38ef2fd65fc5acfdb440ccbce23c0d1ae78d7b3f7601ebd3c6f23d5fdd89cd95caac11a9acea2a217b1ef6bd0f1e938d49d7c0735311 SHA512 934d5a308ae6c25e34e437c773ed71d12ac146555848a21855116a848768edd8c4e30e1d789c20a75e8c89f2b5a586c75d9ef122a70e83206848919c7c275be5
 AUX fishsupper-0.1.6-gcc6.patch 1730 BLAKE2B 41317933789d096b9b00a184e15df47b8daf946e9730e6688895497a94bf3efe7d96adf1a39b016dd9874b97a2721472fe98650732689464283495e817d76223 SHA512 9dfaf5c9a5a9554c87e93a3876cb9fb858a638b2ead10a3a10e4c9d8a68fca1608f08c1920d506aa09bc2c965c93ffc748ef3b4e3dad3b24bb86bd1481703d48
-AUX fishsupper-0.1.6-ovflfix.patch 304 BLAKE2B 01fd33957962d1e5fcea20ee8bbc9665c2d3b5e2c2dbaa5a665e05028b1a143873e6b8c4cd2497fe25ee2f18fd6f4f57d1d235692802b1b4adbd4cce46ca0a55 SHA512 ede524e2cbb2cf0cf7432cd438ded055b7fa1dcb03efd2deb17d3cc884c9433cc03e8b4baefc37e675465e3fd6382622654cb5f2b676614291fbd195caafb62f
+AUX fishsupper-0.1.6-ovflfix.patch 308 BLAKE2B 16d9956ad39c518c171a7d99151853329c0fe76a092494a04d0e4f549819fa07f29a4bc01cd0dcfac104c3dc1df9e25c835dec7fb834b8b9ded24b742e56dda9 SHA512 75501a6ca44c510d73859d4339ee041e71dd3d0bbde3e071cfe438b014b515e868e8788d14ddef461b6402c8ef6c67c14bc3ad94e9a06a553c3aadbba602013a
 DIST fishsupper-0.1.6.tar.gz 1136893 BLAKE2B f07e5cc8fcfef4547fe2af029db1472ab0299fb5267e8f3a4fb29b9aa2cb39115101c217f509f35a4dc81a0e4f6c72f70bb2102c74c7c45981ced4e50230cd5c SHA512 a6b3df47010e8ac186ff4446db3659fd9173e9e3fc973ab376eed46da9cd13f7a4c0c02b25f3427232252e7fe5728036fa91ea773affe0948387a56f617fc7af
-EBUILD fishsupper-0.1.6.ebuild 843 BLAKE2B 331fc5591ddc3ebfc8431b7be8fa9c9ac3adedf5a5441838cc5a11b3dc1dc9ba0e037f7fff10a61ffc4f5d9e6815546c3cdd9d86211b5f7ae6ebc27cea753da7 SHA512 2a31b686d6fe56cb994d95d76de151e897131681898e408ce86461daba4cb1d6e800eab0c3e3e4e786fa260c03e84eabff07af7fe2c3045ca1638b40ccfa3aa6
+EBUILD fishsupper-0.1.6-r1.ebuild 835 BLAKE2B 47a77e1bbbd699277c5c29f9909041d613f4ef08d880f3babe1a1d8189b476c91e719dbc407cc83f6439c85f7b9592c59a550e3dbc23f4781e068e14495510ca SHA512 6097c550acfb2518cfd78937175a61ea6b3ef461aedf5c5618cb68a1bdccc5807143d33c1bad0df6abfffd0e0cf9aa5f751e240e16ce513b26ae269cbfc2c311
 MISC metadata.xml 333 BLAKE2B de23175a8ff9c7bd8f8e2d59072017d790d2594882ac5963acdf28e4bab252152c01754cf9c3b57122dbc37fc857f2e749bbc52333700d25b43ac4b0b1ecd165 SHA512 6a3a977950808ae8b79c2c34c17fe8e1dd9ae21b9f9a43a2f2808931a4569042825f381d4c10024480eb2e2635893de8433eacf94f5f755d086285e3fe6770b3
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
index 2aba6f099e88..eae5ca15921a 100644
--- a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am.old	2012-06-24 18:47:58.947143638 +0200
-+++ src/Makefile.am	2012-06-24 18:51:35.738921904 +0200
+--- a/src/Makefile.am.old	2012-06-24 18:47:58.947143638 +0200
++++ b/src/Makefile.am	2012-06-24 18:51:35.738921904 +0200
 @@ -1,7 +1,7 @@
  AM_CPPFLAGS = -DPKG_DATA_DIR=\"$(pkgdatadir)\" \
  			  @SDL_CFLAGS@ \
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
index 4d5185dae7e9..2be91b65a16d 100644
--- a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
+++ b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
@@ -1,5 +1,5 @@
---- src/main.cpp.old	2012-06-24 18:35:27.661894094 +0200
-+++ src/main.cpp	2012-06-24 18:35:41.041954632 +0200
+--- a/src/main.cpp.old	2012-06-24 18:35:27.661894094 +0200
++++ b/src/main.cpp	2012-06-24 18:35:41.041954632 +0200
 @@ -293,7 +293,7 @@
      
      if (!ok)
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild
index afde34992919..e73b4a0b1d7d 100644
--- a/games-arcade/fishsupper/fishsupper-0.1.6.ebuild
+++ b/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools games
+EAPI=6
+inherit autotools desktop
 
 DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger"
 HOMEPAGE="https://sourceforge.net/projects/fishsupper/"
@@ -13,15 +13,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libsdl[sound,video,opengl,X]
+RDEPEND="
+	media-libs/libsdl[sound,video,opengl,X]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[wav]
-	virtual/opengl"
+	virtual/opengl
+"
 DEPEND="${RDEPEND}
-	dev-libs/boost"
+	dev-libs/boost
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ovflfix.patch \
+	default
+	eapply "${FILESDIR}"/${P}-ovflfix.patch \
 		"${FILESDIR}"/${P}-asneeded.patch \
 		"${FILESDIR}"/${P}-gcc6.patch
 	eautoreconf
@@ -31,6 +35,4 @@ src_install() {
 	default
 	newicon data/images/fs_sprite_042.png ${PN}.png
 	make_desktop_entry ${PN} "Fish Supper"
-
-	prepgamesdirs
 }