gentoo resync : 28.04.2018

3 files changed, 32 insertions, 31 deletions

diff --git a/games-arcade/ri-li/Manifest b/games-arcade/ri-li/Manifest
index b0115c04cb22..34d44b8765bd 100644
--- a/games-arcade/ri-li/Manifest
+++ b/games-arcade/ri-li/Manifest
@@ -1,4 +1,4 @@
-AUX ri-li-2.0.1-gcc43.patch 8576 BLAKE2B 31e695a87183a75314da59aa292ef9bc0c911f1fb770c7a5491014010bceac73a8d116c4487075cd948f09a09be3889728ec169ff441cafd8e119a909300357e SHA512 d2776b8398a2f7749e62e981dc3980553df4e27aa7ad1d1ef7064a422348c4778cbc640c7cce0a153f2dcad4b269d2d87be9071a9df09c896a6115de87e16ef1
+AUX ri-li-2.0.1-gcc43.patch 8620 BLAKE2B 069966fe27a3bbccf6a2ee8d15e591d1537accb6713fb07b2d6e964ecff52eb8de95e03a6d858b6e7dd3499f4724b6fc69c44792a93502893aa4c703495cac36 SHA512 30e7641c7aeb24e5904dc70115d72b9392db0a54bcf0b327b64c5225ad76ea3eecb492f688a2fc4c0142984862fa5fda85477e97fbb391f20adf7947354b1c53
 DIST Ri-li-2.0.1.tar.bz2 13745398 BLAKE2B 29fdc812387c5fc3d9868ea137b556e08c0b6239ed4cebc8ed92f2530005191f2916dd143d8b417c2654ec902409307ca7f486d17374eabcac555de3714f888b SHA512 6d56c00dae90b50bca81ca739c628335b4ad7642c19a3b3c28630ddb91bd847ca6d383cace66ef436a1dda7497c9d3939de2626071bae40d423b2444fed97863
-EBUILD ri-li-2.0.1.ebuild 753 BLAKE2B 05a5dc3e4f9f0b8a8cceec7dca80380c3b6d85b98789edad75cda08772064b918d5adeae59939831660a1225d9d95c01b4a0086b145b171f0f80fb88a23ba92d SHA512 b6a99a7c02dab9cf8f90e1b2d290d38af624c2bd6588cb8e1d5fade2f6edde98d791ec8b0be9e2c03a6c43e84c0241d6d315bca6e63ecf601aead57f61f15d28
+EBUILD ri-li-2.0.1-r1.ebuild 740 BLAKE2B e17e855b7881231f068ea71fe93e2192abcf48ea587c8771ab8740ea60a70df27d6af07103fc5b353553290c06edf12523e14158a6e605b8cd2865221ddb5dfb SHA512 f50da34038c1fd16ab3dfa52727978ff2b12b6ccd98ba873670e5976d490a241eb9a8b104320246ab4aa69cac706018260869c6c1abae3c2128f5144514a86dd
 MISC metadata.xml 328 BLAKE2B a4415f172fe6ff0b8c76d6d97aefc4e3d910c61b7ae1db25dcb729d36f791f87c5aeba81382e9474b5565032a29bc376acc9105b91a0e335e6f4ad5a44e67a46 SHA512 fecf94d4aa2ffbc8fbf439f3a5efb839d6789d65c76e64455c58b2d0c9491cb0982dcf1ed1cfff9409212a52fc9bcf4b7ef39a67a5186540f7a0412a519a8bbf
diff --git a/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch b/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch
index 7c7de0f9395d..3782627c83bd 100644
--- a/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch
+++ b/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch
@@ -1,5 +1,5 @@
---- src/audio.cc
-+++ src/audio.cc
+--- a/src/audio.cc
++++ b/src/audio.cc
 @@ -22,7 +22,7 @@
  //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  
@@ -18,8 +18,8 @@
      return false;
    }
    
---- src/ecran.cc
-+++ src/ecran.cc
+--- a/src/ecran.cc
++++ b/src/ecran.cc
 @@ -21,7 +21,7 @@
  //    with this program; if not, write to the Free Software Foundation, Inc.,
  //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -29,8 +29,8 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <math.h>
---- src/editeur.cc
-+++ src/editeur.cc
+--- a/src/editeur.cc
++++ b/src/editeur.cc
 @@ -25,7 +25,7 @@
  #include <windows.h>
  #endif
@@ -49,8 +49,8 @@
        exit(-1);
      }
      
---- src/jeux.cc
-+++ src/jeux.cc
+--- a/src/jeux.cc
++++ b/src/jeux.cc
 @@ -25,7 +25,7 @@
  #include <windows.h>
  #endif
@@ -60,8 +60,8 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
---- src/loco.cc
-+++ src/loco.cc
+--- a/src/loco.cc
++++ b/src/loco.cc
 @@ -21,7 +21,7 @@
  //    with this program; if not, write to the Free Software Foundation, Inc.,
  //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -71,8 +71,8 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
---- src/main.cc
-+++ src/main.cc
+--- a/src/main.cc
++++ b/src/main.cc
 @@ -23,7 +23,7 @@
  
  #include <stdio.h>
@@ -109,8 +109,8 @@
      exit(-1);
    }
    // Change le nom de la fenetre
---- src/menu.cc
-+++ src/menu.cc
+--- a/src/menu.cc
++++ b/src/menu.cc
 @@ -21,7 +21,7 @@
  //    with this program; if not, write to the Free Software Foundation, Inc.,
  //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -138,8 +138,8 @@
      exit(-1);
    }
    
---- src/mouse.cc
-+++ src/mouse.cc
+--- a/src/mouse.cc
++++ b/src/mouse.cc
 @@ -21,7 +21,7 @@
  //    with this program; if not, write to the Free Software Foundation, Inc.,
  //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -149,8 +149,8 @@
  #include <stdio.h>
  #include "mouse.h"
  #include "preference.h"
---- src/sprite.cc
-+++ src/sprite.cc
+--- a/src/sprite.cc
++++ b/src/sprite.cc
 @@ -21,7 +21,7 @@
  //    with this program; if not, write to the Free Software Foundation, Inc.,
  //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -205,8 +205,8 @@
      return false;
    }
    return true;
---- src/tableau.cc
-+++ src/tableau.cc
+--- a/src/tableau.cc
++++ b/src/tableau.cc
 @@ -21,7 +21,7 @@
  //    with this program; if not, write to the Free Software Foundation, Inc.,
  //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -216,8 +216,8 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include "preference.h"
---- src/utils.cc
-+++ src/utils.cc
+--- a/src/utils.cc
++++ b/src/utils.cc
 @@ -21,7 +21,7 @@
  //    with this program; if not, write to the Free Software Foundation, Inc.,
  //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/games-arcade/ri-li/ri-li-2.0.1.ebuild b/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild
index b978172bb74a..9fc7f0cd4a6a 100644
--- a/games-arcade/ri-li/ri-li-2.0.1.ebuild
+++ b/games-arcade/ri-li/ri-li-2.0.1-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 autotools eutils games
+EAPI=6
+inherit autotools desktop
 
 DESCRIPTION="Drive a toy wood engine and collect all the coaches"
 HOMEPAGE="http://ri-li.sourceforge.net/"
@@ -16,10 +16,12 @@ IUSE=""
 DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer[mod]"
 RDEPEND="${DEPEND}"
-S=${WORKDIR}/Ri-li-${PV}
+
+S="${WORKDIR}/Ri-li-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch
+	default
+	eapply "${FILESDIR}"/${P}-gcc43.patch
 	mv configure.{in,ac}
 	rm aclocal.m4
 	eautoreconf
@@ -27,8 +29,7 @@ src_prepare() {
 
 src_install() {
 	default
-	rm -f "${D}${GAMES_DATADIR}/Ri-li/"*ebuild
+	rm -f "${ED}/usr/share/Ri-li/"*ebuild
 	newicon data/Ri-li-icon-48x48.png ${PN}.png
 	make_desktop_entry Ri_li Ri-li
-	prepgamesdirs
 }