gentoo resync : 30.04.2018

4 files changed, 33 insertions, 32 deletions

diff --git a/games-emulation/nestra/Manifest b/games-emulation/nestra/Manifest
index c351a7e1d3fb..f9cdd9ebcf3e 100644
--- a/games-emulation/nestra/Manifest
+++ b/games-emulation/nestra/Manifest
@@ -1,6 +1,6 @@
-AUX nestra-0.66-exec-stack.patch 235 BLAKE2B e5039dc07c79c706331e780b9f9f49d2f0038584218ce9588ed194d2bf47663963fd6480b9ebc3748fe9ee6b4b7a70d4d3098597427842e3f10fe22fe9a77b5b SHA512 a281f6c79de782982425f65cc4c54f35530d394caee4b0c58c9ef3f0f11b38d6ab6c31ecd6e708effb31ca530f1c9fb7ec60cf23d58f4a750dfc86a6c6e43b67
-AUX nestra-0.66-include.patch 1269 BLAKE2B 895df693d31ef78204b3148b31eee31de6637595707422fa71122fb9c324341a4b46afb80530a2090af0c74700d54f328c14ee910a8c15608d7b108b0884aeab SHA512 d2b53ca1b61c71ff6ad98aee15c2f5cfeb02eaa8b7544e9a0d23babe021ee53aede5ad935b0529c1d6d294424c7ca1a5ea6e390af6c4f40aac4da9b43b87b601
+AUX nestra-0.66-exec-stack.patch 239 BLAKE2B 47255490442da874ddea390664928aa77734c67d2dbe84cfe8be82e5fe6042408ca5650164f3c1e8aa396db71be9234933cc18a423b2c08f3c311f589675ec95 SHA512 a65ca4225707a496fcb3fbc968ba301b654c9357b33a6153cb19905080cf1f5ee76bbf6b5510e1886de8a2cfb2c5ebaed3a166d518db50aecfb5953c36ee9a43
+AUX nestra-0.66-include.patch 1297 BLAKE2B 98a52017fc1919fde5125771b267f0ef2b0c73ef29f81f3e2bac3672c6bab5be005028310d031486d143568efbd8ccf7c2d58c4d9bee9d5532e3ac872465fe83 SHA512 f95568a3433094555067a89c59a38519ee2bef6cdce8a0ba962976c5df6be3332fa18c0c4b6635c807ed2b22a40a75e22b9a26282b5e8190659f59c64f212389
 DIST nestra-0.66.tar.gz 49757 BLAKE2B 0ec8603cd9afc33a1b194e1c39cdc8d3173d1ad4c7c76e6e00214883cdfcd8f2cf35bfb4b74e131822aaf8c7864a50980d642bc87aca26372f06b8fab145a7cf SHA512 25f9d0c0359b46ddcd451552e7737b0f955a18e7a4ebd30d5494b12f787b9c45a49579207328c06c10efc7f8283bc688eb2061c538523ed257825b2394d978ce
 DIST nestra_0.66-10.diff.gz 2414 BLAKE2B 5b83ac9eee4d8c141dc473000b5f713ab4eb0a38707334d4fd044b9617f01b83c4a19670ef27874f6511f1f9b1d578ba35d5ba9ac244621b19ca3b9c00d5a30d SHA512 4ea1ad97f6c2eca0434dee4031e0486cc1c7c25237a467d4bf33bd0656b52441143855e07b29e1bdcf95514e19fe68ecb8f73d0972d17d9e3b6fd7a92d2db8c6
-EBUILD nestra-0.66-r2.ebuild 1085 BLAKE2B 57eb36f9fb36b107e4cb3485871a991187ea033c89b0c27633773dabdd5ce99a1daea6d6939a36c4990b875dfefbf771dd8288b7fae1a79e54733f624133ada3 SHA512 22c60c759776f49565d4e27284dbc886c2aa8bb5d8dd5aa0756925e8694aa142d1254253ac458ada1ff2f0b79f3a02c4392368ad921096390e4d1c72836e43ad
+EBUILD nestra-0.66-r3.ebuild 1046 BLAKE2B f36be92637c5125c5019b8c95ab8c8eb28a91999725c2a4de24ea76a46bfca945600dc0eab1b3ed4e8aa126ae7375192858f5d33d782fb087055043a1c77a0a4 SHA512 ae7ec1c29eb73c5cd9f478f84b517fae99dd0e7c3bc421e6850236577c260d35204fa37d6b78963012f1045b1ab30a3db1622feb1be156d93a159856093a4330
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch b/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
index f5c662e22600..d9e9b3c61147 100644
--- a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
+++ b/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
@@ -1,5 +1,5 @@
---- x86.S.orig	2006-01-09 20:02:58.000000000 -0500
-+++ x86.S	2006-01-09 20:03:38.000000000 -0500
+--- a/x86.S.orig	2006-01-09 20:02:58.000000000 -0500
++++ b/x86.S	2006-01-09 20:03:38.000000000 -0500
 @@ -1458,3 +1458,7 @@
   leal   0x1(%eax),%ebx
   popl   %eax
diff --git a/games-emulation/nestra/files/nestra-0.66-include.patch b/games-emulation/nestra/files/nestra-0.66-include.patch
index b4733b172bba..096fd18af47f 100644
--- a/games-emulation/nestra/files/nestra-0.66-include.patch
+++ b/games-emulation/nestra/files/nestra-0.66-include.patch
@@ -1,5 +1,5 @@
---- comptbl.c
-+++ comptbl.c
+--- a/comptbl.c
++++ b/comptbl.c
 @@ -9,6 +9,7 @@
  #include <stdio.h>
  #include <string.h>
@@ -8,8 +8,8 @@
  
  #define ALLOC_SIZE 0x400000 /* 4MB */
  #define TBL_BASE ((unsigned char *)0x10000000)
---- d6502.c
-+++ d6502.c
+--- a/d6502.c
++++ b/d6502.c
 @@ -1,6 +1,7 @@
  /* 6502 disassembler */
  /* Public Domain */
@@ -18,8 +18,8 @@
  #include "globals.h"
  
  char Opcodes_6502[256][4]={
---- emu.c
-+++ emu.c
+--- a/emu.c
++++ b/emu.c
 @@ -12,6 +12,7 @@
  #include <sys/mman.h>
  #include <stdio.h>
@@ -28,8 +28,8 @@
  
  #include "mapper.h"
  #include "io.h"
---- fb.c
-+++ fb.c
+--- a/fb.c
++++ b/fb.c
 @@ -2,6 +2,8 @@
  /* Framebuffer/pixmap rendering */
  /* Public Domain */
@@ -39,8 +39,8 @@
  #include <stdio.h>
  #include "mapper.h"
  #include "globals.h"
---- io.c
-+++ io.c
+--- a/io.c
++++ b/io.c
 @@ -5,6 +5,7 @@
     to do I/O operations. */
  
@@ -49,8 +49,8 @@
  #include "mapper.h"
  #include "io.h"
  #include "globals.h"
---- mapper.c
-+++ mapper.c
+--- a/mapper.c
++++ b/mapper.c
 @@ -1,6 +1,7 @@
  /* Nestra mapper.c */
  /* Public Domain */
@@ -59,8 +59,8 @@
  #include "mapper.h"
  #include "consts.h"
  
---- x11.c
-+++ x11.c
+--- a/x11.c
++++ b/x11.c
 @@ -1,6 +1,9 @@
  /* Nestra x11.c */
  /* Public Domain */
diff --git a/games-emulation/nestra/nestra-0.66-r2.ebuild b/games-emulation/nestra/nestra-0.66-r3.ebuild
index 0dabb4e9895f..44ca1daa1d33 100644
--- a/games-emulation/nestra/nestra-0.66-r2.ebuild
+++ b/games-emulation/nestra/nestra-0.66-r3.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 toolchain-funcs flag-o-matic multilib games
+EAPI=6
+inherit epatch toolchain-funcs flag-o-matic
 
 PATCH="${P/-/_}-10.diff"
 DESCRIPTION="NES emulation for Linux/x86"
@@ -16,17 +16,19 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
-	epatch \
-		"${WORKDIR}"/${PATCH} \
-		"${FILESDIR}"/${P}-exec-stack.patch \
-		"${FILESDIR}"/${P}-include.patch
+	default
+	epatch "${WORKDIR}"/${PATCH}
+	eapply "${FILESDIR}"/${P}-exec-stack.patch
+	eapply "${FILESDIR}"/${P}-include.patch
+
 	append-ldflags -Wl,-z,noexecstack
 	use amd64 && multilib_toolchain_setup x86
+
 	sed -i \
 		-e "s:-L/usr/X11R6/lib:${LDFLAGS}:" \
 		-e 's:-O2 ::' \
@@ -37,12 +39,11 @@ src_prepare() {
 
 src_compile() {
 	use amd64 && multilib_toolchain_setup x86
-	games_src_compile
+	default
 }
 
 src_install() {
-	dogamesbin nestra
-	dodoc BUGS CHANGES README
+	dobin nestra
+	einstalldocs
 	doman nestra.6
-	prepgamesdirs
 }