version bump - patch from Karol Szumski via bug #120712 included

(Portage version: 2.1_pre6-r6)

6 files changed, 168 insertions, 11 deletions

diff --git a/games-emulation/advancemenu/ChangeLog b/games-emulation/advancemenu/ChangeLog
index f8b6cec2c8bb..49795cffd78b 100644
--- a/games-emulation/advancemenu/ChangeLog
+++ b/games-emulation/advancemenu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/advancemenu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.22 2006/02/15 00:15:57 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.23 2006/03/25 05:21:17 mr_bones_ Exp $
+
+*advancemenu-2.4.13 (25 Mar 2006)
+
+  25 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/advancemenu-2.4.13-alsa-pkg-config.patch,
+  +files/advancemenu-2.4.13-gcc4.patch, +advancemenu-2.4.13.ebuild:
+  version bump - patch from Karol Szumski via bug #120712 included
 
   15 Feb 2006; Luis Medinas <metalgod@gentoo.org> advancemenu-2.4.12.ebuild:
   Added ~amd64 keyword.
diff --git a/games-emulation/advancemenu/Manifest b/games-emulation/advancemenu/Manifest
index 452ea1fc701e..c6c32b1a1d71 100644
--- a/games-emulation/advancemenu/Manifest
+++ b/games-emulation/advancemenu/Manifest
@@ -1,25 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 10e807652388acca6307802b7114210c ChangeLog 3412
 RMD160 6afedd445771fd609cba676232cc0ce8a4891358 ChangeLog 3412
 SHA256 8af8f93437ef20994cd8efb13597a996ee2261040a32b363132e52d60590fffa ChangeLog 3412
 MD5 be792fb19e86354d380cfbcad9b383c9 advancemenu-2.4.12.ebuild 2521
 RMD160 8092944ba4d4c24fb73c922b2a3e46fe1b9ba5e7 advancemenu-2.4.12.ebuild 2521
 SHA256 ea58839cf78b30d4d2c04b2c8997c7c85863bd2eed043073e3514c4ba407cbf4 advancemenu-2.4.12.ebuild 2521
+MD5 be792fb19e86354d380cfbcad9b383c9 advancemenu-2.4.13.ebuild 2521
+RMD160 8092944ba4d4c24fb73c922b2a3e46fe1b9ba5e7 advancemenu-2.4.13.ebuild 2521
+SHA256 ea58839cf78b30d4d2c04b2c8997c7c85863bd2eed043073e3514c4ba407cbf4 advancemenu-2.4.13.ebuild 2521
 MD5 fceeb76637a021f26b3d0ddefd9f12d3 files/advancemenu-2.4.12-alsa-pkg-config.patch 1041
 RMD160 75a4e82e2fb720c4192c260f61d134a86c8f8d35 files/advancemenu-2.4.12-alsa-pkg-config.patch 1041
 SHA256 e68f94e5d94337bb01168e043778c862cefa99fd0361ee5b36c81af9dc8a2e33 files/advancemenu-2.4.12-alsa-pkg-config.patch 1041
 MD5 aa8ee1a6c28266f5a7dc179470734abc files/digest-advancemenu-2.4.12 71
 RMD160 b25b982e7f4073db9162588415676d98bb86bc2e files/digest-advancemenu-2.4.12 71
 SHA256 58c855e25d89a2a9f51a840596be46f5d61f6f133c82e6a22c30ed11ad8598f0 files/digest-advancemenu-2.4.12 71
+MD5 a7ce9161abebfd4ab33c33e39f00455d files/digest-advancemenu-2.4.13 259
+RMD160 9d8cd7af59070fd52bd057ed04221e50b208fd5d files/digest-advancemenu-2.4.13 259
+SHA256 7cfbbcca838dd38a047ccbb5b7f66331f003aae61954b1fa4d068041661acebb files/digest-advancemenu-2.4.13 259
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD8nLQwUpWvClEHQoRAt5pAJ4wzKeA+yKQbzUAOsw/wtQC1UB6qQCghi8m
-6gD4kfhO9XXHCi+76CXI5SQ=
-=eIcy
------END PGP SIGNATURE-----
diff --git a/games-emulation/advancemenu/advancemenu-2.4.13.ebuild b/games-emulation/advancemenu/advancemenu-2.4.13.ebuild
new file mode 100644
index 000000000000..8688c5ae50ad
--- /dev/null
+++ b/games-emulation/advancemenu/advancemenu-2.4.13.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.4.13.ebuild,v 1.1 2006/03/25 05:21:17 mr_bones_ Exp $
+
+inherit eutils games
+
+DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
+HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
+SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa debug expat fbcon ncurses oss sdl slang static svga truetype zlib"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	expat? ( dev-libs/expat )
+	ncurses? ( sys-libs/ncurses )
+	sdl? ( media-libs/libsdl )
+	slang? ( sys-libs/slang )
+	svga? ( >=media-libs/svgalib-1.9 )
+	truetype? ( >=media-libs/freetype-2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	x86? ( >=dev-lang/nasm-0.98 )
+	fbcon? ( virtual/os-headers )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# gcc4 patch - bug #120712
+	epatch \
+		"${FILESDIR}"/${P}-alsa-pkg-config.patch \
+		"${FILESDIR}"/${P}-gcc4.patch
+	use x86 && ln -s $(which nasm) "${T}/${CHOST}-nasm"
+	use sdl && ln -s $(which sdl-config) "${T}/${CHOST}-sdl-config"
+	use truetype && ln -s $(which freetype-config) "${T}/${CHOST}-freetype-config"
+}
+
+src_compile() {
+	export PATH="${PATH}:${T}"
+	egamesconf \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable expat) \
+		$(use_enable fbcon fb) \
+		$(use_enable ncurses) \
+		$(use_enable truetype freetype) \
+		$(use_enable oss) \
+		$(use_enable sdl) \
+		$(use_enable slang) \
+		$(use_enable static) \
+		$(use_enable svga svgalib) \
+		$(use_enable x86 asm) \
+		$(use_enable zlib) \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	dogamesbin advmenu || die "dogamesbin failed"
+	# I think it will work like this eventually...(bug #94313)
+	#if use fbcon || use svga ; then
+		#dogamesbin advcfg advv || die "dogamesbin failed"
+		#doman doc/{advcfg,advv}.1
+	#fi
+	dodoc HISTORY README RELEASE doc/*.txt
+	doman doc/{advmenu,advdev}.1
+	dohtml doc/*.html
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	einfo "Execute:"
+	einfo "     advmenu -default"
+	einfo "To generate a config file"
+	ewarn "In order to use advmenu, you must properly configure it!"
+	einfo
+	einfo "An example emulator config found in advmenu.rc:"
+	einfo "     emulator \"snes9x\" generic \"/usr/games/bin/snes9x\" \"%f\""
+	einfo "     emulator_roms \"snes9x\" \"/home/user/myroms\""
+	einfo "     emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
+	einfo
+	einfo "For more information, see the advmenu man page."
+}
diff --git a/games-emulation/advancemenu/files/advancemenu-2.4.13-alsa-pkg-config.patch b/games-emulation/advancemenu/files/advancemenu-2.4.13-alsa-pkg-config.patch
new file mode 100644
index 000000000000..de0af21f2fc0
--- /dev/null
+++ b/games-emulation/advancemenu/files/advancemenu-2.4.13-alsa-pkg-config.patch
@@ -0,0 +1,44 @@
+Make sure we ask alsa what libraries it needs rather than assuming.
+
+http://bugs.gentoo.org/97628
+
+Changes for configure.ac:
+	--------------------------------------
+	 		[snd_pcm_open],
+	 		[ac_lib_alsa=yes],
+	 		[ac_lib_alsa=no],
+	-		[-lm]
+	+		[`pkg-config alsa --libs`]
+	 	)
+	 	if test $ac_lib_alsa = yes; then
+	 		AC_MSG_CHECKING([for ALSA])
+	--------------------------------------
+	 		[snd_pcm_open],
+	 		[],
+	 		[AC_MSG_ERROR([the ALSA library is missing])],
+	-		[-lm]
+	+		[`pkg-config alsa --libs`]
+	 	)
+	 	AC_MSG_CHECKING([for ALSA version])
+	 	AC_TRY_COMPILE([
+
+--- configure
++++ configure
+@@ -8298,7 +8298,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lasound -lm
++LIBS="-lasound `pkg-config alsa --libs`
+ 	 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -8428,7 +8428,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lasound -lm
++LIBS="-lasound `pkg-config alsa --libs`
+ 	 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
diff --git a/games-emulation/advancemenu/files/advancemenu-2.4.13-gcc4.patch b/games-emulation/advancemenu/files/advancemenu-2.4.13-gcc4.patch
new file mode 100644
index 000000000000..bf70b7eb12f8
--- /dev/null
+++ b/games-emulation/advancemenu/files/advancemenu-2.4.13-gcc4.patch
@@ -0,0 +1,20 @@
+--- ./advancemenu-2.4.13/advance/menu/emulator.h.old	2005-12-04 10:30:17.000000000 +0100
++++ ./advancemenu-2.4.13/advance/menu/emulator.h	2006-01-28 13:34:22.000000000 +0100
+@@ -41,7 +41,7 @@
+ 	tristate_t exclude_missing_effective;
+ 	tristate_t exclude_missing_orig;
+ 
+-	std::string emulator::attrib_compile(const std::string& value0, const std::string& value1);
++	std::string attrib_compile(const std::string& value0, const std::string& value1);
+ 
+ 	std::string name;
+ 
+@@ -363,7 +363,7 @@
+ };
+ 
+ class generic : public emulator {
+-	bool generic::load_info(game_set& gar);
++	bool load_info(game_set& gar);
+ public:
+ 	generic(const std::string& Aname, const std::string& Aexe_path, const std::string& Acmd_arg);
+ 
diff --git a/games-emulation/advancemenu/files/digest-advancemenu-2.4.13 b/games-emulation/advancemenu/files/digest-advancemenu-2.4.13
new file mode 100644
index 000000000000..55dd50eeeeae
--- /dev/null
+++ b/games-emulation/advancemenu/files/digest-advancemenu-2.4.13
@@ -0,0 +1,3 @@
+MD5 c75e4254cb9159c18ccb521c0b5aae47 advancemenu-2.4.13.tar.gz 2235347
+RMD160 57d28f8dfb082e4416777707fce2fbb6c5aa72f4 advancemenu-2.4.13.tar.gz 2235347
+SHA256 1e5099ff3aadc07153153a7c898c987b20f69a67740e05d6d21fc4582c4a685b advancemenu-2.4.13.tar.gz 2235347