gentoo resync : 28.04.2018

5 files changed, 22 insertions, 23 deletions

diff --git a/games-arcade/yarsrevenge/Manifest b/games-arcade/yarsrevenge/Manifest
index 905edb225ed1..9c53d738b413 100644
--- a/games-arcade/yarsrevenge/Manifest
+++ b/games-arcade/yarsrevenge/Manifest
@@ -1,6 +1,6 @@
-AUX 0.99-math.patch 178 BLAKE2B 3bb3dd3ff4cb547ee096b42d5f8e076bb4f4247110453bf2e6f15b0e86c52af95174304d6a10ebefa2426c1e9f50db03bacceb0114a90b043fb678df4e70ae47 SHA512 a29705944c53ac8ef32914c11679b5ccd94b55b0a21497cc80e5a803651aabb3d664875c769a74965b07db39d635ad39de985685fa3edcc0042171fe37355d13
-AUX yarsrevenge-0.99-gcc43.patch 215 BLAKE2B 23275ad067a92d2b40e7e90a4fd54b3910a39e560a54237df799043ef601e14ae004d01512a0522e7a1ec5ba73942797685f9c6c205d2aa0a05bbf85c8128dd8 SHA512 e2a3c9d8616e2ff609866137a102b0a6716dde44485da99858d6d35afbfd55cdc612a9ce0a11c64ea2c158d8b380785134d7139f192dfd68d5dcd50bf6550137
-AUX yarsrevenge-0.99-gcc44.patch 254 BLAKE2B 8801b6c9f65671f6723950ee171c78b74c44a71de40c86a6a8e8c3ed907b9889bf011a6cea3ed7ec5dbf24cb6efd1674ebdf4db6daef60de48f0cc6a2cdc4242 SHA512 a12fee1d9fcf5f300fe0725e8ad4dab1a9926273bbad35195c5d7b1b189ef7949be88cc6015c8abe5a6dde2e93f9de5cc58f6b0e2e3ec421f77e926aa3f8243b
+AUX 0.99-math.patch 182 BLAKE2B 18d5fd5b465ef6bd67caa435184b5dabb96114128b50c824ca12c01066b3138391008e96500b1c0b1b9e92f28a73c994cddb7a7ab770c428703964b6e5bd3cfd SHA512 6688e2c6a4a2537af94823d0bc845f6d764cb755689309712d29af951a092b4df030645792c248752e88a5013730dc34a6256be1219a57d0a3498738aeeb3a0a
+AUX yarsrevenge-0.99-gcc43.patch 219 BLAKE2B 23b1aa4f4e15abb04b1391ac65b0258bc65a778ea646824ba5ed49ecc4405dfa09f93bd323bd0cb4a3b531be89de8af3d8b14b4735f027958a89a102569eb5d0 SHA512 2cd2549113930e0868fb551ad7a2e024278a8012b013b44762059303cb967d9c57d557e67702b5b01d0195fa885533770820a18c0e742838122e77473c86f93f
+AUX yarsrevenge-0.99-gcc44.patch 258 BLAKE2B 71defcf5d287e3611b54850c50ebbceff81fbd0b84420dfac44c618cce1bb4db9014f532e6daced744b846fe634e8ccf040395192195b589d16f85909b9b8eef SHA512 dc3fbec65cd49950141bbd64b7b4a711217b0ac267166c71a9d175f1ba20fcedad97c1b89476d5c6f3a1630c5eae68d0f44738dba4383bb576edd059acd060e8
 DIST yar-0.99.tar.gz 535043 BLAKE2B 8760a039b987d701cfbeccf7612b14d60a1867b737999afb94383d9123cd82fe385dc12d410d333dceb07f580c75b7a515131f4b1ce2be25ee1725e6961150be SHA512 c520b9c6c7ff2c60c2e7e18e6c0d2ff376334706fb190ce0d015acba21815680029a30d7a573d0b4c41da2d9f932108417804141bf4557bc99550e30f699e8bb
-EBUILD yarsrevenge-0.99.ebuild 649 BLAKE2B d08840b0b18b9ab8650ed49b7f1d5a10d726830ad8a063730e5c07817a265719b01cf2d3d2a65aeb45513b149ce80bde06fe80f6f188c619c6babba19cb804a7 SHA512 1495c0ac7a3671ed2c9f7bc02435df5df98b069538e7fa116633d65ee40b49867107e059f370ce7c7793dfbdb2c93b70dfd48a469ee7f96e868bf3de2b3920ec
+EBUILD yarsrevenge-0.99-r1.ebuild 654 BLAKE2B 73d35237b0560d7daabe2c120c167acfb99cb6c641b83192f8c768af648160f32bc0a803881d609bbd462a589347d704bbb9b34b746689768f0e101e9a73e008 SHA512 4a06a7235e5dd96c3d26661f2ff39aaa4da23d0447c803c200a57036f3f575a11ad98e69db3eda7c388a03fe8400fdd09b2d86a98755ebfe4a9a92f1df437a00
 MISC metadata.xml 501 BLAKE2B ea182028d3c0df8a6c1ecaa82bc71ccab959b16316e1d1044f12d9ffbad8c4ec40aadac0fa2a3f46e65cfebfa33c64eac58fc44822ff702e6ca68d0496715caa SHA512 c822cb194e0fbc444a4b5a577d2abb319d010318cf2107507c87d24ca9ade92e2ce1afddac8d196f3f23667a3401224868ae157a559d761bc09ef668aa5406f3
diff --git a/games-arcade/yarsrevenge/files/0.99-math.patch b/games-arcade/yarsrevenge/files/0.99-math.patch
index 5d7d4619d9c5..5e1136972325 100644
--- a/games-arcade/yarsrevenge/files/0.99-math.patch
+++ b/games-arcade/yarsrevenge/files/0.99-math.patch
@@ -1,5 +1,5 @@
---- yar/graphics.cpp.orig	2004-06-02 14:14:38.174071320 -0400
-+++ yar/graphics.cpp		2004-06-02 14:14:50.352219960 -0400
+--- a/yar/graphics.cpp.orig	2004-06-02 14:14:38.174071320 -0400
++++ b/yar/graphics.cpp		2004-06-02 14:14:50.352219960 -0400
 @@ -18,2 +18,3 @@
  #include "yar.hxx"
 +#include <cmath>
diff --git a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch
index fe32b6c74e6c..511fad0091e1 100644
--- a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch
+++ b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch
@@ -1,5 +1,5 @@
---- yar/sgw.hxx
-+++ yar/sgw.hxx
+--- a/yar/sgw.hxx
++++ b/yar/sgw.hxx
 @@ -24,6 +24,7 @@
  

  #include <iostream>

diff --git a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch
index fca41cfbdf35..29a52125c904 100644
--- a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch
+++ b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch
@@ -1,5 +1,5 @@
---- yar/game.cpp
-+++ yar/game.cpp
+--- a/yar/game.cpp
++++ b/yar/game.cpp
 @@ -15,6 +15,7 @@
   *                                                                         *
   ***************************************************************************/
diff --git a/games-arcade/yarsrevenge/yarsrevenge-0.99.ebuild b/games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild
index 76607474077f..b6923570b8f4 100644
--- a/games-arcade/yarsrevenge/yarsrevenge-0.99.ebuild
+++ b/games-arcade/yarsrevenge/yarsrevenge-0.99-r1.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 games
+EAPI=6
+inherit desktop
 
-DESCRIPTION="remake of the Atari 2600 classic Yar's Revenge"
+DESCRIPTION="Remake of the Atari 2600 classic Yar's Revenge"
 HOMEPAGE="http://freshmeat.net/projects/yarsrevenge/"
 SRC_URI="http://www.autismuk.freeserve.co.uk/yar-${PV}.tar.gz"
 
@@ -14,18 +14,17 @@ KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="media-libs/libsdl[sound,joystick,video]"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/yar-${PV}
+S="${WORKDIR}/yar-${PV}"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-math.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PV}-math.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+)
 
 src_install() {
 	default
-	prepgamesdirs
+	make_desktop_entry "${PN}" "Yar's Revenge"
 }