Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 153 insertions, 18 deletions

diff --git a/games-emulation/vbam/ChangeLog b/games-emulation/vbam/ChangeLog
index 6606ec38f44b..414334ca2b2d 100644
--- a/games-emulation/vbam/ChangeLog
+++ b/games-emulation/vbam/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/vbam
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.21 2013/06/15 23:39:10 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/ChangeLog,v 1.22 2014/02/05 09:57:45 radhermit Exp $
+
+*vbam-1.8.0.1228 (05 Feb 2014)
+
+  05 Feb 2014; Tim Harder <radhermit@gentoo.org> +vbam-1.8.0.1228.ebuild,
+  vbam-9999.ebuild, +files/vbam-1.8.0.1228-header.patch:
+  Version bump.
 
 *vbam-1.8.0.1197 (15 Jun 2013)
 
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index bead22885bc8..5703d1e8c6a8 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -4,21 +4,24 @@ Hash: SHA256
 AUX vbam-1.8.0.1149-desktop.patch 1400 SHA256 97643063490c76bc796a02c3062a0ba3aa5f1a1a7f6023b12d0cf0558c5a0947 SHA512 dc493ced382090b6b98487229e7d13332c626c2787afeeb4c4849773e87851778b6d1724610b3b345ee8e5fce9550cff3242851a35e3f98e2b76d7f4b8f3d2be WHIRLPOOL 9e4607e22145c7de0e9bd9b16d8210ba4cdb1d1ba972851a48e25de3a494f02d7a92a7cff0900b9f4f7328f2f073ab9f04a99f7b7f9b25cf871cab07a1604610
 AUX vbam-1.8.0.1197-desktop.patch 237 SHA256 3c4d12ec056ab25fac3e44d593f5ca3caf4a58acaa4ce39fda685cc8cb37cb3a SHA512 7c9c0eefb8c41f89f9115854f24dbabc9a9126ace12525fde32a0b9113c41b47c94de68f5a85fe23a5a24257fef0071726e936440ccc368e71dd058cccdbb4bf WHIRLPOOL d3ea145f3461b30636fb580678c68ef7cfa000465270df51b4dd4e732290d1f48053da2d79a3bb1396737c81c3fa71c260e0c13c509f7e55e805a74ca7803265
 AUX vbam-1.8.0.1197-libav-9.patch 1363 SHA256 bfa689f5f4e6f04e369c34d5fa341389f3e9bb5b69ab7e01bd66b11517074c64 SHA512 9b0d1f140f2470c612487e508160debcda2e37fc3fcddb5fe6ccb249dbe2dcee2739cfb63769985eea74a40d9a1adf38c40895e8c699bdb50091c39ca3078a7e WHIRLPOOL b4447886ad8f42fd7272d4280000e42fef35fde8d38ad6080c07ce3f766cbb66da594ac7d9d7f5cdc32f7bdd9b9ae3d4f0bc8f650e77fe65bcd10ee818c838cc
+AUX vbam-1.8.0.1228-header.patch 383 SHA256 73b7b2119478da89315760d6dea482181206214bd4982002e5990691d3cb145b SHA512 3ecc4d0afe5f36a44e45f549462c3709c4743fff133a6d13670e1203ed458b828fd32697f22c32860f7e60b50c7d07c342da7c3c7144693907bfc4d62aa05267 WHIRLPOOL a930838446d858c871ef06549575355af8c9f867167a033646a764a85bb4f3d18150fc5f3141b05c9de60879f098353f5daa2dbe3a31641326dfb89b6d4459a8
 DIST vbam-1.8.0.1149.tar.xz 824980 SHA256 7eb2c29a416faca9c7ab28cb953c276e76c51b6b45bd5ae83f7f9a32b8c6d252 SHA512 aaf2262780ee723077002c43ca317c81a85bf2350067aa504ad578d1280765f65baac9a8428e595b0c746db1bd37ce29f9bb1758aaef300e7d52b4da45652e46 WHIRLPOOL bc230cb7a485f198a8b3ca050b85b1e167a3b313edf36753c016c8e44a2a10a99a3163c649eb48ffbdb5747fbff35909e30aebd537bcb38c1a72ad0d783e969b
 DIST vbam-1.8.0.1197.tar.xz 842152 SHA256 26fca6a5a19229fa651b2aaeea42566c9a1bbb7ea722e6b15e88699bd30dec7b SHA512 bb900327b67d75d4b99f891994651a9d04e093613ec03f31f19e32541d38d58870d5b4f3c0b1c8f927560df0b3b44b10b5f2f2669846dca69d5420e61276075a WHIRLPOOL acf4b1a4b251cbf8bbbeb7f8f6ea88bc8171132d1c2fa6efba9a761e952e8f68a0e10184db097e4261b0226165f064b9fa18193a4bde4ea8fae852f129f4bdc1
+DIST vbam-1.8.0.1228.tar.xz 866904 SHA256 ff771240b5ec89e452e6c00f45afd2c8f869570b634044cce997f4af797299e6 SHA512 22c7e14e5634c45c5a37be4387be579fceebd200f528514c0ab9059846d60f215e9bb40d73ae9a781a3018e4891d81d56dd50258d21f82b1262735aabab97155 WHIRLPOOL 19bf64ab118f80035f8c97b45c75ebd8cb956854bfc482016e22e0f7a700178115b02f7272ca5ea20cc515f1eac5e2dd22773796a03ff0f9a608ebb0d49c986a
 EBUILD vbam-1.8.0.1149.ebuild 2756 SHA256 3c4e9856caa5aeb1eb9d9becf3ea0a82f0b1c83218e4194ca25a9b5312aa1df8 SHA512 5450530befe22e28f05cde5cd222cc5b5ed04db11fba99eb114559ad1105342fd0cde06574f0bfc351b84ce9a50d107d6f96344c0720e8cef8fd803f6b2e9072 WHIRLPOOL f6d4b84b1224f579496048af23f4ab6d6fb4feecda2a062eb025904a7d3dd865c52d0bf48a89391bdad3241f807d9230ce208b751a166012362f5adc3c561c5e
 EBUILD vbam-1.8.0.1197.ebuild 2892 SHA256 4b1bfb3855ae1b000e070535e826631178f68f73b8edabf5f299029ccbcbf4b4 SHA512 49157d396e9e8d71ad1bb0702bcdb936bc57bbde987fe8437188357d5d1d517d770ca11a9e5ca088c72cde2dc8fcdc450d22521907e3b2e9d86756a264e1317b WHIRLPOOL 04fca498dbbd792d10a0836a7311b8e8acc58ed5d4f42298edc8077c35fbf31d4bd9e74ef8a89c27861041062392f0e068affe6a5734a524412b47791d738f9c
-EBUILD vbam-9999.ebuild 2617 SHA256 232a8b7af8ec35036df00b7f1a24cf6cd1b2f132a3386f658757a992cd1cbaf3 SHA512 91bec6ad299a706f283907b4c6700094047dbf55d36c390bf4226c09823f0ec2acb892202e14de3e17021ee633f38743d4345d0506365374121317de761e7c20 WHIRLPOOL 49e1125fa9d74d758206e020913c2808b31a0365aa711c5fbb91b863328986d450830d92327da08913b79c2379a2f8b598f1a65f5c3a89d93120db201b3edac2
-MISC ChangeLog 4088 SHA256 1f3d85c46a05dead9f1806d2d1e1518543d99933f1407b6fdf3014e3142f2566 SHA512 4b5d4bd54db0f2f55d01b7194be35637432d88db588c0db06af05418d3d969482eea6b957cc09e3dec96d565d690c03e316c9bbcffafb056531914ed98513cba WHIRLPOOL 8c2612e1abfa8f88f3334e612610cc8d75a6710451b5c773711c96a28384e57ce100e2e8e2fca1c914582007eb59d8c85282c65988e1fa58b1c33d63e785ffa7
+EBUILD vbam-1.8.0.1228.ebuild 2860 SHA256 426ecd5c2988afe6af471d01502714028fa311b7a3bbaf6f681e8e69212e0061 SHA512 574acf38ba51afe059d919837a4ec53e3a2d6a8f8b8ae1f5d0eef0bd267d0b6b3e83d662fe5abc81c147f1f3e7884e37a5436a69668757a406d7e9d47b89964b WHIRLPOOL 9ec23479d25ff562cd6c6db40dcde03c2361856c55cfea82a58ac86121e5f2f9dbf45a937dd980561f642c5b32db7d30cae7fa5ac93b4c5012db736fa36942fa
+EBUILD vbam-9999.ebuild 2722 SHA256 54ebec810e6914cc4d6697281b9218587a8699bd39e21d31c7b1cb86b5ece9f2 SHA512 16762d5daaf9b4f2f0a0f23cd2ae6e9de911274df01b5f3d34b291b0dc2d43a48d79998ad1465b8e3b48f5d6c73b0297f7b875045dbf1fdc9051fbc00dd5b591 WHIRLPOOL 7fe25306b02e6fd33cebdaac5e22f2f4e5f5120eb4e31b833915d24a948e77d4f723dba909d66a5c55c1084320c76d7395a5e3eea782f1132d74dd5214b07638
+MISC ChangeLog 4268 SHA256 bc50b0a14569e8a26c2bb0c93fde0262da551f2abdf4eb03bfb69a6bf37345ac SHA512 a88f1a265bb438cbf7d346b14639bb4151472c098c37e01049a294d0bc60b62b8503172d323b77097fe4c6802d27edb3ac671534eaf3a066b9bf4748fa60731d WHIRLPOOL 9a794fd686d610e7e6dd4a481eac0f5da7c16d137bba3d4793ac49756efdd11e804604dce06ef0b3e65ba5ba7175e9130f7c9eef60d5e6447777b65bb8193869
 MISC metadata.xml 331 SHA256 d6054d5a8bdfb747166a4b83c1f7db04be3898899323aa316cbef1ab7a6b7daa SHA512 6fad448db04e5a8cf3880de3a34638a7a5791ac3d847318def2163e2cf91637d99eb4adfc2acc8351c62965b8ea95f4f86b1b5d372691565ffbc553250ee1cbd WHIRLPOOL 603a7f5c7378302173ba3758eb57b67489cca71a71af4d15319bfb145b2b332508e7759f44fe6382dccb850a60d1f9e21d43ebf1507e47d61b33c5a21dd809da
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRvPsjAAoJEEqz6FtPBkyjK4gH/1mXXGukYWik2DeItAicVssl
-7VEeferYpeActAutQ4St/YLz/HbOpgiLlpQRk2z6sPEmPwFzTvB4xI7PO7x0tSvB
-WRrHKlCI0R3L8Gw9HoKxnko+6ztOgQ0AOuwmtMj0JD62jXdNXBlFkulVNTXO/9/k
-HRx11k/dR9TGBIz2fFg31QjBBLH2IXKQXXo0p8Ma+P0wpgjLVynBGId4sAYC/tG3
-/u3qCWuKWTcWzSxlvhVq0416T1hI3P5hRu9HujD42SO/YpLZlRwp1eIrcBD5gdye
-Nmp2dVqK673t+Wwg4Q5gg2qKxZgtk/4TFTLYnCRHH7ox9hNEv1qIofg0JH+j+68=
-=Xp/Y
+iQEcBAEBCAAGBQJS8gsdAAoJEEqz6FtPBkyjiWEH/RyKHwJ2uYfv3LXVS6FuLT8r
+Fw29jslbjeHglgRjST3Zku6XQfcO53Ph27oCNzqctIM+ddT/T36cbNzcT678fRii
+L7R4mhWpgwylIhm8iCKpapAg1LgiXLwQH099kQTvLpVslWbm7Knmn07emwZAz/zj
+ruId0L0GC2ZZ7BA9KKw5nreZ4JH6er+Ui/jkGHCc8rh61eTCeTitS/xiQQHqayH3
+7FRoJJunwe/q7Wm/zM4IKy5LPlt5Jq9EheV9a686S+zAEwEYx7I/TQvPWoejYG6g
+ZdKxRdwOP8FBvPYL+k8eOAbwS+sH2/HuCUzhJI0XEK+NgOoAlNjhQhd32Sfr3vA=
+=zyG7
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch b/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch
new file mode 100644
index 000000000000..81c73892dee0
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-1.8.0.1228-header.patch
@@ -0,0 +1,10 @@
+--- vbam-1.8.0.1228/src/Util.h
++++ vbam-1.8.0.1228/src/Util.h
+@@ -23,6 +23,7 @@
+ bool utilIsZipFile(const char *);
+ void utilStripDoubleExtension(const char *, char *);
+ IMAGE_TYPE utilFindType(const char *);
++IMAGE_TYPE utilFindType(const char *, char (&)[2048]);
+ uint8_t *utilLoad(const char *, bool (*)(const char*), uint8_t *, int &);
+ 
+ void utilPutDword(uint8_t *, uint32_t);
diff --git a/games-emulation/vbam/vbam-1.8.0.1228.ebuild b/games-emulation/vbam/vbam-1.8.0.1228.ebuild
new file mode 100644
index 000000000000..59779c72f2d0
--- /dev/null
+++ b/games-emulation/vbam/vbam-1.8.0.1228.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1228.ebuild,v 1.1 2014/02/05 09:57:45 radhermit Exp $
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit eutils cmake-utils wxwidgets gnome2-utils fdo-mime games
+
+ESVN_REPO_URI="https://vbam.svn.sourceforge.net/svnroot/vbam/trunk"
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="http://vba-m.ngemu.com"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="|| ( sdl gtk wxwidgets )"
+
+RDEPEND=">=media-libs/libpng-1.4
+	media-libs/libsdl[joystick]
+	link? ( media-libs/libsfml )
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	ffmpeg? ( virtual/ffmpeg )
+	gtk? ( >=dev-cpp/glibmm-2.4.0:2
+		>=dev-cpp/gtkmm-2.4.0:2.4
+		>=dev-cpp/gtkglextmm-1.2.0 )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		cairo? ( x11-libs/cairo )
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)"
+DEPEND="${RDEPEND}
+	wxwidgets? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-header.patch
+
+	# fix issue with zlib-1.2.5.1 macros (bug #383179)
+	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
+
+	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
+		CMakeLists.txt src/wx/CMakeLists.txt || die
+
+	# fix desktop file QA warnings
+	edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable cairo CAIRO)
+		$(cmake-utils_use_enable ffmpeg FFMPEG)
+		$(cmake-utils_use_enable gtk GTK)
+		$(cmake-utils_use_enable link LINK)
+		$(cmake-utils_use_enable lirc LIRC)
+		$(cmake-utils_use_enable nls NLS)
+		$(cmake-utils_use_enable openal OPENAL)
+		$(cmake-utils_use_enable sdl SDL)
+		$(cmake-utils_use_enable wxwidgets WX)
+		$(cmake-utils_use_enable x86 ASM_CORE)
+		$(cmake-utils_use_enable x86 ASM_SCALERS)
+		-DCMAKE_SKIP_RPATH=ON
+		-DDATA_INSTALL_DIR=share/games/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt || die
+		doman debian/vbam.1 || die
+	fi
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_cache_update
+	fi
+	use gtk && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	if use gtk || use wxwidgets ; then
+		gnome2_icon_cache_update
+	fi
+	use gtk && fdo-mime_desktop_database_update
+}
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index b00e55144c52..6e6567106231 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-9999.ebuild,v 1.5 2013/06/15 09:26:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-9999.ebuild,v 1.6 2014/02/05 09:57:45 radhermit Exp $
 
-EAPI=4
-WX_GTK_VER="2.8"
+EAPI=5
+WX_GTK_VER="3.0"
 
 inherit cmake-utils wxwidgets subversion gnome2-utils fdo-mime games
 
@@ -33,7 +33,7 @@ RDEPEND=">=media-libs/libpng-1.4
 	wxwidgets? (
 		cairo? ( x11-libs/cairo )
 		openal? ( media-libs/openal )
-		x11-libs/wxGTK:2.8[X,opengl]
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	)"
 DEPEND="${RDEPEND}
 	wxwidgets? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
@@ -42,11 +42,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	# Fix issue with zlib-1.2.5.1 macros (bug #383179)
+	# fix issue with zlib-1.2.5.1 macros (bug #383179)
 	sed -i '1i#define OF(x) x' src/common/memgzio.c || die
 
 	sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
 		CMakeLists.txt src/wx/CMakeLists.txt || die
+
+	# fix desktop file QA warnings
+	edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop || die
 }
 
 src_configure() {