Patch from William Page for bug #171293

Package-Manager: portage-2.1.3_rc2

5 files changed, 119 insertions, 9 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index ed25bbbe7cf1..cb74d4d781db 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/visualboyadvance
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.31 2007/03/07 16:49:27 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.32 2007/06/16 18:08:58 nyhm Exp $
+
+*visualboyadvance-1.7.2-r2 (16 Jun 2007)
+
+  16 Jun 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/visualboyadvance-1.7.2-uninit.patch,
+  +visualboyadvance-1.7.2-r2.ebuild:
+  Patch from William Page for bug #171293
 
   07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   files/visualboyadvance:
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index 86ffbf572633..d4617ca5fb5f 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -17,15 +17,23 @@ AUX visualboyadvance 634 RMD160 e98a182e2df04b452fee68240c8bf1b6a34472a2 SHA1 96
 MD5 c938cbae5d1d2692c81231506568457a files/visualboyadvance 634
 RMD160 e98a182e2df04b452fee68240c8bf1b6a34472a2 files/visualboyadvance 634
 SHA256 60cef94c41f16d9865d174be6174922db192173c143d6bcc1cae4b25f932cb34 files/visualboyadvance 634
+AUX visualboyadvance-1.7.2-uninit.patch 532 RMD160 d7f6a21f98f1112096f6034c1ba090ce185ca985 SHA1 250265f60a20a3e6bffca10223e141358ee8ad49 SHA256 5c7ced9f12a7e805abbe607686965b1f12a670235903201cb8e5170770d9f4a5
+MD5 43206be6e1b85d5454a3d6b5f54e8cd8 files/visualboyadvance-1.7.2-uninit.patch 532
+RMD160 d7f6a21f98f1112096f6034c1ba090ce185ca985 files/visualboyadvance-1.7.2-uninit.patch 532
+SHA256 5c7ced9f12a7e805abbe607686965b1f12a670235903201cb8e5170770d9f4a5 files/visualboyadvance-1.7.2-uninit.patch 532
 DIST VisualBoyAdvance-src-1.7.2.tar.gz 1410762 RMD160 44f94a4f270f2cda25879681c52892f6978caf99 SHA1 04d82406079563fd17cda07f72488185e9152f51 SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7
 EBUILD visualboyadvance-1.7.2-r1.ebuild 1859 RMD160 c5a2e5362c4e84278587561fc5ca57f21bb0d15c SHA1 e8c86fb6448998c1233b82b89ac1649ae6b015a0 SHA256 0498f3c2dcd4bd99a13755a49117840d61c2902c1577e00c0839c71d23b2d911
 MD5 4623bdd1dd925df9e47efe322e9ce1fb visualboyadvance-1.7.2-r1.ebuild 1859
 RMD160 c5a2e5362c4e84278587561fc5ca57f21bb0d15c visualboyadvance-1.7.2-r1.ebuild 1859
 SHA256 0498f3c2dcd4bd99a13755a49117840d61c2902c1577e00c0839c71d23b2d911 visualboyadvance-1.7.2-r1.ebuild 1859
-MISC ChangeLog 4918 RMD160 df078c440b698dc8304820b5a14220cabf463fa2 SHA1 ab17f9cd6496decc400a59479664db8c6d0d444d SHA256 008d716e82a22089660ef1cc29bc915360391ff198a7c0b3ac8ad05e9f1acf95
-MD5 7ea9b0b16d84d1280ec59ddcf13eac00 ChangeLog 4918
-RMD160 df078c440b698dc8304820b5a14220cabf463fa2 ChangeLog 4918
-SHA256 008d716e82a22089660ef1cc29bc915360391ff198a7c0b3ac8ad05e9f1acf95 ChangeLog 4918
+EBUILD visualboyadvance-1.7.2-r2.ebuild 1894 RMD160 537069183438dca385b84e042ccdb8f43a953c5f SHA1 d996d18b0e5d8701c361e8a5e13630bd5199ee96 SHA256 9d52ede218acae20ab4acb9a848811b59cd5af035039f12d6d76522c638aa33b
+MD5 6de0903eb846c3f1f19d171a292f5597 visualboyadvance-1.7.2-r2.ebuild 1894
+RMD160 537069183438dca385b84e042ccdb8f43a953c5f visualboyadvance-1.7.2-r2.ebuild 1894
+SHA256 9d52ede218acae20ab4acb9a848811b59cd5af035039f12d6d76522c638aa33b visualboyadvance-1.7.2-r2.ebuild 1894
+MISC ChangeLog 5130 RMD160 61f8d392857abd3de23afee0dbdf55314c514286 SHA1 826b46396d89880bda45a12faaab9499896dc3cb SHA256 cb5797082134347bec1196ffd16044bda3b5ca482d094902ea6506d6a35918da
+MD5 f29c474d1542d38dfa3a96cc73af6237 ChangeLog 5130
+RMD160 61f8d392857abd3de23afee0dbdf55314c514286 ChangeLog 5130
+SHA256 cb5797082134347bec1196ffd16044bda3b5ca482d094902ea6506d6a35918da ChangeLog 5130
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -33,10 +41,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 b964aaf93d522f3ee903d5a8d4da2ac5 files/digest-visualboyadvance-1.7.2-r1 283
 RMD160 09c852b5f54c540714618644527326d5f29f628c files/digest-visualboyadvance-1.7.2-r1 283
 SHA256 17c8c0a1c947b5f0ed452c3fa5ed0b1892f9c35ae1ec41d4bb0897d827e6b8b0 files/digest-visualboyadvance-1.7.2-r1 283
+MD5 b964aaf93d522f3ee903d5a8d4da2ac5 files/digest-visualboyadvance-1.7.2-r2 283
+RMD160 09c852b5f54c540714618644527326d5f29f628c files/digest-visualboyadvance-1.7.2-r2 283
+SHA256 17c8c0a1c947b5f0ed452c3fa5ed0b1892f9c35ae1ec41d4bb0897d827e6b8b0 files/digest-visualboyadvance-1.7.2-r2 283
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFF7u0ckT4lNIS36YERApBJAJwPLqKwpxhaPnp6JzkvHfOdLfGEBwCfe8RA
-oARaTZTfyHHtSrdiUp/89qA=
-=bq9a
+iD8DBQFGdCdAdz7hIScOURERAsFqAKCODhc4B/9TT2YMWnf9aF2rAfq9ygCgo7cM
+FwAh1Cg+GHgX7L7MNAICmlM=
+=aSJy
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7.2-r2 b/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7.2-r2
new file mode 100644
index 000000000000..ae894e56796f
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/digest-visualboyadvance-1.7.2-r2
@@ -0,0 +1,3 @@
+MD5 cc02339e3fd8efd9f23121b0a2f81fd8 VisualBoyAdvance-src-1.7.2.tar.gz 1410762
+RMD160 44f94a4f270f2cda25879681c52892f6978caf99 VisualBoyAdvance-src-1.7.2.tar.gz 1410762
+SHA256 f4114f921a4fd4bf2ccfc68a46b9c5aa9c71cd94519fbe9ec0be992462e129b7 VisualBoyAdvance-src-1.7.2.tar.gz 1410762
diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-uninit.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-uninit.patch
new file mode 100644
index 000000000000..235c6f536fdb
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-uninit.patch
@@ -0,0 +1,13 @@
+diff -ru /root/VisualBoyAdvance-1.7.2/src/gtk/window.cpp VisualBoyAdvance-1.7.2/src/gtk/window.cpp
+--- /root/VisualBoyAdvance-1.7.2/src/gtk/window.cpp	2004-05-14 00:31:58.000000000 +1000
++++ VisualBoyAdvance-1.7.2/src/gtk/window.cpp	2007-03-17 14:57:22.000000000 -0500
+@@ -91,7 +91,8 @@
+   m_iFilterIBMin    (FirstFilterIB),
+   m_iFilterIBMax    (LastFilterIB),
+   m_iJoypadMin      (1),
+-  m_iJoypadMax      (4)
++  m_iJoypadMax      (4),
++  m_poKeymap        (NULL)
+ {
+   m_poXml            = _poXml;
+   m_poFileOpenDialog = NULL;
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
new file mode 100644
index 000000000000..188cb8d13221
--- /dev/null
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r2.ebuild,v 1.1 2007/06/16 18:08:58 nyhm Exp $
+
+inherit eutils flag-o-matic games
+
+DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator"
+HOMEPAGE="http://vba.ngemu.com/"
+SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="gtk mmx nls"
+
+RDEPEND="media-libs/libpng
+	media-libs/libsdl
+	gtk? (
+		>=x11-libs/gtk+-2.4
+		>=dev-cpp/gtkmm-2.4
+		>=dev-cpp/libglademm-2.4
+	)
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	mmx? ( dev-lang/nasm )
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/VisualBoyAdvance-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e 's:$(localedir):/usr/share/locale:' \
+		-e 's:$(datadir)/locale:/usr/share/locale:' \
+		$(find . -name 'Makefile.in*') \
+		|| die "sed failed"
+
+	cat >> src/i386/2xSaImmx.asm <<-EOF
+		%ifidn __OUTPUT_FORMAT__,elf
+		section .note.GNU-stack noalloc noexec nowrite progbits
+		%endif
+	EOF
+
+	epatch \
+		"${FILESDIR}"/${PV}-homedir.patch \
+		"${FILESDIR}"/${PV}-gcc34.patch \
+		"${FILESDIR}"/${PV}-gcc41.patch \
+		"${FILESDIR}"/${P}-uninit.patch
+}
+
+src_compile() {
+	# -O3 causes GCC to behave badly and hog memory, bug #64670.
+	replace-flags -O3 -O2
+
+	# Removed --enable-c-core as it *should* determine this based on arch
+	egamesconf \
+		--disable-dependency-tracking \
+		$(use_with mmx) \
+		$(use_enable gtk gtk 2.4) \
+		$(use_enable nls) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README README-win.txt
+	if use gtk ; then
+		newicon src/gtk/images/vba-64.png ${PN}.png
+		make_desktop_entry gvba VisualBoyAdvance
+	fi
+	prepgamesdirs
+}