gentoo auto-resync : 21:11:2022 - 07:03:53

4 files changed, 128 insertions, 11 deletions

diff --git a/games-emulation/gngb/Manifest b/games-emulation/gngb/Manifest
index 1a9c426f7284..ea22a097c3b9 100644
--- a/games-emulation/gngb/Manifest
+++ b/games-emulation/gngb/Manifest
@@ -1,11 +1,13 @@
 AUX gngb-20060309-amd64.patch 982 BLAKE2B 767efcd0db8ae30296a2326ae74b16f2ea776bee490a77ae6c7960ed96ac127e54e6bb896cc4bcaca43a5c3a5508ebb0bcad17c5c7af3add1104c95540090811 SHA512 91f3782ecaeac60ad60c14b8e173099683e85917765f1d8e1ce92edbbba929042e0254c2d7f4432124c1dd2c8965603e88172076bf4e3c6b427e8c46f25c0312
+AUX gngb-20060309-clang16.patch 1939 BLAKE2B de2fc6717cc3dfec2ee139c53e3e0e217d1b089310602599837df78a9ded5db4dc92080038b6a85a0b5d18e3d7d2bbe57533a3f96910d537029c6af2d653fe07 SHA512 ae97781fe687e08367bb358db05b8028caacf3d0ac8f65ccb90031bab49f8ca239d81feeac6c8e4369016978a6ee49e1f4a4eadf8b4cdf3f6505e39b3a30386a
 AUX gngb-20060309-gcc10.patch 10283 BLAKE2B 1979b78167df37698ab1884ab348e1e4e1ef0de297d94783021bac7f5044568a21077fc1de539bbecaafb00a4ba016e83dbcbd288c9473a48a740375bbf23f10 SHA512 edb8d21877eea65399c529f83f7a39061126e9d4e107b8c064b20a2a2287ab520c81a83bc3b64d6845d9e4f2134cdb0e79b4ebe5e99a998098d4e54ead4beed4
 AUX gngb-20060309-gcc34.patch 623 BLAKE2B 8861c3224bc01d4ce1ec5c062d473bb2ad6f533e834550ba7d53f416d684c44580169d36aa016a65d916f8ffe05aa336f1b60da285e253b7aa288c33f8518860 SHA512 651a0771d1b43762083bece5eb12ecba5833774fb095bdb00c0031e20d11b4a59daae4bdd519a2840a2dd5aa5ea0a852d968da7cf96de8acd7ac1ddd90968167
 AUX gngb-20060309-gcc5.patch 818 BLAKE2B 8b937260859a3bed1339f3d3a253fcc58aff3991503f03fbdc529446666e7a0c344469d10793e6ab31dba42f9b4db4b29181e1e3bdaed23bc41175056cc5f747 SHA512 f61dd42c766ee9fcdd02228401011b38dc9ecc7e87044b34f6d726a4fc9862ebabb39223b83967fce247a675a6cfa8037747e49ead4077b9a0aff522f7377e79
 AUX gngb-20060309-gcc7.patch 1693 BLAKE2B a47637993a219502c6f81750987ea7679935cd07e7cb2ad8ffbdb648a8b11c329ca55585949f172c3b0ce2b18592572a37c4302d59b9172e4d481d1a81871644 SHA512 ff73a5344c1b3d090fbd16c774ffb535f4586cd2b876f71654d1e3e127c1527bb9abe096e24f6c8fb5cff2d19c29b12aa1e6f56e760b00362ff44755711ec433
+AUX gngb-20060309-gentoo-zlib.patch 246 BLAKE2B 217d38d0ebaccfdfe872f7e83257848e21d1bfbaa1fb7bdaf4eff4dbad3d48e0ec98b145a876c813e08c515c599235f6392a93a7171d50a78bd4b3e2cc8c37ee SHA512 9a3b499617f9010e2aff500b649e933d4f9407da279111d60542c63e0c9a47a6ca65956a7bb993bf717459d9edbe72dcfab2da63270fff560448eeebfd612598
 AUX gngb-20060309-inline.patch 463 BLAKE2B 8946f6bc81e518b482fb93bac335b3a15a728736a06bb753692d6ac896d1ffc4f550d3aff8b41dbd1bf5d79d38c5c3edf969b7686d9fb05e654e49384d65055b SHA512 6a1916555f7855abde4a1ce3a6ba19575c3b92cd8e3eb9283757b54e1747ee37dce7005c2311d9faaeb5059e8157c742abfba072c912b1c6d5e40555a28c2b25
 AUX gngb-20060309-joystick.patch 2162 BLAKE2B f2c9bf3aad5468e5a4e587489b0737270c07d743a7ee710aada49a041f73d6a8afbdf4b8f1efa7ec2a582603b7a39e75c5b33765d965f9b85538dc7a7ff87d01 SHA512 535fcccfc986fdb4e555d0edca7ad4cbe33ed656a904bd32d4de516a4735ecdc7743e58e38a20d2b6015f515f7dbed6260a974ec92797b497a111b0e5bb1c24c
 AUX gngb-20060309-qwerty.patch 590 BLAKE2B 1042df2d545203547a691322ddfee05a76cd9a8a099e7ce14917f7b93ccee606ff9746a88c056409b838e4cd4a53703248bd1232be177d582a7774a80cf141af SHA512 756923c0d35b42adb69da6bf7c3c7cd89adc6402d758b8f2f50d2e527181841685b108cd9903c70a2e62b7ce3319dd1a784045866d50d9a21eabc870115779b9
 DIST gngb-20060309.tar.gz 168911 BLAKE2B 9377b107c3318041cf903de1661ec6a43078e1cade77b2899b6412616b2c5c32e217d5efc69fcc5324c75242f880493b1b3e678c5bc0a71a4a3ef2dbfd756b4c SHA512 169fdb94eac439240ff15fc2337908cb40e06259338d03c0193a0cb04acb9ee688832fc3157ec56e4e541a8889c4b1a4e7d0efb035b5829ffb856192b60d259f
-EBUILD gngb-20060309-r1.ebuild 988 BLAKE2B 8100a070924fe48d9ae4b0cd6a0bf85b049876cdab48a21fdab83a759ea11e50edeb6974a091120adb7455b2cd0c0aed59f05d5b25b659a99b7ba5bb09f75120 SHA512 904f06f7803a6f88db3b57626c1353a300cde87f047fa2f8b3dbf15d279eaee93c58d8b5200b290402af27c041d0e1cfdcb6410772af38ea054998547da530c9
+EBUILD gngb-20060309-r2.ebuild 1064 BLAKE2B bc9b8c140efdd096d52f9e6536cdacf50b6e639cf4b3aefee38a331bf4424d5d41e018494661d30fff53ad04d6acd4e51ffa04a612beda3eb3232c61985ce6d5 SHA512 a2ee1c1f92df3372dfe20fd6d05446e3011b9e4cef135c6b3c2aa32d512e299587671a7c7a1661cc93c84662e7d39d6f46620045934158241f0a41787e9a55bd
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-emulation/gngb/files/gngb-20060309-clang16.patch b/games-emulation/gngb/files/gngb-20060309-clang16.patch
new file mode 100644
index 000000000000..c365ec049873
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-clang16.patch
@@ -0,0 +1,100 @@
+gbserial_receive/wait_data() had issues but the functions are
+not used, just "if 0" rather than make sense of them.
+
+https://bugs.gentoo.org/858641
+https://bugs.gentoo.org/874999
+--- a/src/fileio.h
++++ b/src/fileio.h
+@@ -42,4 +42,9 @@
+ int gngb_file_eof(GNGB_FILE *f);
+ 
++#ifdef HAVE_LIBZ
++#include "unzip.h"
++int zip_file_open_next_rom(unzFile file);
++#endif
++
+ #endif
+ 
+--- a/src/memory.c
++++ b/src/memory.c
+@@ -32,4 +32,5 @@
+ #include "serial.h"
+ #include "message.h"
++#include "save.h"
+ #include "sgb.h"
+ 
+@@ -72,5 +73,8 @@
+ Sint16 joy_x_min=0;joy_x_max=0;joy_y_min=0;joy_y_max=0;
+ */
+-Sint16 joy_x_min=-32767;joy_x_max=32767;joy_y_min=-32767;joy_y_max=32767;
++Sint16 joy_x_min=-32767;
++Sint16 joy_x_max=32767;
++Sint16 joy_y_min=-32767;
++Sint16 joy_y_max=32767;
+ 
+ void (*select_rom_page)(Uint16 adr,Uint8 v);
+--- a/src/rom.h
++++ b/src/rom.h
+@@ -55,5 +55,8 @@
+ extern ROM_TIMER *rom_timer;
+ 
++int check_dir(char *dir_name);
+ int open_rom(char *filename);
++void get_ext_nb(char *r,int n);
++void get_bmp_ext_nb(char *r,int n);
+ 
+ #endif
+--- a/src/save.c
++++ b/src/save.c
+@@ -1,2 +1,3 @@
++#include <time.h>
+ #include "emu.h"
+ #include "fileio.h"
+@@ -6,4 +7,5 @@
+ #include "interrupt.h"
+ #include "cpu.h"
++#include "sound.h"
+ 
+ #define FILENAME_LEN 1024
+@@ -646,5 +648,5 @@
+ /* Movie */
+ 
+-GNGB_MOVIE gngb_movie={NULL,0,NULL};
++GNGB_MOVIE gngb_movie={{0},0,NULL};
+ 
+ void begin_save_movie(void) {
+--- a/src/serial.c
++++ b/src/serial.c
+@@ -218,4 +218,5 @@
+ }
+ 
++#if 0
+ Sint8 gbserial_receive(void) {
+ #ifndef WIN32
+@@ -237,4 +238,5 @@
+ #endif
+ }
++#endif
+ 
+ Uint8 gbserial_check2(void) {
+@@ -259,4 +261,5 @@
+ }
+ 
++#if 0
+ Uint8 gbserial_wait_data(void) {
+   Uint8 b;
+@@ -284,4 +287,5 @@
+   return 0;
+ }
++#endif
+ 
+ /* New GbSerial */
+--- a/src/serial.h
++++ b/src/serial.h
+@@ -42,4 +42,6 @@
+ Sint8 gbserial_receive(void);
+ char gbserial_check(void);
++Uint8 gbserial_read(void);
++void gbserial_write(Uint8 b);
+ Uint8 gbserial_wait_data(void);
+ 
diff --git a/games-emulation/gngb/files/gngb-20060309-gentoo-zlib.patch b/games-emulation/gngb/files/gngb-20060309-gentoo-zlib.patch
new file mode 100644
index 000000000000..bff6f5d6af9e
--- /dev/null
+++ b/games-emulation/gngb/files/gngb-20060309-gentoo-zlib.patch
@@ -0,0 +1,12 @@
+Gentoo's zlib.h does s/OF/_Z_OF/, so define OF if missing.
+https://bugs.gentoo.org/383179
+--- a/src/unzip.h
++++ b/src/unzip.h
+@@ -59,4 +59,7 @@
+ #endif
+ 
++#ifndef OF
++#define OF(x) x
++#endif
+ 
+ #define UNZ_OK                                  (0)
diff --git a/games-emulation/gngb/gngb-20060309-r1.ebuild b/games-emulation/gngb/gngb-20060309-r2.ebuild
index 5644e9baf78a..6ce2b27a4cb1 100644
--- a/games-emulation/gngb/gngb-20060309-r1.ebuild
+++ b/games-emulation/gngb/gngb-20060309-r2.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools
+EAPI=8
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="Gameboy / Gameboy Color emulator"
 HOMEPAGE="http://m.peponas.free.fr/gngb/"
 SRC_URI="http://m.peponas.free.fr/gngb/download/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="opengl"
 
 RDEPEND="
+	app-arch/bzip2:=
 	media-libs/libsdl[sound,joystick,video]
-	sys-libs/zlib
-	app-arch/bzip2
-	opengl? ( virtual/opengl )
-"
+	sys-libs/zlib:=
+	opengl? ( media-libs/libglvnd[X] )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
@@ -32,15 +32,18 @@ PATCHES=(
 	"${FILESDIR}"/${P}-qwerty.patch
 	# Ours
 	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}"/${P}-gentoo-zlib.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_prepare() {
 	default
-	sed -i -e '70i#define OF(x) x' src/unzip.h || die
-	mv configure.in configure.ac || die
+
 	eautoreconf
 }
 
 src_configure() {
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
 	econf $(use_enable opengl gl)
 }