gentoo resync : 30.04.2018

5 files changed, 40 insertions, 43 deletions

diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
index 64b597ad5c11..6d147332d635 100644
--- a/games-emulation/gngeo/Manifest
+++ b/games-emulation/gngeo/Manifest
@@ -1,7 +1,8 @@
-AUX gngeo-0.8-cflags.patch 1942 BLAKE2B 1c85a8a5b094c1771bf69459c7a9db04c42f4346e9053d2ce019bed5b36896d9c95ef0c5b08f2e550ba11f5c9d049df0440727678465bf23d5863e5e1764d900 SHA512 b777cffbdb6539bcf8d5f435dabe989ae29fc02051076ff8d761f2f9b6a8779c5a1666461f873f0b5c7638cf70de7c36f7614c24386ff72736bb4c1353f11f5b
-AUX gngeo-0.8-concurrentMake.patch 631 BLAKE2B 117a41c402e51910d2b15c544f516497fae388510df1c2338800b0a10c00ad82588dd208727e58429a93f8987fba2e1d9f85ce102eeff210f59ec56edd0106f9 SHA512 050de6034a799e7dad41ebb2a65fb9a7ad3dd39da96151dac376a2c58862c1eeed19bb8f9b3479ffc2b2248131370d3065a73a37ce0390e5839607a6f8df6c1c
-AUX gngeo-0.8-execstacks.patch 2465 BLAKE2B bba183440d8096df11e01b389ba727da1b365d7affa8965f3e15db1377a4b2ec44a4f50af811ae752956af7959670d0d6039c5a8dfc5b717fda96e3b512b1bb4 SHA512 0717568d9c967a4f314856ba490eb15efb2fe336cb7cf8eae8e918ba3e550d5704f5bca0a4a7163fae7c02257447eb783da80650f7496dd9cf81358287bd92ad
+AUX gngeo-0.8-cflags.patch 1946 BLAKE2B 208a35296c2d943c65dfdcb02b3724bbc9bad4823103f10ec2fb7b069793a7ca901a51a41543175458f9e4326518f075eed924cdc492b1310159914a8c88e074 SHA512 5df77d438efd9040efcae7f1a19c5939967ae158a50408592b1dd81db26776215ec7994c8173db0e6f9888f45fa2c043bd1338f41a4c535e886c2b0f633a38b7
+AUX gngeo-0.8-concurrentMake.patch 635 BLAKE2B 5f2e96d55ad902a4f9904a28c0de855cd4fe7a65677d5a106688b9194a678b7f4a4be066942839a45c36ae717da62e53be36cdd7832a5abe72bc148b498f1766 SHA512 1d84bac8ad5dbe3f95ff148284d24432aece67191b566927dedf040cab080bf59f2b70f5ae788ab02e5d549b1c56fe2c8f92d5255b8c670433a2efb17483e460
+AUX gngeo-0.8-execstacks.patch 2505 BLAKE2B db1d2bdfe1cc45c76be070c3243439adbebac47b10aba46c85f3d3059d85cc90133e9a75e329b4d3d3ce369018797b166782dd0c795bf18511772013a66bb92d SHA512 cfd0cc424ce0862fb49a1349ec53c65051a13dc031bf66f4df3d96b5d44d9a1a0768c1184b5d6e35d6e72bbf779c0e499989f6b57cde1e25d0ce50bbbdbefdea
 AUX gngeo-0.8-zlib.patch 335 BLAKE2B 4b18c076a3285659f7e199a6d86c3ea2a899fe8dade51b03b36035c4cf9378a1b80ae16aa81c12f75a51bf0053f7d44dfb3b1025f7d95274a79689737ce6d1cb SHA512 6f09ebb89173bc172dc035247727d5e046fb36b3b05789d4b8e98648a229a260f3749fa3e2e35065a418e339d8d80830411ca3614171ef7aadeba0147a4f6a70
 DIST gngeo-0.8.tar.gz 1043579 BLAKE2B b4d1ffdb53e32ea25ed743af113573ce9ebd9f864bff1fed88797573141aecd3a2f799731316ced19892b9e45a334c8a8b59593fce4ec5651754bf80196c9e13 SHA512 4301e0f48afd8686cdc45bd8c3e7b724f4ab7a2482567c7fe99ee8960f652dbcefb00fcdd7071d85b02636a9ae9795d03169ffc79e8ae6f4c5515a5a53c090c7
-EBUILD gngeo-0.8.ebuild 1024 BLAKE2B 048d4fd723d0de810fd47616efe61c9b427bd19feea845f85694a385ae43288cbb4383f10dfb6c932068f52d18466fae01022be8f4f896e725176284d71e96f2 SHA512 6728ac93208e72a37452fb01008baca8a8861ad09d94ed6a74c341b964600033fc5e5803662fc00490c8a1f81b4170564b320bc1054a2c420ed08b846708e31e
+DIST gngeo.png 1488 BLAKE2B e474aaec3f9d79b83ecb3519680b172cfecbca27931bb3a039d6ee46c53737557ca2c110b22d0f974840039e465b7bfafa364ae2076f9ea785858099fe402922 SHA512 bc0403cf06fd1095095d87e5e6b8cd8d9e018a2a5b20f7168935d0c48d288af55bd98a72150f3c6d6089646a0780b65ff24f135bf5a680690af160c9be8945e5
+EBUILD gngeo-0.8-r1.ebuild 1045 BLAKE2B 0b002644090a65142e44a40fa2b6437318281973c800bc416f7e70f3035194ea5fd70ac22f9df046c22917154a3b16aba85a05f09d41fbf770adba594d13160b SHA512 7193404f6a63cf323f910f132809e865ca9eb65a6406e39252fbcd55980136dfe0879366abeea048edab343ca1bc51115f47eee64cf1eadd736c8a8a7f845fc5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
index 1a4892abae9e..0dcc3e7c5bf8 100644
--- a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
+++ b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2016-03-31 04:15:45.913917791 -0400
-+++ configure.in	2016-03-31 04:16:23.447607551 -0400
+--- a/configure.in.orig	2016-03-31 04:15:45.913917791 -0400
++++ b/configure.in	2016-03-31 04:16:23.447607551 -0400
 @@ -236,20 +236,12 @@
             AC_DEFINE(PROCESSOR_INTEL, 1, [Define if you have an x86 processor])
             ALIGNLONGS=0
diff --git a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
index 1afc182c0988..f039ecf544d9 100644
--- a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
+++ b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
@@ -1,5 +1,5 @@
---- src/generator68k/Makefile.am.orig	2015-01-23 18:37:37.998723294 -0500
-+++ src/generator68k/Makefile.am	2015-01-23 18:38:39.995391133 -0500
+--- a/src/generator68k/Makefile.am.orig	2015-01-23 18:37:37.998723294 -0500
++++ b/src/generator68k/Makefile.am	2015-01-23 18:38:39.995391133 -0500
 @@ -71,9 +71,12 @@
  
  #def68k : def68k.c
diff --git a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
index 17c576b7d634..a3face06f35c 100644
--- a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
+++ b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
@@ -1,5 +1,5 @@
---- src/effect/2xsaimmx.asm
-+++ src/effect/2xsaimmx.asm
+--- a/src/effect/2xsaimmx.asm
++++ b/src/effect/2xsaimmx.asm
 @@ -2107,3 +2107,7 @@
  final1b       resb 8
  final2a       resb 8
@@ -8,8 +8,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/effect/effect_i386.asm
-+++ src/effect/effect_i386.asm
+--- a/src/effect/effect_i386.asm
++++ b/src/effect/effect_i386.asm
 @@ -88,3 +88,7 @@
  	emms
  	
@@ -18,8 +18,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/effect/hq2x16.asm
-+++ src/effect/hq2x16.asm
+--- a/src/effect/hq2x16.asm
++++ b/src/effect/hq2x16.asm
 @@ -1935,3 +1935,7 @@
      dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

      dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

@@ -28,8 +28,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/effect/hq3x16.asm
-+++ src/effect/hq3x16.asm
+--- a/src/effect/hq3x16.asm
++++ b/src/effect/hq3x16.asm
 @@ -2520,3 +2520,7 @@
      dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

      dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

@@ -38,8 +38,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/memcpy.S
-+++ src/memcpy.S
+--- a/src/memcpy.S
++++ b/src/memcpy.S
 @@ -495,4 +495,8 @@
  
  Lmemcpy_bsrcul1l4:
@@ -51,8 +51,8 @@
 +#ifdef __ELF__
 +.section .note.GNU-stack,"",@progbits
 +#endif
---- src/raze/Makefile.am
-+++ src/raze/Makefile.am
+--- a/src/raze/Makefile.am
++++ b/src/raze/Makefile.am
 @@ -20,7 +20,7 @@
  	$(srcdir)/strip_ $< $@
  
@@ -62,8 +62,8 @@
  
  # This assembles the file, once it's been pre-processed
  raze.o: raze2.asm
---- src/raze/raze.asm
-+++ src/raze/raze.asm
+--- a/src/raze/raze.asm
++++ b/src/raze/raze.asm
 @@ -4259,3 +4259,6 @@
  
  ;- the end ------------------------------------------------------------------;
@@ -71,8 +71,8 @@
 +%ifidn ___OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/screen_i386.asm
-+++ src/screen_i386.asm
+--- a/src/screen_i386.asm
++++ b/src/screen_i386.asm
 @@ -96,3 +96,6 @@
  	endproc
  
@@ -80,8 +80,8 @@
 +%ifidn __OUTPUT_FORMAT__,elf
 +section .note.GNU-stack noalloc noexec nowrite progbits
 +%endif
---- src/star/star.c
-+++ src/star/star.c
+--- a/src/star/star.c
++++ b/src/star/star.c
 @@ -2431,6 +2431,10 @@
  */
  static void suffixes(void) {
@@ -93,8 +93,8 @@
  }
  
  /****************************************************************************
---- src/video_i386.asm
-+++ src/video_i386.asm
+--- a/src/video_i386.asm
++++ b/src/video_i386.asm
 @@ -86,3 +86,7 @@
  	
  	popa
diff --git a/games-emulation/gngeo/gngeo-0.8.ebuild b/games-emulation/gngeo/gngeo-0.8-r1.ebuild
index 1d34ff20ab76..3e7f2be86fc0 100644
--- a/games-emulation/gngeo/gngeo-0.8.ebuild
+++ b/games-emulation/gngeo/gngeo-0.8-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils autotools flag-o-matic games
+EAPI=6
+inherit autotools desktop flag-o-matic
 
 DESCRIPTION="A NeoGeo emulator"
 HOMEPAGE="https://code.google.com/p/gngeo/"
-SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz"
+SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz
+	https://storage.googleapis.com/google-code-archive/v2/code.google.com/gngeo/logo.png -> ${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,10 +17,11 @@ IUSE=""
 DEPEND="virtual/opengl
 	media-libs/libsdl[joystick,opengl,sound,video]
 	sys-libs/zlib[minizip]"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-execstacks.patch \
 		"${FILESDIR}"/${P}-zlib.patch \
 		"${FILESDIR}"/${P}-concurrentMake.patch \
@@ -30,18 +32,12 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf --disable-i386asm
+	econf --disable-i386asm
 }
 
 src_install() {
 	DOCS=( AUTHORS FAQ NEWS README* TODO sample_gngeorc )
 	default
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "A licensed NeoGeo BIOS copy is required to run the emulator."
-	echo
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN}
 }