version bump #26763

9 files changed, 303 insertions, 5 deletions

diff --git a/app-emulation/xmame/ChangeLog b/app-emulation/xmame/ChangeLog
index fddfca839e63..1ca04ec8b2e0 100644
--- a/app-emulation/xmame/ChangeLog
+++ b/app-emulation/xmame/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xmame
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/ChangeLog,v 1.22 2003/08/16 06:06:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/ChangeLog,v 1.23 2003/08/17 23:03:58 vapier Exp $
+
+*xmame-0.72.1 (17 Aug 2003)
+
+  17 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #26763 + remove mips patch.
 
 *xmame-0.71.1 (16 Aug 2003)
 
diff --git a/app-emulation/xmame/files/0.72.1-glx-fix.patch b/app-emulation/xmame/files/0.72.1-glx-fix.patch
new file mode 100644
index 000000000000..20d29a9d0573
--- /dev/null
+++ b/app-emulation/xmame/files/0.72.1-glx-fix.patch
@@ -0,0 +1,19 @@
+diff -urN xmame-0.70.1-orig/src/unix/osd_cpu.h xmame-0.70.1/src/unix/osd_cpu.h
+--- xmame-0.70.1-orig/src/unix/osd_cpu.h	2003-06-12 05:37:50.000000000 +0200
++++ xmame-0.70.1/src/unix/osd_cpu.h	2003-07-15 15:09:03.000000000 +0200
+@@ -39,11 +39,15 @@
+ #endif
+ 
+ /* grrr work around some stupid header conflicts */
++#ifndef xgl
+ #if !defined __XF86_DGA_C && !defined __XOPENGL_C_ && !defined LONG64
+ typedef signed   char      INT8;
+ typedef signed   short     INT16;
+ typedef signed   int       INT32;
+ #endif
++#else
++#include <X11/Xmd.h>
++#endif
+ 
+ #ifndef LONG64
+ typedef signed   long long INT64;
diff --git a/app-emulation/xmame/files/digest-xmame-0.72.1 b/app-emulation/xmame/files/digest-xmame-0.72.1
new file mode 100644
index 000000000000..d0317da90c07
--- /dev/null
+++ b/app-emulation/xmame/files/digest-xmame-0.72.1
@@ -0,0 +1 @@
+MD5 0ca7ca8111c24951232c453af8db3f86 xmame-0.72.1.tar.bz2 10210781
diff --git a/app-emulation/xmame/xmame-0.70.1.ebuild b/app-emulation/xmame/xmame-0.70.1.ebuild
index 1409d641aa60..59c04557eb12 100644
--- a/app-emulation/xmame/xmame-0.70.1.ebuild
+++ b/app-emulation/xmame/xmame-0.70.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/xmame-0.70.1.ebuild,v 1.4 2003/08/05 15:15:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/xmame-0.70.1.ebuild,v 1.5 2003/08/17 23:03:58 vapier Exp $
 
 inherit games flag-o-matic gcc eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://x.mame.net/"
 
 LICENSE="xmame"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha"
 IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick"
 
 DEPEND="sys-libs/zlib
diff --git a/app-emulation/xmame/xmame-0.72.1.ebuild b/app-emulation/xmame/xmame-0.72.1.ebuild
new file mode 100644
index 000000000000..d494ed0ef118
--- /dev/null
+++ b/app-emulation/xmame/xmame-0.72.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmame/xmame-0.72.1.ebuild,v 1.1 2003/08/17 23:04:18 vapier Exp $
+
+inherit games flag-o-matic gcc eutils
+
+TARGET=${PN}
+
+DESCRIPTION="Multiple Arcade Machine Emulator for X11"
+SRC_URI="http://x.mame.net/download/xmame-${PV}.tar.bz2"
+HOMEPAGE="http://x.mame.net/"
+
+LICENSE="xmame"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha"
+IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick"
+
+DEPEND="sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	alsa? ( media-libs/alsa-lib )
+	xv? ( >=x11-base/xfree-4.1.0 )
+	dga? ( >=x11-base/xfree-4.1.0 )
+	esd? ( >=media-sound/esound-0.2.29 )
+	svga? ( media-libs/svgalib )
+	ggi? ( media-libs/libggi )
+	arts? ( kde-base/arts )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/xmame-${PV}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-glx-fix.patch
+
+	[ ${ARCH} == "x86" ] && sed -i -e '/X86_ASM_68000 =/s:#::' -e '/X86_MIPS3_DRC =/s:#::' Makefile
+	[ ${ARCH} == "ppc" ] && sed -i '/^MY_CPU/s:i386:risc:' Makefile
+	[ ${ARCH} == "sparc" ] && sed -i '/^MY_CPU/s:i386:risc:' Makefile
+	[ ${ARCH} == "alpha" ] && sed -i '/^MY_CPU/s:i386:alpha:' Makefile
+	[ ${ARCH} == "mips" ] && sed -i '/^MY_CPU/s:i386:mips:' Makefile
+
+	[ ${ARCH} == "x86" ] && [ `use joystick` ] && sed -i '/JOY_I386.*=/s:#::' Makefile
+
+	[ `use esd` ] && sed -i '/SOUND_ESOUND/s:#::' Makefile
+	[ `use alsa` ] && sed -i '/SOUND_ALSA/s:#::' Makefile
+	[ `use arts` ] && sed -i '/SOUND_ARTS/s:#::' Makefile
+	[ `use sdl` ] && sed -i '/SOUND_SDL/s:#::' Makefile
+
+	if [ `use dga` ] ; then
+		sed -i '/X11_DGA/s:#::' Makefile
+		[ `use 3dfx` ] && sed -i '/TDFX_DGA_WORKAROUND/s:#::' Makefile
+	fi
+
+	[ `use xv` ] && sed -i '/X11_XV/s:#::' Makefile
+
+	sed -i \
+		-e "/^PREFIX/s:=.*:=/usr:" \
+		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
+		-e "/^XMAMEROOT/s:=.*:=${GAMES_DATADIR}/${TARGET}:" \
+		-e "/^TARGET/s:mame:${TARGET:1}:" \
+		Makefile
+
+	case ${ARCH} in
+		x86)	append-flags -Wno-unused -fomit-frame-pointer -fstrict-aliasing -fstrength-reduce -ffast-math
+			[ `gcc-major-version` -eq 3 ] \
+				&& append-flags -falign-functions=2 -falign-jumps=2 -falign-loops=2 \
+				|| append-flags -malign-functions=2 -malign-jumps=2 -malign-loops=2
+			;;
+		ppc)	append-flags -Wno-unused -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char
+			;;
+	esac
+	sed -i "s:^CFLAGS =:CFLAGS=${CFLAGS}:" Makefile
+}
+
+src_compile() {
+	[ ! -z "`use X``use dga``use xv`" ] && { make DISPLAY_METHOD=x11 || die; }
+	[ `use sdl` ] && { make DISPLAY_METHOD=SDL || die; }
+	[ `use svga` ] && { make DISPLAY_METHOD=svgalib || die; }
+	[ `use ggi` ] && { make DISPLAY_METHOD=ggi || die; }
+	[ `use opengl` ] && { make DISPLAY_METHOD=xgl || die; }
+}
+
+src_install() {
+	sed -i \
+		-e "s:^PREFIX.*:PREFIX=${D}/usr:" \
+		-e "s:^BINDIR.*:BINDIR=${D}/${GAMES_BINDIR}:" \
+		-e "s:^XMAMEROOT.*:XMAMEROOT=${D}/${GAMES_DATADIR}/${TARGET}:" \
+		Makefile
+
+	[ ! -z "`use X``use dga``use xv`" ]	&& { make DISPLAY_METHOD=x11 install || die; }
+	[ `use sdl` ]				&& { make DISPLAY_METHOD=SDL install || die; }
+	[ `use svga` ]				&& { make DISPLAY_METHOD=svgalib install || die; }
+	[ `use ggi` ]				&& { make DISPLAY_METHOD=ggi install || die; }
+	[ `use opengl` ]			&& { make DISPLAY_METHOD=xgl install || die; }
+
+	dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo
+	dohtml -r doc/*
+
+	if [ `use opengl` ] ; then
+		dosym ${TARGET}.xgl ${GAMES_BINDIR}/${TARGET}
+	elif [ ! -z "`use X``use dga``use xv`" ] ; then
+		dosym ${TARGET}.x11 ${GAMES_BINDIR}/${TARGET}
+	elif [ `use sdl` ] ; then
+		dosym ${TARGET}.SDL ${GAMES_BINDIR}/${TARGET}
+	elif [ `use svga` ] ; then
+		dosym ${TARGET}.svgalib ${GAMES_BINDIR}/${TARGET}
+	elif [ `use ggi` ] ; then
+		dosym ${TARGET}.ggi ${GAMES_BINDIR}/${TARGET}
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "Your available MAME binaries are:"
+	[ ! -z "`use X``use dga``use xv`" ] && einfo " ${TARGET}.x11"
+	[ `use sdl` ] && einfo " ${TARGET}.SDL"
+	[ `use svga` ] && einfo " ${TARGET}.svgalib"
+	[ `use ggi` ] && einfo " ${TARGET}.ggi"
+	[ `use opengl` ] && einfo " ${TARGET}.xgl"
+}
diff --git a/app-emulation/xmess/ChangeLog b/app-emulation/xmess/ChangeLog
index e5dbbea536f4..9fa2b2864bd3 100644
--- a/app-emulation/xmess/ChangeLog
+++ b/app-emulation/xmess/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for app-emulation/xmess
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmess/ChangeLog,v 1.7 2003/08/16 06:07:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmess/ChangeLog,v 1.8 2003/08/17 23:05:05 vapier Exp $
 
-*xmame-0.71.1 (16 Aug 2003)
+*xmess-0.72.1 (17 Aug 2003)
+
+  17 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #26763 + remove mips patch.
+
+*xmess-0.71.1 (16 Aug 2003)
 
   16 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bump #24986 + mips patch.
diff --git a/app-emulation/xmess/files/0.72.1-glx-fix.patch b/app-emulation/xmess/files/0.72.1-glx-fix.patch
new file mode 100644
index 000000000000..20d29a9d0573
--- /dev/null
+++ b/app-emulation/xmess/files/0.72.1-glx-fix.patch
@@ -0,0 +1,19 @@
+diff -urN xmame-0.70.1-orig/src/unix/osd_cpu.h xmame-0.70.1/src/unix/osd_cpu.h
+--- xmame-0.70.1-orig/src/unix/osd_cpu.h	2003-06-12 05:37:50.000000000 +0200
++++ xmame-0.70.1/src/unix/osd_cpu.h	2003-07-15 15:09:03.000000000 +0200
+@@ -39,11 +39,15 @@
+ #endif
+ 
+ /* grrr work around some stupid header conflicts */
++#ifndef xgl
+ #if !defined __XF86_DGA_C && !defined __XOPENGL_C_ && !defined LONG64
+ typedef signed   char      INT8;
+ typedef signed   short     INT16;
+ typedef signed   int       INT32;
+ #endif
++#else
++#include <X11/Xmd.h>
++#endif
+ 
+ #ifndef LONG64
+ typedef signed   long long INT64;
diff --git a/app-emulation/xmess/files/digest-xmess-0.72.1 b/app-emulation/xmess/files/digest-xmess-0.72.1
new file mode 100644
index 000000000000..d0317da90c07
--- /dev/null
+++ b/app-emulation/xmess/files/digest-xmess-0.72.1
@@ -0,0 +1 @@
+MD5 0ca7ca8111c24951232c453af8db3f86 xmame-0.72.1.tar.bz2 10210781
diff --git a/app-emulation/xmess/xmess-0.72.1.ebuild b/app-emulation/xmess/xmess-0.72.1.ebuild
new file mode 100644
index 000000000000..b996f565b6ff
--- /dev/null
+++ b/app-emulation/xmess/xmess-0.72.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xmess/xmess-0.72.1.ebuild,v 1.1 2003/08/17 23:05:05 vapier Exp $
+
+inherit games flag-o-matic gcc eutils
+
+TARGET=${PN}
+
+DESCRIPTION="Multiple Arcade Machine Emulator for X11"
+SRC_URI="http://x.mame.net/download/xmame-${PV}.tar.bz2"
+HOMEPAGE="http://x.mame.net/"
+
+LICENSE="xmame"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha"
+IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick"
+
+DEPEND="sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	alsa? ( media-libs/alsa-lib )
+	xv? ( >=x11-base/xfree-4.1.0 )
+	dga? ( >=x11-base/xfree-4.1.0 )
+	esd? ( >=media-sound/esound-0.2.29 )
+	svga? ( media-libs/svgalib )
+	ggi? ( media-libs/libggi )
+	arts? ( kde-base/arts )
+	x86? ( dev-lang/nasm )"
+
+S=${WORKDIR}/xmame-${PV}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}-glx-fix.patch
+
+	[ ${ARCH} == "x86" ] && sed -i -e '/X86_ASM_68000 =/s:#::' -e '/X86_MIPS3_DRC =/s:#::' Makefile
+	[ ${ARCH} == "ppc" ] && sed -i '/^MY_CPU/s:i386:risc:' Makefile
+	[ ${ARCH} == "sparc" ] && sed -i '/^MY_CPU/s:i386:risc:' Makefile
+	[ ${ARCH} == "alpha" ] && sed -i '/^MY_CPU/s:i386:alpha:' Makefile
+	[ ${ARCH} == "mips" ] && sed -i '/^MY_CPU/s:i386:mips:' Makefile
+
+	[ ${ARCH} == "x86" ] && [ `use joystick` ] && sed -i '/JOY_I386.*=/s:#::' Makefile
+
+	[ `use esd` ] && sed -i '/SOUND_ESOUND/s:#::' Makefile
+	[ `use alsa` ] && sed -i '/SOUND_ALSA/s:#::' Makefile
+	[ `use arts` ] && sed -i '/SOUND_ARTS/s:#::' Makefile
+	[ `use sdl` ] && sed -i '/SOUND_SDL/s:#::' Makefile
+
+	if [ `use dga` ] ; then
+		sed -i '/X11_DGA/s:#::' Makefile
+		[ `use 3dfx` ] && sed -i '/TDFX_DGA_WORKAROUND/s:#::' Makefile
+	fi
+
+	[ `use xv` ] && sed -i '/X11_XV/s:#::' Makefile
+
+	sed -i \
+		-e "/^PREFIX/s:=.*:=/usr:" \
+		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
+		-e "/^XMAMEROOT/s:=.*:=${GAMES_DATADIR}/${TARGET}:" \
+		-e "/^TARGET/s:mame:${TARGET:1}:" \
+		Makefile
+
+	case ${ARCH} in
+		x86)	append-flags -Wno-unused -fomit-frame-pointer -fstrict-aliasing -fstrength-reduce -ffast-math
+			[ `gcc-major-version` -eq 3 ] \
+				&& append-flags -falign-functions=2 -falign-jumps=2 -falign-loops=2 \
+				|| append-flags -malign-functions=2 -malign-jumps=2 -malign-loops=2
+			;;
+		ppc)	append-flags -Wno-unused -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char
+			;;
+	esac
+	sed -i "s:^CFLAGS =:CFLAGS=${CFLAGS}:" Makefile
+}
+
+src_compile() {
+	[ ! -z "`use X``use dga``use xv`" ] && { make DISPLAY_METHOD=x11 || die; }
+	[ `use sdl` ] && { make DISPLAY_METHOD=SDL || die; }
+	[ `use svga` ] && { make DISPLAY_METHOD=svgalib || die; }
+	[ `use ggi` ] && { make DISPLAY_METHOD=ggi || die; }
+	[ `use opengl` ] && { make DISPLAY_METHOD=xgl || die; }
+}
+
+src_install() {
+	sed -i \
+		-e "s:^PREFIX.*:PREFIX=${D}/usr:" \
+		-e "s:^BINDIR.*:BINDIR=${D}/${GAMES_BINDIR}:" \
+		-e "s:^XMAMEROOT.*:XMAMEROOT=${D}/${GAMES_DATADIR}/${TARGET}:" \
+		Makefile
+
+	[ ! -z "`use X``use dga``use xv`" ]	&& { make DISPLAY_METHOD=x11 install || die; }
+	[ `use sdl` ]				&& { make DISPLAY_METHOD=SDL install || die; }
+	[ `use svga` ]				&& { make DISPLAY_METHOD=svgalib install || die; }
+	[ `use ggi` ]				&& { make DISPLAY_METHOD=ggi install || die; }
+	[ `use opengl` ]			&& { make DISPLAY_METHOD=xgl install || die; }
+
+	dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo
+	dohtml -r doc/*
+
+	if [ `use opengl` ] ; then
+		dosym ${TARGET}.xgl ${GAMES_BINDIR}/${TARGET}
+	elif [ ! -z "`use X``use dga``use xv`" ] ; then
+		dosym ${TARGET}.x11 ${GAMES_BINDIR}/${TARGET}
+	elif [ `use sdl` ] ; then
+		dosym ${TARGET}.SDL ${GAMES_BINDIR}/${TARGET}
+	elif [ `use svga` ] ; then
+		dosym ${TARGET}.svgalib ${GAMES_BINDIR}/${TARGET}
+	elif [ `use ggi` ] ; then
+		dosym ${TARGET}.ggi ${GAMES_BINDIR}/${TARGET}
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "Your available MAME binaries are:"
+	[ ! -z "`use X``use dga``use xv`" ] && einfo " ${TARGET}.x11"
+	[ `use sdl` ] && einfo " ${TARGET}.SDL"
+	[ `use svga` ] && einfo " ${TARGET}.svgalib"
+	[ `use ggi` ] && einfo " ${TARGET}.ggi"
+	[ `use opengl` ] && einfo " ${TARGET}.xgl"
+}