gentoo resync : 30.04.2018

5 files changed, 24 insertions, 20 deletions

diff --git a/games-emulation/gens/Manifest b/games-emulation/gens/Manifest
index 0d49e4248178..9d767dd2b427 100644
--- a/games-emulation/gens/Manifest
+++ b/games-emulation/gens/Manifest
@@ -1,7 +1,7 @@
-AUX gens-2.15.5-as-needed.patch 363 BLAKE2B 297d96f6c08bda407e9a8e7d3e518f177b85556855ccef7337215efb1378ed69d100ef36e34a926a108242809dab69d91d1c21e4a97eaeb47662a44e0f6f9b1c SHA512 f45c01cd60ac989123a226eb11341d5470dd2b0a4e03057cd4923b1314a08e88a5c2076363d1cb2321a016ae4073d90967b02acc29ca2f1a5e37f7c367efcea4
+AUX gens-2.15.5-as-needed.patch 367 BLAKE2B 145f1d54665e2a0a50a11c18bca22c9ec17b420d3439812f4d82ca259486ee4e3ffcf8b47a5cff7bd61a838ad6723ce9fa9d1d4448d3d51b5638861d5109f970 SHA512 be44bd13b869a9181d740f850dcb7a6f6cfc8660bf31cdf515beffa989fc64e120e7dc3b683f702ec6059805bc37f18a104f420fd3f84a438f26b09da82dd4a8
 AUX gens-2.15.5-gcc34.patch 1545 BLAKE2B c0a4b73fb0ead7ccd98660c8684e88dc8b04179cee114c3d984b9ab699a8f3f5c680b55068847d225645ea32f03eed21841e0e01aeb2c80d15f40d7ad52a5f13 SHA512 8af2946ac09a18adc2d35ea7797acfdb107b86b29b6bf412a87080e4cc66e45bb5a61823095766bde2ca3e95768a1ac243e39b1d06f9bd99f20b7fdec71d1ef0
-AUX gens-2.15.5-ovflfix.patch 577 BLAKE2B b7d10bfa565b98365e67e0fea94bf559972bc5ff44d37d98883ab62451b7fcb5c853207214aeb8c4812ea42d33c64c66f7723e78159429647c2c9be390e2ea46 SHA512 8c878b929f8a13bd8e33730cd09a4ebab4f47ed07ab02af88815ae8d02fd0d7a64ad44a4e369e2ad086022de207957dc88f99738bca737e50e18e951165f2631
-AUX gens-2.15.5-romsdir.patch 571 BLAKE2B e661b51378b24975885addd8535182098c4930d0276f6d5c604f4be47eb8261e3967184cf286c23469a0cd9218e506496fdd924199eeaa772da00bb0be9919af SHA512 02dbdb3410ce62fc17469f0e8b2ee4d14025b218c71c4b27af8dfe71d319d51710b111e2104009f06579a3b499971218b72d75a993862e2657388a5194caa73f
+AUX gens-2.15.5-ovflfix.patch 581 BLAKE2B a4b44f6b59e03021f9b68603b0011d88fc14284e3e817c970d97a2e8ebbc1454eef339869da680e0b5073b96a7786fb39a1fa997c0d0a6911837c0220a59b0b1 SHA512 cc21dfabeba4cf413853c8d7d0779448c9aab318c2bd83894622ea132eae645000b77d9ef803bb1643f5f6b1b11263f4dfaf66e50a905730e592a628654c33f7
+AUX gens-2.15.5-romsdir.patch 575 BLAKE2B 2af287d30b5ff6c28a306fb35733cd8a715ffe1ae20da117b5f9dd3520f54c39a906d9bcd6b6003ce2cb4bd09d55d10bf25164d71f9400548360b9736cb5aa06 SHA512 73b75f4b8087931b20b1b8c220ce64e957ca0cdeb91a59a90b29b4376420e567093f0ae6d6525cdf3930f555720b27c9f152ec5bbf0365743a0bac236da115e6
 DIST gens-2.15.5.tar.gz 741852 BLAKE2B 17501077737ea7320f9675c130c89cc0e078ad413e7af32c55c5db8d0fa2ba099db26d1272c32e09e86bb11fd49f364b0597540261414d366198afb24a10bc7a SHA512 7163f6a1e09bac420e0e4aa0f8f3ed255406d9aff3cc7366c40226e7fece78baca5428d0fe87daf0f12f6e10b428477a795b54d008db5e3dcbf7692ed9d9fe7d
-EBUILD gens-2.15.5.ebuild 993 BLAKE2B fcf8b645d84f9f77541252ff4cd80ef0070d4dc3b4ba9d0ecdee12b873bf08f282b083f57f71f680eb36ce941111c9cf8af50fc44edcecaba5c45aacee458c05 SHA512 0956f1f3ce76a9c7b1f0062add85a9e9954454534940f9695e24da24cd231d50240e0c1f91537a19829176da621d859ebd9e6f0b50902a1248c81c487cfecee8
+EBUILD gens-2.15.5-r1.ebuild 1039 BLAKE2B 3f45d90fe1ed3b9210a03fe33fec6d86d75854dde240aa45d6c9ccb3acdd013108280a40c81518eb5cb9e1ad26f9e88cd796a79f8d085dbc30adda55b4426679 SHA512 9a2486425226271ab06d8c5977590f86885748c63b51c35246e55ea5ffd69f22ee909214b8d2d084c6444e881857306f1729e1819b349d59ae2f0d1a079265ed
 MISC metadata.xml 327 BLAKE2B 2eb11640da9741a65ebe22b58a03e88d5432c69cef02a4db90801bc65d06987e3a8056401efca51ed70846666922d312bb1f38189cea7a53e9e0c1afbde55fa9 SHA512 651fefa76d513b3f2a0ecf865547bf7046605ef21fa689e620820464a28b3b2e5b288623e7ca71bcae93cc016871240025caf1fdb04a45a0695ec457098434b4
diff --git a/games-emulation/gens/files/gens-2.15.5-as-needed.patch b/games-emulation/gens/files/gens-2.15.5-as-needed.patch
index 02aed32b802c..2b58e7f94b33 100644
--- a/games-emulation/gens/files/gens-2.15.5-as-needed.patch
+++ b/games-emulation/gens/files/gens-2.15.5-as-needed.patch
@@ -1,5 +1,5 @@
---- configure.old       2009-02-04 14:41:40.000000000 +0100
-+++ configure   2009-02-04 14:48:52.000000000 +0100
+--- a/configure.old       2009-02-04 14:41:40.000000000 +0100
++++ b/configure   2009-02-04 14:48:52.000000000 +0100
 @@ -4929,7 +4929,7 @@
         { echo "$as_me:$LINENO: result: $with_opengl" >&5
  echo "${ECHO_T}$with_opengl" >&6; }
diff --git a/games-emulation/gens/files/gens-2.15.5-ovflfix.patch b/games-emulation/gens/files/gens-2.15.5-ovflfix.patch
index f5b98a54245f..fdbef69dba0a 100644
--- a/games-emulation/gens/files/gens-2.15.5-ovflfix.patch
+++ b/games-emulation/gens/files/gens-2.15.5-ovflfix.patch
@@ -1,5 +1,5 @@
---- src/gens/gens_core/cpu/68k/cpu_68k.c.old	2010-10-28 09:34:52.000000000 +0200
-+++ src/gens/gens_core/cpu/68k/cpu_68k.c	2010-10-28 09:35:53.000000000 +0200
+--- a/src/gens/gens_core/cpu/68k/cpu_68k.c.old	2010-10-28 09:34:52.000000000 +0200
++++ b/src/gens/gens_core/cpu/68k/cpu_68k.c	2010-10-28 09:35:53.000000000 +0200
 @@ -239,8 +239,8 @@
    memset (Ram_Word_2M, 0, 256 * 1024);
    memset (Ram_Word_1M, 0, 256 * 1024);
diff --git a/games-emulation/gens/files/gens-2.15.5-romsdir.patch b/games-emulation/gens/files/gens-2.15.5-romsdir.patch
index 606efe2dd6f9..c885552f12d5 100644
--- a/games-emulation/gens/files/gens-2.15.5-romsdir.patch
+++ b/games-emulation/gens/files/gens-2.15.5-romsdir.patch
@@ -1,6 +1,6 @@
 diff -ruN gens-rc3.5-opengl/src/gens/util/rom.c gens-rc3.5-opengl-patched/src/gens/util/rom.c
---- src/gens/util/file/rom.c	2005-01-10 22:24:01.000000000 +0100
-+++ src/gens/util/file/rom.c	2006-10-29 14:58:14.000000000 +0100
+--- a/src/gens/util/file/rom.c	2005-01-10 22:24:01.000000000 +0100
++++ b/src/gens/util/file/rom.c	2006-10-29 14:58:14.000000000 +0100
 @@ -411,6 +411,9 @@
      create_file_chooser_dialog ("Open Rom", GTK_FILE_CHOOSER_ACTION_OPEN);
  //      fileselection_set_dir (fd.filesel, Rom_Dir);
diff --git a/games-emulation/gens/gens-2.15.5.ebuild b/games-emulation/gens/gens-2.15.5-r1.ebuild
index 9d936ba15a39..de49e5ffa082 100644
--- a/games-emulation/gens/gens-2.15.5.ebuild
+++ b/games-emulation/gens/gens-2.15.5-r1.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 eutils flag-o-matic games
+EAPI=6
+inherit desktop flag-o-matic
 
 DESCRIPTION="A Sega Genesis/CD/32X emulator"
 HOMEPAGE="https://sourceforge.net/projects/gens/"
@@ -10,17 +10,21 @@ SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="virtual/opengl
+RDEPEND="
+	virtual/opengl
 	>=media-libs/libsdl-1.2[joystick,video]
-	x11-libs/gtk+:2"
+	x11-libs/gtk+:2
+"
 DEPEND="${RDEPEND}
-	>=dev-lang/nasm-0.98"
+	>=dev-lang/nasm-0.98
+"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-romsdir.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
 		"${FILESDIR}"/${P}-ovflfix.patch \
@@ -30,7 +34,8 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf \
+	use amd64 && multilib_toolchain_setup x86 #441876
+	econf \
 		--disable-gtktest \
 		--disable-sdltest
 }
@@ -40,5 +45,4 @@ src_install() {
 		default
 	newicon pixmaps/gens_small.png ${PN}.png
 	make_desktop_entry "${PN}" "Gens"
-	prepgamesdirs
 }