EAPI=5

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 77 insertions, 17 deletions

diff --git a/games-emulation/gens/ChangeLog b/games-emulation/gens/ChangeLog
index 5605afc31608..6efd2ef05ebf 100644
--- a/games-emulation/gens/ChangeLog
+++ b/games-emulation/gens/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/gens
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/ChangeLog,v 1.22 2011/09/21 21:17:48 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/ChangeLog,v 1.23 2015/03/12 17:28:41 mr_bones_ Exp $
+
+  12 Mar 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/gens-2.15.5-gcc34.patch, gens-2.15.5.ebuild:
+  EAPI=5
 
   21 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> gens-2.15.5.ebuild:
   zlib-1.2.5 fix (bug #384019); more use flags for libsdl
@@ -79,4 +83,3 @@
 
   01 Aug 2003; Michael Sterrett <msterret@gentoo.org> gens-2.12.ebuild:
   initial commit.  ebuild contributed by David Holm (modified) via bug 24821.
-
diff --git a/games-emulation/gens/Manifest b/games-emulation/gens/Manifest
index 3a52c06d80bd..6334974874f0 100644
--- a/games-emulation/gens/Manifest
+++ b/games-emulation/gens/Manifest
@@ -1,7 +1,8 @@
-AUX gens-2.15.5-as-needed.patch 363 RMD160 afee4d299fbae72499fa6c592ac8f8a3b0ec87b6 SHA1 13397c5112382916ef36eaba8e88b4fc8307909b SHA256 098425ef1bbd9f3c851dcbf709021faf97f25b34688a76e5173007efa47a13fa
-AUX gens-2.15.5-ovflfix.patch 577 RMD160 df51fe78367506b97658e0f0e8c6d8b7e7874598 SHA1 1e08f0e9d5fe13177ade5c45d5d5010fd9d1a338 SHA256 bdf0897492eadbbd062595814e61aba542964221c00f0cc24405a36c314e4eb7
-AUX gens-2.15.5-romsdir.patch 571 RMD160 1898a37a9fcdc8fb746b1bd4f89efadb4a849b0f SHA1 a08b11d1e9703f1ceb4ca49efdde607af69eab2c SHA256 f03f74259712ac3d9a2d536e69583d69019d9bce87d699ce831039b1c722f00a
-DIST gens-2.15.5.tar.gz 741852 RMD160 2ad70bfb30bde98e39fdc4c71795c8f173fcecc1 SHA1 85f31741ea9e230ff10b060593140b2740bb9d7a SHA256 51910d3056da9ffbb2c01cfec064998c9a4cad0cb379d703ec1b93c83dba305a
-EBUILD gens-2.15.5.ebuild 941 RMD160 2510df439729ab669c5090bbe55477f1ec5e7485 SHA1 0da36e991c4d3a893984a3c21789faf8c1147967 SHA256 cf830e60a607189d898cee80638ad4bfe9197ca9a899e5c6a1307c76cc3495c5
-MISC ChangeLog 2999 RMD160 92e01ddffc2ca3c6960e255adafa8e50f8a49a91 SHA1 c93a76d948265be9ab14dfbed4915176de0896b2 SHA256 6af26f6d28e406d151db3d5b70299c931309acb32bab81ec93e962cb006760f1
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+AUX gens-2.15.5-as-needed.patch 363 SHA256 098425ef1bbd9f3c851dcbf709021faf97f25b34688a76e5173007efa47a13fa SHA512 f45c01cd60ac989123a226eb11341d5470dd2b0a4e03057cd4923b1314a08e88a5c2076363d1cb2321a016ae4073d90967b02acc29ca2f1a5e37f7c367efcea4 WHIRLPOOL 02d449d7ef9b914783fc223b541ae9f4837e5d70a2776f4d9824b472fced52cd7648e62595a628a6cdea9b3a51a040c91022c0b224ab0108f722191c0f0c7853
+AUX gens-2.15.5-gcc34.patch 1544 SHA256 55a83fbd737e1da6ec5777596f77fb9d29d64dfa89506b5e456c69e5a82448be SHA512 b346a86c74713be883f8364adec4e0fe3966ba4444eee779f459160e12551c5f92d7338cfceb5456d0937ebe09edb93e0240b789ef53cc13f78b72de1d16b729 WHIRLPOOL 3c43626a31fe046b12f1e450c4d0fbeee4e771bc1f5a850a43f315fd0a71ceda21cc4d0834539d371c2d6c7f8a32905a62f3c83d0383ced64d9a9641f9c44675
+AUX gens-2.15.5-ovflfix.patch 577 SHA256 bdf0897492eadbbd062595814e61aba542964221c00f0cc24405a36c314e4eb7 SHA512 8c878b929f8a13bd8e33730cd09a4ebab4f47ed07ab02af88815ae8d02fd0d7a64ad44a4e369e2ad086022de207957dc88f99738bca737e50e18e951165f2631 WHIRLPOOL e738d64c49c7771acb7c36965d35a57d0c50e56271183e402076d645dce8f059e49eec995ad92f25fd5598d87f13345b93a06deb699ad860449d000a29d5f820
+AUX gens-2.15.5-romsdir.patch 571 SHA256 f03f74259712ac3d9a2d536e69583d69019d9bce87d699ce831039b1c722f00a SHA512 02dbdb3410ce62fc17469f0e8b2ee4d14025b218c71c4b27af8dfe71d319d51710b111e2104009f06579a3b499971218b72d75a993862e2657388a5194caa73f WHIRLPOOL f339f68111bfe57f3046c81a8e901e120f53f1d8e7dd9f4682d45c9e75e5a609d4058cdbe5289ef39e85a29ce9a35358c2c98e6837005909547941771bca6306
+DIST gens-2.15.5.tar.gz 741852 SHA256 51910d3056da9ffbb2c01cfec064998c9a4cad0cb379d703ec1b93c83dba305a SHA512 7163f6a1e09bac420e0e4aa0f8f3ed255406d9aff3cc7366c40226e7fece78baca5428d0fe87daf0f12f6e10b428477a795b54d008db5e3dcbf7692ed9d9fe7d WHIRLPOOL 282cced72eea63eb01b22612c5c40a4dc412b27d1fa3215a59da33a33541003172d57d442bced4d74cef89c3f3c443d2e7ca8cbd670a559a5cd8a3fc88b74696
+EBUILD gens-2.15.5.ebuild 1108 SHA256 6045d9a706d7949051e1f43dca195e2e218db4230cf73c2f426217477b0c1e16 SHA512 cafc7ccda6b70be3a5c1c0f43872b903d1f16c82fe6b75e29cc305fb15db9cedb5b3942268b01fa3cddf480d806550e7683a57b25b4b496af98614279801b9e0 WHIRLPOOL d018157a457ef5c766e0c49dd6b429a4b99cb1f1cfa2893a425fc2be9aeb6735231d88d6b0d0aea71310a3ae841fe5f8471ded06483da5565c07079c0e30339e
+MISC ChangeLog 3117 SHA256 e60dc4a488fe6bb36dfd11c1a851f31b95dbdcdbfdac9df685a4209d2526fb4e SHA512 560fa568e7fc56b079ea616378015696d3898e3db942f5d2fe0a397c240e1e63a53e27a3c9fcf655803a60174b340d19f6f4029294f5a13d5407335891ffde56 WHIRLPOOL 58d103232ea9993c5d76d344bd042bd3e45becab4fc5515970b2d27715861cacae4d3c503541032d52ad43f80aedf416f336f3c6098b02ae69c7ae0934385db2
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-emulation/gens/files/gens-2.15.5-gcc34.patch b/games-emulation/gens/files/gens-2.15.5-gcc34.patch
new file mode 100644
index 000000000000..cb81be76e385
--- /dev/null
+++ b/games-emulation/gens/files/gens-2.15.5-gcc34.patch
@@ -0,0 +1,46 @@
+from http://sourceforge.net/p/gens/patches/25/
+
+--- gens.orig/src/gens/gens_core/cpu/68k/cpu_68k.c	2004-05-22 09:02:12.000000000 -0700
++++ gens/src/gens/gens_core/cpu/68k/cpu_68k.c	2005-03-21 10:52:24.000000000 -0800
+@@ -24,9 +24,9 @@
+ 
+ struct STARSCREAM_PROGRAMREGION M68K_Fetch[] = {
+   {0x000000, 0x3FFFFF, (unsigned) 0x000000},
+-  {0xFF0000, 0xFFFFFF, (unsigned) &Ram_68k[0] - 0xFF0000},
+-  {0xF00000, 0xF0FFFF, (unsigned) &Ram_68k[0] - 0xF00000},
+-  {0xEF0000, 0xEFFFFF, (unsigned) &Ram_68k[0] - 0xEF0000},
++  {0xFF0000, 0xFFFFFF, (unsigned) NULL},
++  {0xF00000, 0xF0FFFF, (unsigned) NULL},
++  {0xEF0000, 0xEFFFFF, (unsigned) NULL},
+   {-1, -1, (unsigned) NULL},
+   {-1, -1, (unsigned) NULL},
+   {-1, -1, (unsigned) NULL}
+@@ -60,7 +60,7 @@
+ 
+ 
+ struct STARSCREAM_PROGRAMREGION S68K_Fetch[] = {
+-  {0x000000, 0x07FFFF, (unsigned) &Ram_Prg[0]},
++  {0x000000, 0x07FFFF, (unsigned) NULL},
+   {-1, -1, (unsigned) NULL},
+   {-1, -1, (unsigned) NULL}
+ };
+@@ -109,6 +109,10 @@
+ int
+ M68K_Init (void)
+ {
++  M68K_Fetch[1].offset=(unsigned) &Ram_68k[0] - 0xFF0000;
++  M68K_Fetch[2].offset=(unsigned) &Ram_68k[0] - 0xF00000;
++  M68K_Fetch[3].offset=(unsigned) &Ram_68k[0] - 0xEF0000;
++  
+   memset (&Context_68K, 0, sizeof (Context_68K));
+ 
+   Context_68K.s_fetch = Context_68K.u_fetch = Context_68K.fetch = M68K_Fetch;
+@@ -134,6 +138,8 @@
+ int
+ S68K_Init (void)
+ {
++  S68K_Fetch[0].offset=(unsigned) &Ram_Prg[0];
++  
+   memset (&Context_68K, 0, sizeof (Context_68K));
+ 
+   Context_68K.s_fetch = Context_68K.u_fetch = Context_68K.fetch = S68K_Fetch;
diff --git a/games-emulation/gens/gens-2.15.5.ebuild b/games-emulation/gens/gens-2.15.5.ebuild
index 2974e79bdcff..0501a22e3f41 100644
--- a/games-emulation/gens/gens-2.15.5.ebuild
+++ b/games-emulation/gens/gens-2.15.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/gens-2.15.5.ebuild,v 1.7 2011/09/21 21:17:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gens/gens-2.15.5.ebuild,v 1.8 2015/03/12 17:28:41 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils flag-o-matic games
 
 DESCRIPTION="A Sega Genesis/CD/32X emulator"
@@ -21,15 +21,25 @@ DEPEND="${RDEPEND}
 	>=dev-lang/nasm-0.98"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-romsdir.patch \
+	epatch \
+		"${FILESDIR}"/${P}-romsdir.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-ovflfix.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() {
+	egamesconf \
+		--disable-gtktest \
+		--disable-sdltest
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS README
+	DOCS="AUTHORS BUGS README gens.txt history.txt" \
+		default
+	newicon pixmaps/gens_small.png ${PN}.png
+	make_desktop_entry "${PN}" "Gens"
 	prepgamesdirs
 }