Don't install cfg in GAMES_DATADIR since GAMES_SYSCONFDIR works; Add gcc34 patch from ecco@crivens.demon.nl via bug #52242

4 files changed, 59 insertions, 24 deletions

diff --git a/games-emulation/visualboyadvance/ChangeLog b/games-emulation/visualboyadvance/ChangeLog
index ae1ec167b80b..065b46413da4 100644
--- a/games-emulation/visualboyadvance/ChangeLog
+++ b/games-emulation/visualboyadvance/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/visualboyadvance
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.17 2004/08/15 06:57:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/ChangeLog,v 1.18 2004/09/04 09:37:45 mr_bones_ Exp $
+
+  04 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  visualboyadvance-1.7.2.ebuild:
+  Don't install cfg in GAMES_DATADIR since GAMES_SYSCONFDIR works
+  Add gcc34 patch from ecco@crivens.demon.nl via bug #52242
 
 *visualboyadvance-1.7.2 (15 Aug 2004)
 
diff --git a/games-emulation/visualboyadvance/Manifest b/games-emulation/visualboyadvance/Manifest
index cd16364220b6..fa6b110de637 100644
--- a/games-emulation/visualboyadvance/Manifest
+++ b/games-emulation/visualboyadvance/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d8160c10a249236570de5892c624f5be ChangeLog 2602
-MD5 ba74c994952b7572856c506b1abf37dc visualboyadvance-1.7.2.ebuild 1113
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 892b2c62b573e9ed3a4dcd7481824f15 ChangeLog 2820
 MD5 56dc54e0cb41eab61a75cd5d75017ce2 visualboyadvance-1.7.1-r1.ebuild 1295
-MD5 342ffeee3202543937ea62e7008dbdef files/digest-visualboyadvance-1.7.2 79
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 09e618670bb14cb11f9ad14cc5be6c14 visualboyadvance-1.7.2.ebuild 1047
 MD5 a0c26da0983eebc48c3ca83825dde876 files/visualboyadvance 631
-MD5 ef02d9be59ab74afa9a8f12e17e359d4 files/1.7.2-homedir.patch 415
 MD5 6db235a2f4659121d5898a9c6d6f92fe files/digest-visualboyadvance-1.7.1-r1 79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBHwmEHTu7gpaalycRApf4AKCyhF1gCNt0QzZ0QXz/2tWfJwz2cwCeIKcx
-raapFUCcxr9QKOaXx2EiTQc=
-=Vjhm
------END PGP SIGNATURE-----
+MD5 ef02d9be59ab74afa9a8f12e17e359d4 files/1.7.2-homedir.patch 415
+MD5 342ffeee3202543937ea62e7008dbdef files/digest-visualboyadvance-1.7.2 79
+MD5 04a0915b7a414f5065dfb2510cc5a677 files/1.7.2-gcc34.patch 1354
diff --git a/games-emulation/visualboyadvance/files/1.7.2-gcc34.patch b/games-emulation/visualboyadvance/files/1.7.2-gcc34.patch
new file mode 100644
index 000000000000..5ce4802206af
--- /dev/null
+++ b/games-emulation/visualboyadvance/files/1.7.2-gcc34.patch
@@ -0,0 +1,41 @@
+diff -ur VisualBoyAdvance-1.7.2.orig/src/gtk/joypadconfig.h VisualBoyAdvance-1.7.2/src/gtk/joypadconfig.h
+--- VisualBoyAdvance-1.7.2.orig/src/gtk/joypadconfig.h	2004-05-10 16:43:21.000000000 +0200
++++ VisualBoyAdvance-1.7.2/src/gtk/joypadconfig.h	2004-08-12 22:30:20.838039064 +0200
+@@ -22,8 +22,8 @@
+ 
+ #include <vector>
+ 
+-#include <libglademm.h>
+ #include <gtkmm.h>
++#include <libglademm.h>
+ 
+ #ifndef GTKMM20
+ # include "sigccompat.h"
+diff -ur VisualBoyAdvance-1.7.2.orig/src/gtk/main.cpp VisualBoyAdvance-1.7.2/src/gtk/main.cpp
+--- VisualBoyAdvance-1.7.2.orig/src/gtk/main.cpp	2004-05-21 18:02:35.000000000 +0200
++++ VisualBoyAdvance-1.7.2/src/gtk/main.cpp	2004-08-12 22:39:08.633801912 +0200
+@@ -22,10 +22,10 @@
+ 
+ #include <list>
+ 
+-#include <libglademm.h>
+ #include <gtkmm/main.h>
+ #include <gtkmm/window.h>
+ #include <gtkmm/messagedialog.h>
++#include <libglademm.h>
+ 
+ #include "images/vba-wm-pixbufs.h"
+ 
+diff -ur VisualBoyAdvance-1.7.2.orig/src/gtk/window.h VisualBoyAdvance-1.7.2/src/gtk/window.h
+--- VisualBoyAdvance-1.7.2.orig/src/gtk/window.h	2004-05-21 15:25:41.000000000 +0200
++++ VisualBoyAdvance-1.7.2/src/gtk/window.h	2004-08-12 22:30:58.650290728 +0200
+@@ -23,8 +23,8 @@
+ #include <sys/types.h>
+ #include <stdarg.h>
+ 
+-#include <libglademm.h>
+ #include <gtkmm.h>
++#include <libglademm.h>
+ 
+ #ifndef GTKMM20
+ # include "sigccompat.h"
diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.ebuild
index c520713c68dc..d5746f7452df 100644
--- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2.ebuild
+++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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.ebuild,v 1.1 2004/08/15 06:57:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/visualboyadvance/visualboyadvance-1.7.2.ebuild,v 1.2 2004/09/04 09:37:45 mr_bones_ Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator"
 HOMEPAGE="http://vba.ngemu.com/"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc amd64"
-IUSE="mmx debug"
+IUSE="mmx"
 
 RDEPEND="virtual/x11
 	media-libs/libpng
@@ -24,14 +24,14 @@ S="${WORKDIR}/VisualBoyAdvance-${PV}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-homedir.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-homedir.patch"
+	epatch "${FILESDIR}/${PV}-gcc34.patch"
 }
 
 src_compile() {
 	egamesconf \
 		--enable-c-core \
-		$(use_with debug profiling) \
 		$(use_with mmx) \
 		|| die
 	emake || die "emake failed"
@@ -39,8 +39,6 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	insinto ${GAMES_DATADIR}/VisualBoyAdvance
-	doins src/VisualBoyAdvance.cfg
 	dodoc AUTHORS ChangeLog INSTALL NEWS README README-win.txt
 	prepgamesdirs
 }