Version bump with PIC patch #74899.

diff --git a/games-emulation/advancemame/ChangeLog b/games-emulation/advancemame/ChangeLog
index 17c5a9a7d5c6cebf482a08b119ff9fd9a2011f57..17683aa256d295bef5981fb732a0b30a1034fa28 100644 (file)
--- a/games-emulation/advancemame/ChangeLog
+++ b/games-emulation/advancemame/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/advancemame
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemame/ChangeLog,v 1.20 2004/12/01 01:23:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemame/ChangeLog,v 1.21 2004/12/19 06:32:16 vapier Exp $
+
+*advancemame-0.89.0 (19 Dec 2004)
+
+  19 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/0.89.0-pic.patch,
+  advancemame-0.88.0.ebuild, +advancemame-0.89.0.ebuild:
+  Version bump with PIC patch #74899.
 
 *advancemame-0.88.0 (30 Nov 2004)
 

diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest
index 59ff831a01670b3a914ce73b191998f01064c98d..10105ef05451d1b2cf6519849517c8cbbe0031bd 100644 (file)
--- a/games-emulation/advancemame/Manifest
+++ b/games-emulation/advancemame/Manifest
@@ -1,10 +1,23 @@
-MD5 6754a8c2c15052576b0062804d283a6e ChangeLog 3906
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2c494ca4a7ee9f1a04338f654fe4083c ChangeLog 4109
+MD5 a67ea9d0aba6813bf7099ba0533ba44d advancemame-0.85.0.ebuild 1820
 MD5 c7a56ad2d4cb791e613869debc9e18df advancemame-0.86.0.ebuild 1823
-MD5 ebee324f3a2e25e2d43962b10672d214 advancemame-0.87.0.ebuild 1942
 MD5 972b8c9f939a33a7074e0819fb55455c metadata.xml 962
-MD5 51b7361b0f2a2442050386318305828b advancemame-0.88.0.ebuild 1938
-MD5 a67ea9d0aba6813bf7099ba0533ba44d advancemame-0.85.0.ebuild 1820
-MD5 cfcb101ca859965c03e4c39303d3c481 files/digest-advancemame-0.86.0 72
+MD5 ebee324f3a2e25e2d43962b10672d214 advancemame-0.87.0.ebuild 1942
+MD5 8cca3de56e63ac1d78313014e53534e4 advancemame-0.88.0.ebuild 1988
+MD5 ad3275724819a8be11f3101c234b053f advancemame-0.89.0.ebuild 1987
+MD5 893791a430019a7eb1c0eaf15758a93f files/0.89.0-pic.patch 344
 MD5 0fcd53e6dc55e784545e640310890175 files/digest-advancemame-0.85.0 72
+MD5 cfcb101ca859965c03e4c39303d3c481 files/digest-advancemame-0.86.0 72
 MD5 2781f763e847a14eef2b5f3520b04231 files/digest-advancemame-0.87.0 72
 MD5 f43f9c3039884207b6e5fc1d91bb46cb files/digest-advancemame-0.88.0 72
+MD5 8aaeef301de9a34d24cfb74973b8ef9b files/digest-advancemame-0.89.0 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBxSCAroRuSHgZdywRAudfAJ9zy5oNqbSd3A/sVcqmzjwBOGHVKwCfVUFm
+5uoD3OeVzyFRNYS2+syZLtg=
+=TPuf
+-----END PGP SIGNATURE-----

diff --git a/games-emulation/advancemame/advancemame-0.88.0.ebuild b/games-emulation/advancemame/advancemame-0.88.0.ebuild
index 640acc87ff15c0c2a057a905c4c328a504ff2b93..191ef830bc23af8dd6895065b384677b5d737d8c 100644 (file)
--- a/games-emulation/advancemame/advancemame-0.88.0.ebuild
+++ b/games-emulation/advancemame/advancemame-0.88.0.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/advancemame/advancemame-0.88.0.ebuild,v 1.1 2004/12/01 01:23:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemame/advancemame-0.88.0.ebuild,v 1.2 2004/12/19 06:32:16 vapier Exp $
 
-inherit eutils games
+inherit games flag-o-matic
 
 DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu"
 HOMEPAGE="http://advancemame.sourceforge.net/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
 
 LICENSE="GPL-2 xmame"
 SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
+KEYWORDS="~amd64 ppc x86"
 IUSE="alsa expat fbcon oss sdl slang static svga truetype zlib"
 
 RDEPEND="virtual/libc
@@ -39,7 +39,9 @@ src_unpack() {
 }
 
 src_compile() {
-       PATH="${PATH}:${T}"
+       local myconf=""
+       is-flags -fPIC || myconf="$(use_enable x86 asm)"
+       env PATH="${PATH}:${T}" \
        egamesconf \
                $(use_enable alsa) \
                $(use_enable expat) \
@@ -51,7 +53,6 @@ src_compile() {
                $(use_enable svga svgalib) \
                $(use_enable truetype freetype) \
                $(use_enable zlib) \
-               $(use_enable x86 asm) \
                --with-emu=${PN/advance} \
                || die
        emake || die "emake failed"

diff --git a/games-emulation/advancemame/advancemame-0.89.0.ebuild b/games-emulation/advancemame/advancemame-0.89.0.ebuild
new file mode 100644 (file)
index 0000000..a8ab93f
--- /dev/null
+++ b/games-emulation/advancemame/advancemame-0.89.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemame/advancemame-0.89.0.ebuild,v 1.1 2004/12/19 06:32:16 vapier Exp $
+
+inherit games eutils
+
+DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu"
+HOMEPAGE="http://advancemame.sourceforge.net/"
+SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
+
+LICENSE="GPL-2 xmame"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86"
+IUSE="alsa expat fbcon oss sdl slang static svga truetype zlib"
+
+RDEPEND="virtual/libc
+       app-arch/unzip
+       app-arch/zip
+       sdl? ( media-libs/libsdl )
+       slang? ( sys-libs/slang )
+       alsa? ( media-libs/alsa-lib )
+       expat? ( >=dev-libs/expat-1.95.6 )
+       zlib? ( sys-libs/zlib )
+       truetype? ( media-libs/freetype )
+       svga? ( >=media-libs/svgalib-1.9 )"
+DEPEND="${RDEPEND}
+       x86? ( >=dev-lang/nasm-0.98 )
+       virtual/os-headers"
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${PV}-pic.patch #74899
+
+       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() {
+       PATH="${PATH}:${T}"
+       egamesconf \
+               $(use_enable alsa) \
+               $(use_enable expat) \
+               $(use_enable fbcon fb) \
+               $(use_enable oss) \
+               $(use_enable sdl) \
+               $(use_enable slang) \
+               $(use_enable static) \
+               $(use_enable svga svgalib) \
+               $(use_enable truetype freetype) \
+               $(use_enable zlib) \
+               $(use_enable x86 asm) \
+               --with-emu=${PN/advance} \
+               || die
+       emake || die "emake failed"
+}
+
+src_install() {
+       local f
+
+       for f in adv* ; do
+               if [ -L "${f}" ] ; then
+                       dogamesbin "${f}" || die "dogamesbin failed"
+               fi
+       done
+
+       insinto "${GAMES_DATADIR}/advance"
+       doins support/event.dat
+       keepdir "${GAMES_DATADIR}/advance/"{artwork,diff,image,rom,sample,snap}
+
+       dodoc HISTORY README RELEASE
+       cd doc
+       dodoc *.txt
+       dohtml *.html
+       for f in *.1 ; do
+               newman ${f} ${f/1/6}
+       done
+
+       prepgamesdirs
+}

diff --git a/games-emulation/advancemame/files/0.89.0-pic.patch b/games-emulation/advancemame/files/0.89.0-pic.patch
new file mode 100644 (file)
index 0000000..049befb
--- /dev/null
+++ b/games-emulation/advancemame/files/0.89.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"

diff --git a/games-emulation/advancemame/files/digest-advancemame-0.89.0 b/games-emulation/advancemame/files/digest-advancemame-0.89.0
new file mode 100644 (file)
index 0000000..7324c54
--- /dev/null
+++ b/games-emulation/advancemame/files/digest-advancemame-0.89.0
@@ -0,0 +1 @@
+MD5 80841649560369e64239cc9b2a2ed818 advancemame-0.89.0.tar.gz 13865948