version bump (bug #280044)

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 160 insertions, 13 deletions

diff --git a/games-emulation/advancemenu/ChangeLog b/games-emulation/advancemenu/ChangeLog
index 3cf2c8f3be41..498e869bc87e 100644
--- a/games-emulation/advancemenu/ChangeLog
+++ b/games-emulation/advancemenu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/advancemenu
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.29 2008/12/05 16:19:47 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/ChangeLog,v 1.30 2009/08/05 23:51:31 mr_bones_ Exp $
+
+*advancemenu-2.5.0 (05 Aug 2009)
+
+  05 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +advancemenu-2.5.0.ebuild, +files/advancemenu-2.5.0-alsa-pkg-config.patch,
+  +files/advancemenu-2.5.0-pic.patch:
+  version bump (bug #280044)
 
   05 Dec 2008; Tristan Heaven <nyhm@gentoo.org> advancemenu-2.4.13.ebuild:
   Remove expat and zlib USE flags, bug #249459
diff --git a/games-emulation/advancemenu/Manifest b/games-emulation/advancemenu/Manifest
index 217ed16d6110..0784d6641604 100644
--- a/games-emulation/advancemenu/Manifest
+++ b/games-emulation/advancemenu/Manifest
@@ -1,17 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX advancemenu-2.4.13-alsa-pkg-config.patch 1041 RMD160 75a4e82e2fb720c4192c260f61d134a86c8f8d35 SHA1 7da54abe7027264f613d381c2863997386c423df SHA256 e68f94e5d94337bb01168e043778c862cefa99fd0361ee5b36c81af9dc8a2e33
 AUX advancemenu-2.4.13-gcc4.patch 714 RMD160 40913d10e1244b968e295f1e1a4b5598a6668210 SHA1 11adc90f7908d28a59ed3a82175041875cf72e02 SHA256 edf070ce308dd80435809fbf1dce6d211c60622bee7d0308de8df02b8b89e22a
 AUX advancemenu-2.4.13-pic.patch 344 RMD160 5b28a46806f4245a9bd12f0d4e1a05de45df0053 SHA1 267d6abdaddb7caae51924456a68c98c21e260ed SHA256 d76016c2d6ef7c283d4fc6c4061e2cd4a6b1b094a4f30a9fa704f6c435c52a92
+AUX advancemenu-2.5.0-alsa-pkg-config.patch 1041 RMD160 75a4e82e2fb720c4192c260f61d134a86c8f8d35 SHA1 7da54abe7027264f613d381c2863997386c423df SHA256 e68f94e5d94337bb01168e043778c862cefa99fd0361ee5b36c81af9dc8a2e33
+AUX advancemenu-2.5.0-pic.patch 344 RMD160 5b28a46806f4245a9bd12f0d4e1a05de45df0053 SHA1 267d6abdaddb7caae51924456a68c98c21e260ed SHA256 d76016c2d6ef7c283d4fc6c4061e2cd4a6b1b094a4f30a9fa704f6c435c52a92
 DIST advancemenu-2.4.13.tar.gz 2235347 RMD160 57d28f8dfb082e4416777707fce2fbb6c5aa72f4 SHA1 961bec4ac853e15cf8d66154e6ae09ea8e67490e SHA256 1e5099ff3aadc07153153a7c898c987b20f69a67740e05d6d21fc4582c4a685b
+DIST advancemenu-2.5.0.tar.gz 2317328 RMD160 4f73b456ed14cc22e61ca914880c8b5274f120fc SHA1 cbce610eb233efe74615554eb1710b4389bc02d2 SHA256 2f0509974c4cfd9dcc30506581897a456bcb525a773fafe7df8150763d0f15ab
 EBUILD advancemenu-2.4.13.ebuild 2813 RMD160 0f0115fb8bcfe7b20c04d717422c165de1d1f339 SHA1 ba34527f939dd66f55626ab7a808eb13096f27b1 SHA256 1e3f42a1c9899251e1797c87360546c744d25e6d44d8aad97485db965715a7d6
-MISC ChangeLog 4523 RMD160 6b11aad5898132307d88189ea4f05a0f9da7f690 SHA1 127f4dcf36a604d0549f3623051b9136e02c1c21 SHA256 ee8aa65f6ed31c4b3a06e2b346819d91aacbd33ef990cfd3a230d12527ca104d
+EBUILD advancemenu-2.5.0.ebuild 2568 RMD160 45b044ec45276198b9774d99d80de7a06b5e2c59 SHA1 f72a6f4a91f5ca202298846587b520480d579fde SHA256 377cd489cdadee609df1372465e652d17455579167f5dbc2714991cc464e5ed7
+MISC ChangeLog 4762 RMD160 a9b3a8a42e536240c380fb58379134890d7ccf9a SHA1 f307d5cd42d4cb42ecee2062821ff477d7b8ebe4 SHA256 12cc3ebe435b2cb44d1ef21b2edd8f92fde9d21db67e5ecc80942d51e62a2766
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk5VKoACgkQdz7hIScOURFf5wCgtoFlGIjaOIZ+btIFkzFX4/k6
-NFsAn35m6sd1NsnHWtuYwtq83GgzZSks
-=1H03
------END PGP SIGNATURE-----
diff --git a/games-emulation/advancemenu/advancemenu-2.5.0.ebuild b/games-emulation/advancemenu/advancemenu-2.5.0.ebuild
new file mode 100644
index 000000000000..e1e144565d81
--- /dev/null
+++ b/games-emulation/advancemenu/advancemenu-2.5.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.5.0.ebuild,v 1.1 2009/08/05 23:51:31 mr_bones_ Exp $
+
+EAPI=2
+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 fbcon ncurses oss sdl slang static svga truetype"
+
+RDEPEND="dev-libs/expat
+	alsa? ( media-libs/alsa-lib )
+	ncurses? ( sys-libs/ncurses )
+	sdl? ( media-libs/libsdl )
+	slang? ( >=sys-libs/slang-1.4 )
+	svga? ( >=media-libs/svgalib-1.9 )
+	!sdl? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) )
+	truetype? ( >=media-libs/freetype-2 )"
+DEPEND="${RDEPEND}
+	x86? ( >=dev-lang/nasm-0.98 )
+	fbcon? ( virtual/os-headers )"
+
+src_prepare() {
+	# pic patch - bug #142021
+	epatch \
+		"${FILESDIR}"/${P}-alsa-pkg-config.patch \
+		"${FILESDIR}"/${P}-pic.patch
+	sed -i \
+		-e 's/"-s"//' \
+		configure \
+		|| die "sed failed"
+
+	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
+	use sdl && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
+	use !sdl && use !svga && use !fbcon && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
+	use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
+}
+
+src_configure() {
+	export PATH="${PATH}:${T}"
+	egamesconf \
+		--enable-expat \
+		--enable-zlib \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(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 !sdl && use !svga && use !fbcon && echo --enable-sdl) \
+		$(use_enable x86 asm)
+}
+
+src_compile() {
+	STRIPPROG=true emake || die "emake failed"
+}
+
+src_install() {
+	dogamesbin advmenu || die "dogamesbin failed"
+	dodoc HISTORY README RELEASE doc/*.txt
+	doman doc/{advmenu,advdev}.1
+	dohtml doc/*.html
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	elog "Execute:"
+	elog "     advmenu -default"
+	elog "to generate a config file"
+	elog
+	elog "An example emulator config found in advmenu.rc:"
+	elog "     emulator \"snes9x\" generic \"/usr/games/bin/snes9x\" \"%f\""
+	elog "     emulator_roms \"snes9x\" \"/home/user/myroms\""
+	elog "     emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
+	elog
+	elog "For more information, see the advmenu man page."
+}
diff --git a/games-emulation/advancemenu/files/advancemenu-2.5.0-alsa-pkg-config.patch b/games-emulation/advancemenu/files/advancemenu-2.5.0-alsa-pkg-config.patch
new file mode 100644
index 000000000000..de0af21f2fc0
--- /dev/null
+++ b/games-emulation/advancemenu/files/advancemenu-2.5.0-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.5.0-pic.patch b/games-emulation/advancemenu/files/advancemenu-2.5.0-pic.patch
new file mode 100644
index 000000000000..049befbfac2c
--- /dev/null
+++ b/games-emulation/advancemenu/files/advancemenu-2.5.0-pic.patch
@@ -0,0 +1,13 @@
+--- ./advance/blit/blit.c.orig	2004-12-19 01:01:46.039956536 -0500
++++ ./advance/blit/blit.c	2004-12-19 01:01:19.566981040 -0500
+@@ -28,6 +28,10 @@
+  * do so, delete this exception statement from your version.
+  */
+ 
++#if defined(USE_ASM_INLINE) && defined(__PIC__)
++# undef USE_ASM_INLINE
++#endif
++
+ #include "portable.h"
+ 
+ #include "blit.h"