version bump (bug #466382); create menu entry (bug #499938)

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

7 files changed, 104 insertions, 13 deletions

diff --git a/games-emulation/fceux/ChangeLog b/games-emulation/fceux/ChangeLog
index 5f1ff055efcf..6679dd0e9099 100644
--- a/games-emulation/fceux/ChangeLog
+++ b/games-emulation/fceux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/fceux
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/ChangeLog,v 1.17 2013/01/30 22:28:01 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/ChangeLog,v 1.18 2014/12/31 07:53:54 mr_bones_ Exp $
+
+*fceux-2.2.2 (31 Dec 2014)
+
+  31 Dec 2014; Michael Sterrett <mr_bones_@gentoo.org> +fceux-2.2.2.ebuild,
+  +files/fceux-2.2.2-warnings.patch, files/fceux-2.1.5-gcc46.patch,
+  files/fceux-2.1.5-gcc47.patch, files/fceux-2.1.5-underlink.patch:
+  version bump (bug #466382); create menu entry (bug #499938)
 
   30 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> -fceux-2.1.4a.ebuild,
   -files/fceux-2.1.4a-ovflfix.patch, -files/fceux-2.1.4a-underlink.patch:
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index 7ff2bd89c4cc..639a599abb7a 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,7 +1,10 @@
-AUX fceux-2.1.5-gcc46.patch 421 SHA256 f068a6fbf66559e725894174fc6266e5840df3e2673f16c84047be9094c2e937 SHA512 22b1bf84dec6dd5ed72026ebd5ef0c8e9bf58276fa21c4c168caec780103d65819aae7ba00cb6ef4c3d98f8d0cebebed7700343974de0303deb8fba086f42649 WHIRLPOOL 6746cb2c35af2ba1dd3977b6c3d1c24546165804967656129f40e4e3aadd7a0e78f41ec7e2d9355358e8baff3256a0afdaf298e18bb621e4c6c8db139ca9dce4
-AUX fceux-2.1.5-gcc47.patch 565 SHA256 b947d023da6ba4503e23ef57d0ce906010e3549de588a8b9924e4f7ff3ebe14a SHA512 6b173bd988de2c58d6ae3b2887b625c57d2808f503626d6d092140558a9b662b41bce255eadf5e8497824b8a3e41afe3c9a92ff2b6c283d729cb244d4bbac961 WHIRLPOOL 4568fd68d8f7b95b3d873e3293b33dcd53ebf1db44e8f567929141f20548036817fccdf1832f1638d382244f528cc1821ffd1a633a17f0cbab75abc94928959e
-AUX fceux-2.1.5-underlink.patch 475 SHA256 e8910db9095b8a988a4dea8babd746d9d3c9243cecbb7f9b029ef98058c3df7d SHA512 b7919afa441c62e87cf5c4d5e51ce62d33a15e62857cbc59a49c0487f8313616f0f5525d6c05ee05f68fe8ba06b272e385d020187a8bfa3801e9997162513f36 WHIRLPOOL 3e3269cb86d3f15241b6280e46fdec5e81b2c3d3c4930939053a2fa3eba89a7d85fd5343732c96dd16f748a0d935795edcb2784bb026d45178dce9f89dacbcac
+AUX fceux-2.1.5-gcc46.patch 288 SHA256 aaca472f5d9b5bb9052293cb728c64ff7d512d52e6419be3c4268baecf3eb07b SHA512 d92da96378a820bfbd9975baa83d114fccff42114b7c41be28b59b6f76d480a88a2daf475eaf561012fcc332c26195e32f5cce648ab01f3f86c98e99ab44c370 WHIRLPOOL b4ff158cc7b324bc6e1682a617e7e96ecbf7725692f011504cce6314c0e2d37dcd44fa1fc5a97f35c83217913f3f884127b782fa4749ab6eba2d9c8d1aac9527
+AUX fceux-2.1.5-gcc47.patch 493 SHA256 0f9e50d7a87fa4e50c471462d2c719575712a8aa7dcbacec96c0f26e84cac0be SHA512 129cd788a9c8997e952f39b778409f3d9381b17b56853e49ff27264b8da2660610275b436a4369c8a78cdd0d80d97d945f9a5f721c971f41700e96a38ea204b1 WHIRLPOOL a622b45a5be4e3a546554019f67fa5ccca418fbcda5613154bb03032979aacf0d221b9ddd084b4ef0b4a910a42997153fb3fa764a88db569317554aa568a5c86
+AUX fceux-2.1.5-underlink.patch 403 SHA256 636c31b06b6e8de919af359f95fc3d3f7f0ec93a8c830054ff3f7ca6b70ae2c0 SHA512 64424ae5549a1761dee500ae02950e2409d9788527fd6ed57c4931c173d781760a999ab2a3efa611cfea19232fec5c68b3a141b9432a3bcf2eacf21f84874b85 WHIRLPOOL 88f989daf056dca44caf01fc6a99da3474d7e826e5e1babb0280265091d12c0de74866b2a5e5c48410b543cb5c7fdd76141d17df028669abcf31a8024290465d
+AUX fceux-2.2.2-warnings.patch 1306 SHA256 361bdce807f8fda99879ee6941f2d25ccaf01f5e0b9830260732a3df067b2a41 SHA512 75df61b98e94ce659a1cc9732a491cdcfe6b826ce9d8f9b22e5542217ade6074e86429cdcc326cb770a21fff049cf20760f8172c4b3ce52de1ee404ff5a7193a WHIRLPOOL b60a5180d085424db1c551328ff0c113a3ce6aabafd135bb0ebacef7d34fed3e6a351ea43231a407268f832d95b7a0faf3c42983070deb83fd2e809f4acccaaa
 DIST fceux-2.1.5.src.tar.bz2 7322199 SHA256 ee6b1ee6a0347e325032f6655a5caa289e2b0458f7fccddccd5137f1cd63bf9f SHA512 932cadf848b808334689a7bcf1f1985005d11fbc97ec6b2b94480fc3381e8d654304fab80962299d47b7e52fd32fab0697e8a31dbbf50d8fce52ca870daf7c7b WHIRLPOOL 286e06c9cf269e06d938deb9e5451ee16fab1190d49d3702c45eae95de06212c17d758154c5a928d1b9bb693404e3a8709aa27a94a0ab2f48465f3591bde8c52
+DIST fceux-2.2.2.src.tar.gz 9249858 SHA256 804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e1 SHA512 3d3b11c21232656492d962c21a93097f66e33fbd5adbbce6b771dc004393f30502c369eae83c23d988c7e447b4784740a10dfcb0811252854d4364c4b1face98 WHIRLPOOL 61d12dd5db761d31ae83dcfc3117538313910cf844e502457326503d966ac38ca69e7c90d696da991394dd67a0b115f2b0698c217b5a077ed1c3ec9649508ff8
 EBUILD fceux-2.1.5.ebuild 1472 SHA256 0f2d0ba7648b13c5b228d4c7020aac4f95cd0799eb2de1cff28f5f71d7fa0c8e SHA512 7e69a83b6fb9064c4ff59df61a1316b738ea404263c592cff84e6c4b167535abf3195cfbe593a7ca90d50cfdcc785e13ad56bb40ef9ce165d199f28db09daee8 WHIRLPOOL 977b0dadbcb6536dbcc3e3e906fb459e8085fa286481e44e939d806b8021ae4602c1c9bd2a9464abb34b7554b21163f057b437f4d7319332f7c7cc33c122ebff
-MISC ChangeLog 2556 SHA256 497be384c4d5c837dfcbe282a09fbcc809f8f56606f74c6cae5372f74af415fe SHA512 e8cd6c2d4d7f07d5e572200ae133b283289241d7845ed73c3e78cdafd3697940c9222b285e96d320672e1d9ab9affbb186dfdc0a1769ffc160b57b0aead2cdda WHIRLPOOL 68101fbb7738b0e7833bb04cd4572f0e1520ceb6e9bfc586e6fb8904c965f663fd0dea326055152fb9484dd6b18ce173c3582d6b0ec7237102b0c6065bc67758
+EBUILD fceux-2.2.2.ebuild 1250 SHA256 04bf9b5aa42443e9d9d0494b37d40890005efdcf1241866a234f1d3bc7af4b97 SHA512 0666ad7906bf3ada41ca840112cf9e20137dbab1719510ef65dafb486fa39ab99754a0d3f421fc7861879302eec13d0f4d78492fcdb1700a0f0ebfe8a9421584 WHIRLPOOL 302f40d5976ac6e34885f5806a3a6cfe8ec21acc89727e6b83123bd836416ded48415385531232291e0e8d6cdd9ae059f14e2e8e0037b89b2f3df3633e067fff
+MISC ChangeLog 2859 SHA256 00bc5105a0aeda8a5dd7181d57ba9a6fa91b01b4ecee43475e2cfeac931c5a1d SHA512 c368f40bfdb133caa9dd741dd41b7198ff96ebc05f79e23732983b076abe762c5ec1d8423a64bae4835fa2af0ac9e533700c6c067339e9dcf8143e515fc7e976 WHIRLPOOL 4028cd497e6f83e451bedc0e8e94e38df3a388e7eb0eeee02904ca5d9934404d4c925756495a5ace65ac2d31908dd9df6d39ba6028953a10bcaf76690995ac75
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-emulation/fceux/fceux-2.2.2.ebuild b/games-emulation/fceux/fceux-2.2.2.ebuild
new file mode 100644
index 000000000000..576d4f0042a3
--- /dev/null
+++ b/games-emulation/fceux/fceux-2.2.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/fceux/fceux-2.2.2.ebuild,v 1.1 2014/12/31 07:53:54 mr_bones_ Exp $
+
+EAPI=5
+inherit eutils scons-utils games
+
+DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
+HOMEPAGE="http://fceux.com/"
+SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk +lua +opengl"
+
+DEPEND="lua? ( dev-lang/lua )
+	media-libs/libsdl[opengl?,video]
+	opengl? ( virtual/opengl )
+	gtk? ( x11-libs/gtk+:3 )
+	sys-libs/zlib[minizip]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-warnings.patch
+}
+
+src_compile() {
+	escons \
+		GTK=0 \
+		CREATE_AVI=1 \
+		SYSTEM_LUA=1 \
+		SYSTEM_MINIZIP=1 \
+		$(use_scons gtk GTK3) \
+		$(use_scons opengl OPENGL) \
+		$(use_scons lua LUA)
+}
+
+src_install() {
+	dogamesbin bin/fceux
+
+	doman documentation/fceux.6
+	docompress -x /usr/share/doc/${PF}/documentation /usr/share/doc/${PF}/fceux.chm
+	dodoc -r Authors changelog.txt TODO-SDL bin/fceux.chm documentation
+	rm -f "${D}/usr/share/doc/${PF}/documentation/fceux.6"
+	make_desktop_entry fceux FCEUX
+	doicon fceux.png
+	prepgamesdirs
+}
diff --git a/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch b/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
index 90dacf4bb4a8..8062f946518a 100644
--- a/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
+++ b/games-emulation/fceux/files/fceux-2.1.5-gcc46.patch
@@ -1,6 +1,5 @@
-diff -Naur a/fceu2.1.5/src/file.cpp b/fceu2.1.5/src/file.cpp
---- a/fceu2.1.5/src/file.cpp	2010-09-19 00:05:09.000000000 +0000
-+++ b/fceu2.1.5/src/file.cpp	2012-03-01 19:21:25.856204727 +0000
+--- a/fceu2.1.5/src/file.cpp
++++ b/fceu2.1.5/src/file.cpp
 @@ -310,7 +310,7 @@
  				if(magic==0x088b1f) {

  					 // maybe gzip... 

diff --git a/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch b/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch
index 0b15cc89ad5c..de32c5f35b73 100644
--- a/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch
+++ b/games-emulation/fceux/files/fceux-2.1.5-gcc47.patch
@@ -1,5 +1,5 @@
---- src/utils/endian.h.old	2012-10-26 09:07:24.000000000 +0200
-+++ src/utils/endian.h	2012-10-26 09:08:25.000000000 +0200
+--- src/utils/endian.h.old
++++ src/utils/endian.h
 @@ -93,19 +93,6 @@
  	}

  }

diff --git a/games-emulation/fceux/files/fceux-2.1.5-underlink.patch b/games-emulation/fceux/files/fceux-2.1.5-underlink.patch
index b45730738ac0..9e98967227d4 100644
--- a/games-emulation/fceux/files/fceux-2.1.5-underlink.patch
+++ b/games-emulation/fceux/files/fceux-2.1.5-underlink.patch
@@ -1,5 +1,5 @@
---- SConstruct.org	2011-06-07 21:33:28.876609681 +0200
-+++ SConstruct	2011-06-07 21:34:11.420368249 +0200
+--- SConstruct.org
++++ SConstruct
 @@ -70,6 +70,10 @@
      env.ParseConfig('pkg-config --cflags --libs gtk+-3.0')
      env.Append(CPPDEFINES=["_GTK3"])
diff --git a/games-emulation/fceux/files/fceux-2.2.2-warnings.patch b/games-emulation/fceux/files/fceux-2.2.2-warnings.patch
new file mode 100644
index 000000000000..f0af4631abda
--- /dev/null
+++ b/games-emulation/fceux/files/fceux-2.2.2-warnings.patch
@@ -0,0 +1,33 @@
+diff -ru fceux-2.2.2.orig/src/input.cpp fceux-2.2.2/src/input.cpp
+--- fceux-2.2.2.orig/src/input.cpp	2013-06-15 15:44:11.000000000 -0400
++++ fceux-2.2.2/src/input.cpp	2014-12-31 01:32:46.302001912 -0500
+@@ -1161,7 +1161,7 @@
+ 	// FIXME this will always evaluate to true, should this be

+ 	// if (*lastSavestateMade...) to check if it holds a string or just

+ 	// a '\0'?

+-	if (lastSavestateMade && (undoSS || redoSS))

++	if (*lastSavestateMade && (undoSS || redoSS))

+ 		SwapSaveState();

+ }

+ 

+diff -ru fceux-2.2.2.orig/src/state.cpp fceux-2.2.2/src/state.cpp
+--- fceux-2.2.2.orig/src/state.cpp	2013-09-18 19:03:59.000000000 -0400
++++ fceux-2.2.2/src/state.cpp	2014-12-31 01:33:11.453155054 -0500
+@@ -1048,7 +1048,7 @@
+ 	//Both files must exist

+ 	//--------------------------------------------------------------------------------------------

+ 

+-	if (!lastSavestateMade)

++	if (!*lastSavestateMade)

+ 	{

+ 		FCEUI_DispMessage("Can't Undo",0);

+ 		FCEUI_printf("Undo savestate was attempted but unsuccessful because there was not a recently used savestate.\n");

+@@ -1153,7 +1153,7 @@
+ void RedoLoadState()

+ {

+ 	if (!redoLS) return;

+-	if (lastLoadstateMade && redoLS)

++	if (*lastLoadstateMade && redoLS)

+ 	{

+ 		FCEUSS_Load(lastLoadstateMade);

+ 		FCEUI_printf("Redoing %s\n",lastLoadstateMade);