gentoo resync : 30.04.2018

4 files changed, 43 insertions, 38 deletions

diff --git a/games-emulation/gnuboy/Manifest b/games-emulation/gnuboy/Manifest
index e80727d52400..fc71139ab44c 100644
--- a/games-emulation/gnuboy/Manifest
+++ b/games-emulation/gnuboy/Manifest
@@ -1,6 +1,6 @@
-AUX gnuboy-1.0.3-exec-stack.patch 475 BLAKE2B ca4a84f4a7ba34d23a6fe378639a8c97b226525b6d4d3e1bcfe308e39e7a2156c2c3dd31a17db23b31c4d7a8d71b6df8b2cab2376a90da34134a043ef3c74d8e SHA512 801d217cb8dbe4fb6957e6acc31658bbfa90843178a7343cf52d84f1464787da67f6f579f6dcb1ab2c54fef50289d181014f8b179dfcac6c32949ccaeaaca364
+AUX gnuboy-1.0.3-exec-stack.patch 487 BLAKE2B 09cc0019eed65610d67b4c305588b990c9458f8d59349b98fb9ddb274b614c85548928ee38ef68db871db095be40da6450c1444d45f72eb997db9d348eae0332 SHA512 b579b15906bf104f9db86bb49452c26a3eff0cebe2a66349f3b308742d9fe29823879df7658ce542a2d7397b664b7ba5297eb3c266fab1ddfb32ad73da78a693
 AUX gnuboy-1.0.3-include.patch 350 BLAKE2B 30d5bd6fc959e56cd3f6a49b38b86f973cb2b119856921675cdd1c5b665e13e62e9fd675adbc5340c9e1ed715aead8445c50e63b78a31106497fdf08cbcb79a7 SHA512 9815515c39bf0a387b32e0038a050dd7ca51b5b47d539ee39fcb77b1908735890aac9abfd7d1fe03733d7c9359398b1688f401aa2170ac48d0ed6d2d50acf04d
-AUX gnuboy-1.0.3-linux-headers.patch 1685 BLAKE2B 11ccf8ca4104775c8ec3cb326818edc24de6b00332f7d3254b2ef6f1ef0331e2e549474e8b540ff99b8f350364b250c2ea7c0040380f02234e7c142e2e2ba849 SHA512 2cf51c37d7d4cfc230a7ec032c62c22c6fb33c6f05b78e38b8bd033cbcde37b45ab8bef68bfa72374fdcf85139c2504c808516648ae435f7f8f26efa9bd2a56e
+AUX gnuboy-1.0.3-linux-headers.patch 1721 BLAKE2B 2ce538da8270a7893ddeb4233954b9abc8237785ed085cef8129108eaef93d5c34e37b65db246c91c61b2b7e71bf452b0317ceb5ee7b5a169b764e5f1fb44790 SHA512 710fd830cabea8fee05ab07a6342470a1176d7ed1c5ed14c110f47218d7d3b57704c09e0887da6152b05ed1b12e5a6959efde865359c220756176290617b3917
 DIST gnuboy-1.0.3.tar.gz 187627 BLAKE2B 1fe01abceae56244d28544f10cc5659063cfe19ac491374bcb2b818f01385e065385fcba01e0038f51d4b29bcb3018f02402adb820c0a556c201334766595a51 SHA512 89e8075dac5ec17b375a5739367b46c55130211fb487a052be1cca49a5d86cc1a7f1619b2b2473d744fbe3c51fdb1a11110b15836cc9cc9de588932b91d258e6
-EBUILD gnuboy-1.0.3-r1.ebuild 1075 BLAKE2B e2e985799ffc184939eadadc41ab1ac0fe7bdd4bf0c07a9158829bf2ae7f45ab21c536500c906f892d9957ee97905d50c84c7d86abf0f89238905a397c5bbf21 SHA512 99f340116e15f8b5f736a1689b6a09c9320432555b4b821a79f64cf89208904f472a27298ce72742af27df713659b32291365b5579b2a510d3fcb403d4b57847
+EBUILD gnuboy-1.0.3-r2.ebuild 1089 BLAKE2B 9a60d2006a88ad5a77d8206c4c7d819f0b1125c368cc385c8f4144d8a0444d863f570717164e3353f072fe4910510bbe16ae589defcd483e41041886e7b0b3d4 SHA512 89672f1f34f21634d871fd7498ad3afdbc470524c918af0d5179ebe44050a8385ecdf08afbb6fcd9640d50d6078b7d03dc7b3fd145d1fa3e087b1613cc5553bb
 MISC metadata.xml 329 BLAKE2B 121873380b3adf5f6fc460d258de391a75a04f4d50b285c1f882e7461814133507981e7829ae1a783eddfc56933c328fdced934d04e5092a9c0e0f6eca7bfbdf SHA512 79c14f0442b618a82acc9b067360ef978d009fb61a44d869d0c6b4df375b005bc721ce8b90ac80be2bdb8e40e95e111b941a5ac9f006470eefc3b41459b52463
diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
index b8059f915f6f..a263ee49599e 100644
--- a/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
+++ b/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
@@ -1,5 +1,5 @@
---- asm/i386/cpu.s
-+++ asm/i386/cpu.s
+--- a/asm/i386/cpu.s
++++ b/asm/i386/cpu.s
 @@ -2428,3 +2428,6 @@
  
  
@@ -7,8 +7,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- asm/i386/lcd.s
-+++ asm/i386/lcd.s
+--- a/asm/i386/lcd.s
++++ b/asm/i386/lcd.s
 @@ -288,3 +288,6 @@
  
  
@@ -16,8 +16,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- asm/i386/refresh.s
-+++ asm/i386/refresh.s
+--- a/asm/i386/refresh.s
++++ b/asm/i386/refresh.s
 @@ -283,3 +283,6 @@
  
  
diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
index b0dd24a8e50e..543bd2434eed 100644
--- a/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
+++ b/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
@@ -1,7 +1,7 @@
 # -ansi breaks <linux/joystick.h>
 
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -133,7 +133,7 @@
  if test "$enable_warnings" = yes ; then
  case "$CC" in *gcc*)
@@ -11,8 +11,8 @@
  *)
  AC_MSG_RESULT(disabling warnings for non-gcc compiler) ;;
  esac
---- loader.c
-+++ loader.c
+--- a/loader.c
++++ b/loader.c
 @@ -11,7 +11,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -21,8 +21,8 @@
  
  static int mbc_table[256] =
  {
---- main.c
-+++ main.c
+--- a/main.c
++++ b/main.c
 @@ -8,7 +8,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -31,8 +31,8 @@
  
  #include <stdarg.h>
  #include <signal.h>
---- path.c
-+++ path.c
+--- a/path.c
++++ b/path.c
 @@ -5,7 +5,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -41,8 +41,8 @@
  
  #ifdef ALT_PATH_SEP
  #define SEP ';'
---- rckeys.c
-+++ rckeys.c
+--- a/rckeys.c
++++ b/rckeys.c
 @@ -4,7 +4,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -51,8 +51,8 @@
  
  #include "defs.h"
  #include "rc.h"
---- rcvars.c
-+++ rcvars.c
+--- a/rcvars.c
++++ b/rcvars.c
 @@ -5,7 +5,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -61,8 +61,8 @@
  
  #include "defs.h"
  #include "rc.h"
---- sys/linux/fbdev.c
-+++ sys/linux/fbdev.c
+--- a/sys/linux/fbdev.c
++++ b/sys/linux/fbdev.c
 @@ -10,7 +10,6 @@
  
  #include <stdlib.h>
@@ -71,8 +71,8 @@
  #include <unistd.h>
  #include <sys/mman.h>
  #include <linux/fb.h>
---- sys/linux/joy.c
-+++ sys/linux/joy.c
+--- a/sys/linux/joy.c
++++ b/sys/linux/joy.c
 @@ -2,7 +2,6 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -81,8 +81,8 @@
  #include <linux/joystick.h>
  #include <sys/types.h>
  #include <sys/stat.h>
---- sys/oss/oss.c
-+++ sys/oss/oss.c
+--- a/sys/oss/oss.c
++++ b/sys/oss/oss.c
 @@ -2,7 +2,6 @@
  
  #include <stdlib.h>
diff --git a/games-emulation/gnuboy/gnuboy-1.0.3-r1.ebuild b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
index 86111def6f70..3c4e37c07831 100644
--- a/games-emulation/gnuboy/gnuboy-1.0.3-r1.ebuild
+++ b/games-emulation/gnuboy/gnuboy-1.0.3-r2.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
 
 DESCRIPTION="Gameboy emulator with multiple renderers"
 HOMEPAGE="https://sourceforge.net/projects/gnuboy/"
@@ -13,19 +13,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X sdl"
 
-RDEPEND="sdl? ( media-libs/libsdl )
+RDEPEND="
+	sdl? ( media-libs/libsdl )
 	!X? ( media-libs/libsdl )
-	X? ( x11-libs/libXext )"
+	X? ( x11-libs/libXext )
+"
 DEPEND="${RDEPEND}
-	X? ( x11-proto/xextproto
-		x11-proto/xproto )"
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto )
+"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-exec-stack.patch \
 		"${FILESDIR}"/${P}-linux-headers.patch \
 		"${FILESDIR}"/${P}-include.patch
 
+	mv configure.in configure.ac || die
 	eautoreconf
 }
 
@@ -36,7 +42,7 @@ src_configure() {
 		myconf="--with-sdl"
 	fi
 
-	egamesconf \
+	econf \
 		$(use_with X x) \
 		$(use_with sdl) \
 		$(use_enable x86 asm) \
@@ -49,9 +55,8 @@ src_install() {
 	for f in sdlgnuboy xgnuboy
 	do
 		if [[ -f ${f} ]] ; then
-			dogamesbin ${f}
+			dobin ${f}
 		fi
 	done
 	dodoc README docs/{CHANGES,CONFIG,CREDITS,FAQ,HACKING,WHATSNEW}
-	prepgamesdirs
 }