gentoo resync : 25.11.2020

5 files changed, 118 insertions, 49 deletions

diff --git a/games-emulation/gens/Manifest b/games-emulation/gens/Manifest
index 9d767dd2b427..d04d7ed0c957 100644
--- a/games-emulation/gens/Manifest
+++ b/games-emulation/gens/Manifest
@@ -1,7 +1,9 @@
 AUX gens-2.15.5-as-needed.patch 367 BLAKE2B 145f1d54665e2a0a50a11c18bca22c9ec17b420d3439812f4d82ca259486ee4e3ffcf8b47a5cff7bd61a838ad6723ce9fa9d1d4448d3d51b5638861d5109f970 SHA512 be44bd13b869a9181d740f850dcb7a6f6cfc8660bf31cdf515beffa989fc64e120e7dc3b683f702ec6059805bc37f18a104f420fd3f84a438f26b09da82dd4a8
+AUX gens-2.15.5-fno-common.patch 1086 BLAKE2B d20d475af49ebf75a6e4297ee42d927bc07ba0ad43c24442c45235c44b1196e3a212e551ec90c1bf6a7ed9bbd4917bbd14004414395a72e0d1ce6e3ebc0a4820 SHA512 9d4871ece77c708fc2395fcc086df22fe4b477f62c190c941167db8ef31a11dff8861b388986ea884c3a207929acd0f796d6b26de85301c57433b84ae990776d
 AUX gens-2.15.5-gcc34.patch 1545 BLAKE2B c0a4b73fb0ead7ccd98660c8684e88dc8b04179cee114c3d984b9ab699a8f3f5c680b55068847d225645ea32f03eed21841e0e01aeb2c80d15f40d7ad52a5f13 SHA512 8af2946ac09a18adc2d35ea7797acfdb107b86b29b6bf412a87080e4cc66e45bb5a61823095766bde2ca3e95768a1ac243e39b1d06f9bd99f20b7fdec71d1ef0
 AUX gens-2.15.5-ovflfix.patch 581 BLAKE2B a4b44f6b59e03021f9b68603b0011d88fc14284e3e817c970d97a2e8ebbc1454eef339869da680e0b5073b96a7786fb39a1fa997c0d0a6911837c0220a59b0b1 SHA512 cc21dfabeba4cf413853c8d7d0779448c9aab318c2bd83894622ea132eae645000b77d9ef803bb1643f5f6b1b11263f4dfaf66e50a905730e592a628654c33f7
 AUX gens-2.15.5-romsdir.patch 575 BLAKE2B 2af287d30b5ff6c28a306fb35733cd8a715ffe1ae20da117b5f9dd3520f54c39a906d9bcd6b6003ce2cb4bd09d55d10bf25164d71f9400548360b9736cb5aa06 SHA512 73b75f4b8087931b20b1b8c220ce64e957ca0cdeb91a59a90b29b4376420e567093f0ae6d6525cdf3930f555720b27c9f152ec5bbf0365743a0bac236da115e6
+AUX gens-2.15.5-zlib-OF.patch 196 BLAKE2B 44fda98c9270c05601d8464ac93c2d1e9174227c2b253617566fb908ed2e10f8feeebf61afe59abe560d5f239da5022a2174cd3db46d7acef164d7d6e40b4f71 SHA512 8444e5c32afaa845d93d75801723c50527a0d860de862f203aaf2f212109e4520cb517ae9d58f77200a75a48b9d5fe1952aec68b502b39a2c2e480c034347c2d
 DIST gens-2.15.5.tar.gz 741852 BLAKE2B 17501077737ea7320f9675c130c89cc0e078ad413e7af32c55c5db8d0fa2ba099db26d1272c32e09e86bb11fd49f364b0597540261414d366198afb24a10bc7a SHA512 7163f6a1e09bac420e0e4aa0f8f3ed255406d9aff3cc7366c40226e7fece78baca5428d0fe87daf0f12f6e10b428477a795b54d008db5e3dcbf7692ed9d9fe7d
-EBUILD gens-2.15.5-r1.ebuild 1039 BLAKE2B 3f45d90fe1ed3b9210a03fe33fec6d86d75854dde240aa45d6c9ccb3acdd013108280a40c81518eb5cb9e1ad26f9e88cd796a79f8d085dbc30adda55b4426679 SHA512 9a2486425226271ab06d8c5977590f86885748c63b51c35246e55ea5ffd69f22ee909214b8d2d084c6444e881857306f1729e1819b349d59ae2f0d1a079265ed
+EBUILD gens-2.15.5-r2.ebuild 1118 BLAKE2B 1493700d0f84b25879dc3df34a6d67abb5b9521f3ad106a1162745bfcc2af660287c65ffb8d85daa1055dc32efbcca45a2f8d97a11cd2aeb4d00ce048c694ed3 SHA512 0586ff087275680037a9060f1ebdb9d7d9440517369ec26f6f111b0ce69267d5acea31e3bf9314b66a3c9f02f541d5aaf27908e314b5fd972096ea2899abc04e
 MISC metadata.xml 327 BLAKE2B 2eb11640da9741a65ebe22b58a03e88d5432c69cef02a4db90801bc65d06987e3a8056401efca51ed70846666922d312bb1f38189cea7a53e9e0c1afbde55fa9 SHA512 651fefa76d513b3f2a0ecf865547bf7046605ef21fa689e620820464a28b3b2e5b288623e7ca71bcae93cc016871240025caf1fdb04a45a0695ec457098434b4
diff --git a/games-emulation/gens/files/gens-2.15.5-fno-common.patch b/games-emulation/gens/files/gens-2.15.5-fno-common.patch
new file mode 100644
index 000000000000..b4493378e6f0
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.15.5-fno-common.patch
@@ -0,0 +1,58 @@
+--- a/src/gens/gens_core/sound/ym2612.c
++++ b/src/gens/gens_core/sound/ym2612.c
+@@ -241,7 +241,7 @@
+  ***********************************************/
+ 
+ 
+-INLINE void
++void
+ CALC_FINC_SL (slot_ * SL, int finc, int kc)
+ {
+   int ksr;
+@@ -284,7 +284,7 @@
+ }
+ 
+ 
+-INLINE void
++void
+ CALC_FINC_CH (channel_ * CH)
+ {
+   int finc, kc;
+@@ -305,7 +305,7 @@
+  ***********************************************/
+ 
+ 
+-INLINE void
++void
+ KEY_ON (channel_ * CH, int nsl)
+ {
+   slot_ *SL = &(CH->SLOT[nsl]);	// on recupère le bon pointeur de slot
+@@ -331,7 +331,7 @@
+ }
+ 
+ 
+-INLINE void
++void
+ KEY_OFF (channel_ * CH, int nsl)
+ {
+   slot_ *SL = &(CH->SLOT[nsl]);	// on recupère le bon pointeur de slot
+@@ -351,7 +351,7 @@
+ }
+ 
+ 
+-INLINE void
++void
+ CSM_Key_Control ()
+ {
+   KEY_ON (&YM2612.CHANNEL[2], 0);
+--- a/src/gens/segacd/cd_aspi.c
++++ b/src/gens/segacd/cd_aspi.c
+@@ -55,7 +55,7 @@
+ DWORD (*Get_ASPI_Version) (void);
+ DWORD (*Send_ASPI_Command) (LPSRB);
+ int ASPI_Command_Running;
+-int CDROM_SPEED;
++extern int CDROM_SPEED;
+ int Num_CD_Drive;
+ int CUR_DEV; // a che serve?
+ int DEV_PAR[8][3];
diff --git a/games-emulation/gens/files/gens-2.15.5-zlib-OF.patch b/games-emulation/gens/files/gens-2.15.5-zlib-OF.patch
new file mode 100644
index 000000000000..5a357cc633e0
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.15.5-zlib-OF.patch
@@ -0,0 +1,7 @@
+--- a/src/gens/util/file/unzip.h
++++ b/src/gens/util/file/unzip.h
+@@ -1,3 +1,4 @@
++#define OF(x) x
+ /* unzip.h -- IO for uncompress .zip files using zlib 
+    Version 0.15 beta, Mar 19th, 1998,
+ 
diff --git a/games-emulation/gens/gens-2.15.5-r1.ebuild b/games-emulation/gens/gens-2.15.5-r1.ebuild
deleted file mode 100644
index de49e5ffa082..000000000000
--- a/games-emulation/gens/gens-2.15.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="A Sega Genesis/CD/32X emulator"
-HOMEPAGE="https://sourceforge.net/projects/gens/"
-SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/opengl
-	>=media-libs/libsdl-1.2[joystick,video]
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/nasm-0.98
-"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-romsdir.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch \
-		"${FILESDIR}"/${P}-gcc34.patch
-	sed -i -e '1i#define OF(x) x' src/gens/util/file/unzip.h || die
-	append-ldflags -Wl,-z,noexecstack
-}
-
-src_configure() {
-	use amd64 && multilib_toolchain_setup x86 #441876
-	econf \
-		--disable-gtktest \
-		--disable-sdltest
-}
-
-src_install() {
-	DOCS="AUTHORS BUGS README gens.txt history.txt" \
-		default
-	newicon pixmaps/gens_small.png ${PN}.png
-	make_desktop_entry "${PN}" "Gens"
-}
diff --git a/games-emulation/gens/gens-2.15.5-r2.ebuild b/games-emulation/gens/gens-2.15.5-r2.ebuild
new file mode 100644
index 000000000000..7b8c385e9b04
--- /dev/null
+++ b/games-emulation/gens/gens-2.15.5-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_32 )
+
+inherit desktop flag-o-matic multilib-build
+
+DESCRIPTION="A Sega Genesis/CD/32X emulator"
+HOMEPAGE="https://sourceforge.net/projects/gens/"
+SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[${MULTILIB_USEDEP},joystick,video]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/opengl[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-lang/nasm-0.98"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-romsdir.patch
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-ovflfix.patch
+	"${FILESDIR}"/${P}-gcc34.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-zlib-OF.patch
+)
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	use amd64 && multilib_toolchain_setup x86 #441876
+
+	econf \
+		--disable-gtktest \
+		--disable-sdltest
+}
+
+src_install() {
+	default
+	dodoc gens.txt history.txt
+
+	newicon pixmaps/gens_small.png gens.png
+	make_desktop_entry "gens" "Gens"
+}