gentoo resync : 25.08.2020

4 files changed, 53 insertions, 11 deletions

diff --git a/games-emulation/dgen-sdl/Manifest b/games-emulation/dgen-sdl/Manifest
index 27f46d59279b..b1b1aa169e65 100644
--- a/games-emulation/dgen-sdl/Manifest
+++ b/games-emulation/dgen-sdl/Manifest
@@ -1,4 +1,6 @@
+AUX dgen-sdl-1.33-AM_PROG_AR.patch 186 BLAKE2B 92d05ca07800625bc06b03b1d589df4ee6451f0ad314709fcd4ab6fc56d55b264b18d172cea3fc238b5e63fe6a1f550d7cc01e345ecb5f79424a34071dbac46d SHA512 1a249b69271fbaef5339b3eb81e6eaa9991fc803dbbd72aa83cca198ca17e9f29169ed558e80e4ac0572b366128d453c5310af61cb4f4949a2b418b59ceee7ac
+AUX dgen-sdl-1.33-clang-c++11.patch 472 BLAKE2B dc6e1e93c28a5d7f830d74b86be8b4c42aac37f11137c008a26c200f742d8223cf09cd2578b874fd0009437ee7ef74fabbf61dd51113b9f0eebeb8026685f652 SHA512 e5fdbccfcbd434c4974e387f59718530895d180daaf7a33c3c702f1435ca6bfc070829dceb57abbb7fdfecb89221a86fa1a3abab4c8490ae4dbff561207ad5ee
 AUX dgen-sdl-1.33-joystick.patch 406 BLAKE2B 175ac9aee89e657dc48f2c0d8f63019da310fc33dbde271dfb3d7cab79d9533136b02c4761063fc56f88764c0f6afacc687f13fe3e4a1acf99fbd0792694e76c SHA512 0057f4099b941cc1aa1fc4d2d260c3bb7601f8149542ab4a87b3306f839ec6e8306fd00d0f2f87d770cc956a60841ff608095ca7bbc3e0e143f6c057f4d21e58
 DIST dgen-sdl-1.33.tar.gz 939297 BLAKE2B e7d107425f8d2c396e37bd140c9ccebe96f7365ac729faac748e1ccf53ebae30fedc59f05070cdcb16d59a7870b6679e4f6e0dda83a697342c2a692c565a4d13 SHA512 c98ab8cdced62a5d26fd677ad36b031e756620114c946ac067599e84ae6ebcfab731554dd4337b6314c3b5db4601c8a6cc67c285d2aad136e659b9973c01a749
-EBUILD dgen-sdl-1.33-r1.ebuild 825 BLAKE2B 6094564d53612df217efc0d81040883390d4bac149c1630e09b6a1078d4157bfc4720c49af45042e44c1f4f3f02312d6efb5d8a4e475419a46119a91cb352376 SHA512 b9d088beb9a75205745f19a97557c20eae8c2c3318d85576a153a12e831ad578ada032d8ddfe6d05927bac0485c6ffeb04e38a349c39d19f26d057ae2faec6d2
+EBUILD dgen-sdl-1.33-r1.ebuild 940 BLAKE2B d1dd33a3319628e87d26503e9895ba2a1ad9a693d910e06a7baf006e14c40b854b2c7ae26f09bd8951bd4ae2f84560512d034ccd8077075d324db1fe6ae840c6 SHA512 d957b3a91f26b520dfaf6ae4d63114e376416ada0e50800c27a9dc6e7db08f1dd2cb9ea0855b2cd8362eb7d23fab44393811719b842c1819712a0caa1fce41e9
 MISC metadata.xml 327 BLAKE2B c719679eeb00833778ba9a80981dd32cfba3e8d498b378b07eff877d65bbed1c878a0522abe25c5d60f78c89e637a23ae4bbd79a5200cf26677fe25a4e74020a SHA512 17031a8025df3d06c71dfb85bf2870eac32e84e86797296aa4a7e7cd24ac579a7305a7664d05e2054e4ad11da6c683011e8132dce0e6ea7dab0b8f70dc984a9b
diff --git a/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild b/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
index 5d9acdc094b9..3d541bd2cb8c 100644
--- a/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
+++ b/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator"
 HOMEPAGE="http://dgen.sourceforge.net/"
@@ -15,13 +17,20 @@ IUSE="joystick opengl"
 RDEPEND="
 	media-libs/libsdl[joystick?,opengl?]
 	app-arch/libarchive
-	opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-joystick.patch )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}"
+BDEPEND="x86? ( dev-lang/nasm )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-joystick.patch
+	"${FILESDIR}"/${P}-AM_PROG_AR.patch
+	"${FILESDIR}"/${P}-clang-c++11.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf \
@@ -36,5 +45,6 @@ src_compile() {
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog README sample.dgenrc" default
+	default
+	dodoc sample.dgenrc
 }
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-AM_PROG_AR.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-AM_PROG_AR.patch
new file mode 100644
index 000000000000..e04efcc01f38
--- /dev/null
+++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-AM_PROG_AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,7 @@
+ AC_PROG_CXXCPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++AM_PROG_AR
+ AC_PROG_RANLIB
+ 
+ dnl Set the value of make, if make doesn't already.
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-clang-c++11.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-clang-c++11.patch
new file mode 100644
index 000000000000..55810b004f2c
--- /dev/null
+++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-clang-c++11.patch
@@ -0,0 +1,20 @@
+--- a/main.cpp
++++ b/main.cpp
+@@ -82,7 +82,7 @@
+ static void help()
+ {
+   printf(
+-  "DGen/SDL v"VER"\n"
++  "DGen/SDL v" VER "\n"
+   "Usage: dgen [options] [romname [...]]\n\n"
+   "Where options are:\n"
+   "    -v              Print version number and exit.\n"
+@@ -256,7 +256,7 @@
+ 	{
+ 	case 'v':
+ 	  // Show version and exit
+-	  printf("DGen/SDL version "VER"\n");
++	  printf("DGen/SDL version " VER "\n");
+ 	  return 0;
+ 	case 'r':
+ 	  // Parse another RC file or stdin