gentoo resync : 16.04.2018

4 files changed, 22 insertions, 23 deletions

diff --git a/games-arcade/cob/Manifest b/games-arcade/cob/Manifest
index 5994d2e05a1a..cddbae98481e 100644
--- a/games-arcade/cob/Manifest
+++ b/games-arcade/cob/Manifest
@@ -1,5 +1,5 @@
-AUX cob-0.9-gcc43.patch 610 BLAKE2B e2c0d7ad69dadf7c145d4802022fbb4b3fc537def45abb88a8c7686668f4db2ca222c340ee2f88088a31390c01c8ce642743a3442e65e2c66bf1a21adb636a6d SHA512 97b777b58f0591a26c8bef50689327593553efe28f2fca4f07808a5e989ace97b3a460a983f79c1ebdaafc4ab558da6cb3e42f392241177e11c3f12f9803f792
-AUX cob-0.9-gcc44.patch 1135 BLAKE2B 71b430cd63a4934b8f54487cc8f807408f9b1feff504b9ba0beda261880fc3f5b2667abcf3c9fe77d31e965822c2684f4a1c1310489dbfce22fdebf5c2ac990f SHA512 86533c8d2c8fb93bf7e5bf65a955b3af9a9ff6f1b02f99ee9af2f21c30eabd3243911df7b6c60fe3cadbb059273329c09a2c8138d34ace31a905ec9578012d89
+AUX cob-0.9-gcc43.patch 618 BLAKE2B 211bc0f4221b05ed761b8d214ebb11e6cf4262d89ba01beba75a10297d70547ea0d66c6c85d313fdc0826706bd8270e5741ae5e44ad5e97b4a078e25163eac32 SHA512 15cdb6cfacdd49e37fd41e337f425e9f3f020f9d019ea8d1fb860d14b0cebb04dab558c0bb1aa923d0d58fac56c6d579398b0ca7c18e70989c3efd924452d7e5
+AUX cob-0.9-gcc44.patch 1147 BLAKE2B 01a069e45b39b2d4bdd3d066ff295a2e99d2d782c5e924ab2aa5a4614e9b9482acf52735a0f48e6d7d312d101ba3652987fad9fa675897d1b49054fec85d0ffa SHA512 169559f882eba5f34558f845c44c09ba6821db689ae5a73dc6e8cd14ae12d4299fbad3e67b4c828fa3de435c20e948fb8c0266e3267b52b5bb87302047d4034d
 DIST cob-0.9.tar.gz 712618 BLAKE2B f73bec711f4e2c7907cf987fdd12207556752e05f5cf98f9818ef470c2bc2fa95f03c8c4a2f6c114b87d5c00cf3b17da3a1d127869b7ee548d5bd0d05d4c4114 SHA512 1a329bb06a25137c1dc9d65cff949ed1b0ca7445ecf897375be71581c35f0bc563008fc7607d650a660a405f2282b0329148487bd29b6a053478b61d932bdf4d
-EBUILD cob-0.9.ebuild 582 BLAKE2B f751f337379414dd43b59ad03724398e005eb5314c129eb4135342c699934de9ea05cf68898b174a3b0504616f1d8fca7a0d65753239cda714f467014d6e0837 SHA512 1411b61a459a1c57b48587e0631cc74bc18b3739a3379428f27b7ad6ebb6cc914db081a7999b9ed0f00dcdb920576c799eb3cd96af2fe1f332605fc8fb720aab
+EBUILD cob-0.9-r1.ebuild 593 BLAKE2B 25c5e8a97fe40c204f0208405433b184de2bcd62c09c89a0542580a7d44cfb5533068c3e51bcd948d9c8633271098dadbf31cfe7320b697c09b70ae07ab8c413 SHA512 351d45bcee92b810c7196d7844470d06699c1ac089eed506308aff172d202964633fc16d67e41a47f275f5d2d9bacf4668a5f8bd1d9613e48d9862566f3a58cd
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/cob/cob-0.9.ebuild b/games-arcade/cob/cob-0.9-r1.ebuild
index 7393dae66eea..26d73169d352 100644
--- a/games-arcade/cob/cob-0.9.ebuild
+++ b/games-arcade/cob/cob-0.9-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="Cruising on Broadway: a painting-type game"
 HOMEPAGE="http://www.autismuk.freeserve.co.uk/"
@@ -14,15 +14,14 @@ KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[joystick,sound,video]"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+)
 
 src_install() {
 	default
-	prepgamesdirs
+	make_desktop_entry ${PN} "Cruising on Broadway"
 }
diff --git a/games-arcade/cob/files/cob-0.9-gcc43.patch b/games-arcade/cob/files/cob-0.9-gcc43.patch
index 6b1f574628df..bc7e6fb3e02c 100644
--- a/games-arcade/cob/files/cob-0.9-gcc43.patch
+++ b/games-arcade/cob/files/cob-0.9-gcc43.patch
@@ -1,5 +1,5 @@
---- cob/menu.cpp
-+++ cob/menu.cpp
+--- a/cob/menu.cpp
++++ b/cob/menu.cpp
 @@ -16,6 +16,7 @@
   ***************************************************************************/
  
@@ -8,8 +8,8 @@
  
  //	**************************************************************************************************************************
  //
---- cob/sdw.hxx
-+++ cob/sdw.hxx
+--- a/cob/sdw.hxx
++++ b/cob/sdw.hxx
 @@ -19,6 +19,7 @@
  

  #include <iostream>

diff --git a/games-arcade/cob/files/cob-0.9-gcc44.patch b/games-arcade/cob/files/cob-0.9-gcc44.patch
index dd90b388e6d8..02b4842617f2 100644
--- a/games-arcade/cob/files/cob-0.9-gcc44.patch
+++ b/games-arcade/cob/files/cob-0.9-gcc44.patch
@@ -1,5 +1,5 @@
---- cob/game.cpp
-+++ cob/game.cpp
+--- a/cob/game.cpp
++++ b/cob/game.cpp
 @@ -15,6 +15,7 @@
   *                                                                         *
   ***************************************************************************/
@@ -8,8 +8,8 @@
  #include "cob.hxx"
  
  //	**************************************************************************************************************************
---- cob/main.cpp
-+++ cob/main.cpp
+--- a/cob/main.cpp
++++ b/cob/main.cpp
 @@ -15,6 +15,7 @@
   *                                                                         *
   ***************************************************************************/
@@ -18,8 +18,8 @@
  #include "cob.hxx"
  
  //	**************************************************************************************************************************
---- cob/map.cpp
-+++ cob/map.cpp
+--- a/cob/map.cpp
++++ b/cob/map.cpp
 @@ -15,6 +15,7 @@
   *                                                                         *
   ***************************************************************************/