gentoo resync : 25.08.2020

8 files changed, 107 insertions, 67 deletions

diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
index fdc7077ee71a..e83283aa9239 100644
--- a/games-emulation/generator/Manifest
+++ b/games-emulation/generator/Manifest
@@ -1,7 +1,6 @@
-AUX generator-0.35_p4-configure.patch 3634 BLAKE2B 726c133bb419bc8226d31043b851cceb6077e8a3dc7fd4a351d9117933b219012d812b25c6b96b0569e066191adc786e2ec02ed723b7eb14ca3e3e326188aa40 SHA512 bed25bc2d951d4c369265b4790754ba4e63d5beda803a655dc240ac76004b57ba1bc3823c4a35f6fa2ee5e5a9b22827c46e090f63536b4d6b959986cc016c1ed
-AUX generator-0.35_p4-gcc-9.patch 910 BLAKE2B 3ce9f860d426eec544d15661009b163a3987007faacbc94f336442d46217559b0f427494a08a0cda7e4390f005f9d1f7f4cde0917c41535f5ac6a5344d501d6e SHA512 407adae63334745dce89d8432a2b3142ebc7ca57b040fc104bfe1bdd6e03bdd3b82c9605ddb247e7b4ce1102ce71486b463e7ec92eb4b4c40fe9527198a280ca
-AUX generator-0.35_p4-inline.patch 465 BLAKE2B 8818f566ad1987e09fbc49eae5b216c5d620bfa989fdbed61e0c700862ee9fd6f20e6e0010284ee6854a8fc4299a685fde41937f2d5e32675298f3adf8615b4c SHA512 9776dbe2e8f725b8f542ae382fe8da193987c9e12d857c359de2c32402f4dee729c92837aa543efe4ba7c6c66d81e3e505496a783598621d20f724509d4358ba
-AUX generator-0.35_p4-underlink.patch 513 BLAKE2B 8424efa3326db4f627ffab9a8a6c8f55e0f5477f31a830fada195d6cfd3ded01734d70981ea27ca06341009385ea00cbe1ac3f7ffa23bdba5eb3f2c35f800820 SHA512 0947c6365ee33d15c136906385da761e0f6e4d92356b0e3eaf8c3cdcd82c87982d18e6bc35690ac448b9e9dab213358f5f55c0d3be2f3eaece7bdd776479319b
+AUX generator-0.35_p4-autoconf.patch 3689 BLAKE2B f9d2a2314c143bb534fdcd587503b5cfa583bc9c213d48a3beb5ba6f0b0afba2d11b8b68c1eb5d449b95923bf6b99933140701c080ffe13e649101948a7f5b97 SHA512 914d6281957ea259b7f0683aa900699fa11e96aafccd68cff3056e6704fbaab829052db517baee39c5f55e83c5d5788dca7f79a83f4387344afb5784d39e493c
+AUX generator-0.35_p4-automake.patch 950 BLAKE2B 5ce5a77c865610448b4e187a944ecee93e45bcfbb6a34caa9bc2f573e3ba64b6f613923c3e4c75c5da79e0818912bdfc9bd1e83ed0dbeed423073ad59277db1e SHA512 7833d0bf75936e6049d9096b29779e3c2354701e699fa5b720cdd450efa0260cf661767ea203c1cf4b60656c1ea6fa0c2508b7ffb0efbdf70d8029df2aff63c1
+AUX generator-0.35_p4-gcc.patch 1677 BLAKE2B a3a44721007ee9f8996a220f88d2264ff301f1a77ebc2dbfd092bf989d00b4a48b0379510a6438468a93b2b5ed6b976a4f1f3562eb028be8f9d08091ae166b66 SHA512 7cdc78d9455bf9fc8dc643c74d200ffcefb45016400002d0c55d76dcf81af7278cb1dc1fe34a7c0228cbf595835e30000a1fccf60ca622a3700391ad6aa12afe
 DIST generator-0.35-cbiere-r4.tar.bz2 435289 BLAKE2B 962785fd5f87cfd03cba3238fb0d9d29b6ea42f2b44a5314c328c1c008f9fe005696556be79632e36e29948474612a8f3014dfecd47eca06014b1d7174787ed5 SHA512 73fd36d8004135c172025b3eb3385f731e294935413d7ac905672f1a88434ca332325821c5f15d5ae83fb1385fcde9f1e7f32242f8ac175bb96bd535b5d91620
-EBUILD generator-0.35_p4-r1.ebuild 1052 BLAKE2B 5e25180dbdb16d8299ba76c919b9c4c53a4ba3aff09de9099f6145e8aaf79c69f3cfcbacf554d71744690bb76ddddb1bef5b5341d6d04c33ccd241dfd59ed0f7 SHA512 855734a1f005384237080a1692dcfa4c1ebce956fbd0482f9680b77e17076e9c044624fdd919ed07f224ec44e0b204e14a9f108af09adb7425d507830edd6714
+EBUILD generator-0.35_p4-r1.ebuild 943 BLAKE2B 241623f535b5622e82ba12dcc8e98233054d5bf1673104161ced8c9b8df2cfe3fce52140fea22e8c30a505f6790ea0479c144fd4dce7602dfb73156e50ae6382 SHA512 7b58c77fa58cdff5a0e8a1cc96183a2cf367355f40f2774cf9c32fadaa0983d6f8b400df245cada725ff26e8153d475c0248a3c62f2cc2a8f331bfbffe34a208
 MISC metadata.xml 326 BLAKE2B b5532fc7965a4b39312288491e98a48de5acdf76c1c5c92ddff370631484f6a57160eb2f983f6086d249b6cf9bba8b8dae47633c2bb38325e2d3faa175099253 SHA512 10d43e88d746f422d5751b87175a6ec76468d1f829d65aa554acced5075cfa39b6fd0d589a87d71a3127f70a718653e24444710f3e669dab3c0587a6b138ca67
diff --git a/games-emulation/generator/files/generator-0.35_p4-configure.patch b/games-emulation/generator/files/generator-0.35_p4-autoconf.patch
index a918c4a97113..ccc9655a2a72 100644
--- a/games-emulation/generator/files/generator-0.35_p4-configure.patch
+++ b/games-emulation/generator/files/generator-0.35_p4-autoconf.patch
@@ -1,5 +1,5 @@
---- a/configure.ac.original	2008-03-17 13:07:48.000000000 -0400
-+++ b/configure.ac	2008-03-17 13:08:03.000000000 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -28,15 +28,12 @@
    AC_ARG_WITH(tcltk,
                AS_HELP_STRING(--with-tcltk,Create tcltk version),
@@ -68,7 +68,15 @@
    AC_CHECK_LIB(jpeg, jpeg_start_compress, 
      [ MY_LIBS="-ljpeg $MY_LIBS"; AC_DEFINE(JPEG, 1, [JPEG features]) ])
  
-@@ -272,14 +225,7 @@
+@@ -259,6 +212,7 @@
+   AC_PROG_CC
+   AC_PROG_CPP
+   AC_PROG_RANLIB
++  AM_PROG_AR
+   AC_PROG_MAKE_SET
+   AC_ISC_POSIX
+   AC_PROG_INSTALL
+@@ -272,14 +226,7 @@
  
    AC_PATH_XTRA
  
@@ -84,7 +92,7 @@
      MY_SUBDIRS="gtkopts $MY_SUBDIRS"
      AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
  
-@@ -305,6 +251,7 @@
+@@ -305,6 +252,7 @@
    AC_CHECK_SIZEOF(unsigned long, 4)
    AC_CHECK_SIZEOF(unsigned long long, 8)
    AC_CHECK_HEADERS(sys/param.h)
diff --git a/games-emulation/generator/files/generator-0.35_p4-automake.patch b/games-emulation/generator/files/generator-0.35_p4-automake.patch
new file mode 100644
index 000000000000..e04ed94b9be8
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-automake.patch
@@ -0,0 +1,26 @@
+--- a/cpu68k/Makefile.am
++++ b/cpu68k/Makefile.am
+@@ -29,6 +29,7 @@
+ 
+ gen68k_SOURCES = gen68k.c tab68k.c
+ gen68k_DEPENDENCIES = def68k-iibs.h
++BUILT_SOURCES = def68k-iibs.h
+ 
+ noinst_LIBRARIES = lib68k.a
+ lib68k_a_SOURCES = cpu68k-0.c cpu68k-1.c cpu68k-2.c cpu68k-3.c \
+--- a/main/Makefile.am
++++ b/main/Makefile.am
+@@ -3,11 +3,11 @@
+ INCLUDES = -I../hdr -I. -I../cpu68k -I../ym2612 -I../raze -I../cmz80 \
+            -I../sn76496 -I../gtkopts \
+            -DFNAME_TCLSCRIPT=\"${datadir}/generator/gen.tcl\" \
+-           @GTK_CFLAGS@ @SDL_CFLAGS@
++           @SDL_CFLAGS@
+ bin_PROGRAMS = @PROGRAM@
+ EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
+                  generator-gtk generator-sdl
+-LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \
++LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \
+         ../sn76496/libsn76496.a
+ 
+ ## this should be generator_tcltk_DATA but it won't let me do that
diff --git a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch b/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch
deleted file mode 100644
index 7b8eeafb7154..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/698944
-
---- a/main/vdp.c
-+++ b/main/vdp.c
-@@ -87,7 +87,7 @@ void vdp_describe(void);
- void vdp_eventinit(void);
- void vdp_layer_simple(unsigned int layer, unsigned int priority,
-                       uint8 *fielddata, unsigned int lineoffset);
--inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-+static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-                          uint8 *cellloc, unsigned int lineoffset);
- void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
- int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
-@@ -1733,7 +1733,7 @@ void vdp_endfield(void)
-      vdp_event_endline); */
- }
- 
--inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-+static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-                          uint8 *cellloc, unsigned int lineoffset)
- {
-   int y, x;
diff --git a/games-emulation/generator/files/generator-0.35_p4-gcc.patch b/games-emulation/generator/files/generator-0.35_p4-gcc.patch
new file mode 100644
index 000000000000..e82512f0e3fb
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-gcc.patch
@@ -0,0 +1,53 @@
+--- a/hdr/cpuz80.h
++++ b/hdr/cpuz80.h
+@@ -5,7 +5,7 @@
+ #  include "raze.h"
+ #else
+ #  include "cmz80.h"
+-CONTEXTMZ80 cpuz80_z80; /* extern'd for save state code */
++extern CONTEXTMZ80 cpuz80_z80; /* extern'd for save state code */
+ #endif
+ 
+ #define LEN_SRAM 0x2000
+--- a/main/event.c
++++ b/main/event.c
+@@ -15,7 +15,7 @@
+ 
+ /* time for next event - update vdp_event - return when to call again */
+ 
+-inline void event_nextevent(void)
++void event_nextevent(void)
+ {
+   /* call this when it *is* time for the next event as dictated by vdp_event,
+      so we switch on it and update vdp_event at the same time */
+--- a/main/vdp.c
++++ b/main/vdp.c
+@@ -87,7 +87,7 @@
+ void vdp_eventinit(void);
+ void vdp_layer_simple(unsigned int layer, unsigned int priority,
+                       uint8 *fielddata, unsigned int lineoffset);
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset);
+ void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
+ int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
+@@ -1733,7 +1733,7 @@
+      vdp_event_endline); */
+ }
+ 
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+                          uint8 *cellloc, unsigned int lineoffset)
+ {
+   int y, x;
+--- a/ym2612/support.h
++++ b/ym2612/support.h
+@@ -3,7 +3,7 @@
+ #include "config.h"
+ 
+ #define errorlog 0
+-#define INLINE inline
++#define INLINE
+ #define HAS_YM2612 1
+ #define YM2612UpdateRequest(x) 
+ #define AY8910_set_clock(chip,clock)
diff --git a/games-emulation/generator/files/generator-0.35_p4-inline.patch b/games-emulation/generator/files/generator-0.35_p4-inline.patch
deleted file mode 100644
index e7f09fa3689c..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-inline.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur generator-0.35-cbiere-r4/ym2612/support.h generator-0.35-cbiere-r4-patched/ym2612/support.h
---- generator-0.35-cbiere-r4/ym2612/support.h	2005-08-27 05:12:29.000000000 -0400
-+++ generator-0.35-cbiere-r4-patched/ym2612/support.h	2018-03-26 11:49:36.000000000 -0400
-@@ -3,7 +3,7 @@
- #include "config.h"
- 
- #define errorlog 0
--#define INLINE inline
-+#define INLINE
- #define HAS_YM2612 1
- #define YM2612UpdateRequest(x) 
- #define AY8910_set_clock(chip,clock)
diff --git a/games-emulation/generator/files/generator-0.35_p4-underlink.patch b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
deleted file mode 100644
index b350e8b8a334..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main/Makefile.am.old	2011-06-20 21:35:25.832460030 +0200
-+++ b/main/Makefile.am	2011-06-20 21:36:29.490503981 +0200
-@@ -7,7 +7,7 @@
- bin_PROGRAMS = @PROGRAM@
- EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
-                  generator-gtk generator-sdl
--LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \
-+LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \
-         ../sn76496/libsn76496.a
- 
- ## this should be generator_tcltk_DATA but it won't let me do that
diff --git a/games-emulation/generator/generator-0.35_p4-r1.ebuild b/games-emulation/generator/generator-0.35_p4-r1.ebuild
index 54614d750d78..4b25e85945f4 100644
--- a/games-emulation/generator/generator-0.35_p4-r1.ebuild
+++ b/games-emulation/generator/generator-0.35_p4-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools toolchain-funcs
 
 MY_P="${PN}-${PV/_p/-cbiere-r}"
@@ -14,26 +15,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+sdlaudio"
 
-DEPEND="
+RDEPEND="
 	virtual/jpeg:0
 	media-libs/libsdl[joystick,video]
-	sdlaudio? ( media-libs/libsdl[sound] )
-"
-RDEPEND="${DEPEND}"
+	sdlaudio? ( media-libs/libsdl[sound] )"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-inline.patch
-	"${FILESDIR}"/${P}-gcc-9.patch
+	"${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-gcc.patch
 )
 
 src_prepare() {
 	default
-
-	sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die
 	eautoreconf
 }
 
@@ -48,5 +45,7 @@ src_configure() {
 
 src_install() {
 	dobin main/generator-sdl
-	dodoc AUTHORS ChangeLog NEWS README TODO docs/*
+
+	einstalldocs
+	dodoc -r docs/.
 }