ver bump #33889

6 files changed, 212 insertions, 133 deletions

diff --git a/games-emulation/xmame/ChangeLog b/games-emulation/xmame/ChangeLog
index e19a4f9e3eb5..d26ee98c305f 100644
--- a/games-emulation/xmame/ChangeLog
+++ b/games-emulation/xmame/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/xmame
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.8 2003/11/13 22:56:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/ChangeLog,v 1.9 2003/11/30 05:46:16 vapier Exp $
+
+*xmame-0.77.1 (30 Nov 2003)
+
+  30 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #33889.
+
+*xmame-0.76.1 (25 Oct 2003)
 
   13 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> xmame-0.76.1.ebuild:
   xmame Makefiles don't like parallel make.  use -j1 to compile.
@@ -13,8 +20,6 @@
   add icc USE support (bug 31769); DEPEND on sed >= 4 for -i; add more error
   checking and error messages
 
-*xmame-0.76.1 (25 Oct 2003)
-
   25 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bump #Bug 31992.
 
diff --git a/games-emulation/xmame/files/0.74.1-glx-fix.patch b/games-emulation/xmame/files/0.77.1-glx-fix.patch
index 20d29a9d0573..20d29a9d0573 100644
--- a/games-emulation/xmame/files/0.74.1-glx-fix.patch
+++ b/games-emulation/xmame/files/0.77.1-glx-fix.patch
diff --git a/games-emulation/xmame/files/digest-xmame-0.74.1-r1 b/games-emulation/xmame/files/digest-xmame-0.74.1-r1
deleted file mode 100644
index 5aeadad071be..000000000000
--- a/games-emulation/xmame/files/digest-xmame-0.74.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94033f0260c83d3b91fdd79fd0855709 xmame-0.74.1.tar.bz2 11344029
diff --git a/games-emulation/xmame/files/digest-xmame-0.77.1 b/games-emulation/xmame/files/digest-xmame-0.77.1
new file mode 100644
index 000000000000..21941bf9b52f
--- /dev/null
+++ b/games-emulation/xmame/files/digest-xmame-0.77.1
@@ -0,0 +1 @@
+MD5 744fdbac27c08cf13ca979a4b4985041 xmame-0.77.1.tar.bz2 12036528
diff --git a/games-emulation/xmame/xmame-0.74.1-r1.ebuild b/games-emulation/xmame/xmame-0.74.1-r1.ebuild
deleted file mode 100644
index 6f2d6baee633..000000000000
--- a/games-emulation/xmame/xmame-0.74.1-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.74.1-r1.ebuild,v 1.1 2003/09/22 15:51:26 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:Xmame:${TARGET}:g" \
-		-e "s:xmame:${TARGET}:g" \
-		doc/*.6
-	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; }
-
-	cp -r ctrlr ${D}/${GAMES_DATADIR}/${PN}/
-	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/games-emulation/xmame/xmame-0.77.1.ebuild b/games-emulation/xmame/xmame-0.77.1.ebuild
new file mode 100644
index 000000000000..f6a6dcd68047
--- /dev/null
+++ b/games-emulation/xmame/xmame-0.77.1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmame/xmame-0.77.1.ebuild,v 1.1 2003/11/30 05:46:16 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 ~ia64 ~amd64"
+IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick icc"
+
+RDEPEND="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 )"
+DEPEND="${RDEPEND}
+	icc? ( dev-lang/icc )
+	x86? ( dev-lang/nasm )
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/xmame-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-glx-fix.patch
+
+	ln -s makefile.unix Makefile
+	case "${ARCH}" in
+	x86|ia64|amd64)
+		sed -i \
+			-e '/X86_ASM_68000 =/s:#::' \
+			-e '/X86_MIPS3_DRC =/s:#::' Makefile || \
+				die "sed Makefile (x86) failed"
+		if  [ `use joystick` ] ; then
+			sed -i \
+				-e '/JOY_I386.*=/s:#::' Makefile || \
+					die "sed Makefile (joystick) failed"
+		fi
+		;;
+	ppc|sparc)
+		sed -i \
+			-e '/^MY_CPU/s:i386:risc:' Makefile || \
+				die "sed Makefile (ppc|sparc) failed"
+		;;
+	alpha)
+		sed -i \
+			-e '/^MY_CPU/s:i386:alpha:' Makefile || \
+				die "sed Makefile (alpha) failed"
+		;;
+	mips)
+		sed -i \
+			-e '/^MY_CPU/s:i386:mips:' Makefile || \
+				die "sed Makefile (mips) failed"
+		;;
+	esac
+
+	if [ `use icc` ] ; then
+		sed -i \
+			-e '/^CC/s:gcc:icc:' Makefile || \
+				die "sed Makefile (icc) failed"
+	fi
+	if [ `use esd` ] ; then
+		sed -i \
+			-e '/SOUND_ESOUND/s:#::' Makefile || \
+				die "sed Makefile (esd) failed"
+	fi
+	if [ `use alsa` ] ; then
+		sed -i \
+			-e '/SOUND_ALSA/s:#::' Makefile || \
+				die "sed Makefile (alsa) failed"
+	fi
+	if [ `use arts` ] ; then
+		sed -i \
+			-e '/SOUND_ARTS/s:#::' Makefile || \
+				die "sed Makefile (arts) failed"
+	fi
+	if [ `use sdl` ] ; then
+		sed -i \
+			-e '/SOUND_SDL/s:#::' Makefile || \
+				die "sed Makefile (sdl) failed"
+	fi
+	if [ `use dga` ] ; then
+		sed -i \
+			-e '/X11_DGA/s:#::' Makefile || \
+				die "sed Makefile (dga) failed"
+		if [ `use 3dfx` ] ; then
+			sed -i \
+				-e '/TDFX_DGA_WORKAROUND/s:#::' Makefile || \
+					die "sed Makefile (dga) failed"
+		fi
+	fi
+
+	if [ `use xv` ] ; then
+		sed -i \
+			-e '/X11_XV/s:#::' Makefile || \
+				die "sed Makefile (xv) failed"
+	fi
+
+	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 \
+		-e "/^PREFIX/s:=.*:=/usr:" \
+		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
+		-e "/^XMAMEROOT/s:=.*:=${GAMES_DATADIR}/${TARGET}:" \
+		-e "/^TARGET/s:mame:${TARGET:1}:" \
+		-e "s:^CFLAGS =:CFLAGS=${CFLAGS}:" Makefile || \
+			die "sed Makefile failed"
+}
+
+src_compile() {
+	[ ! -z "`use X``use dga``use xv`" ] && {
+		emake -j1 DISPLAY_METHOD=x11 || die "emake failed (x11)";
+	}
+	[ `use sdl` ] && {
+		emake -j1 DISPLAY_METHOD=SDL || die "emake failed (SDL)";
+	}
+	[ `use svga` ] && {
+		emake -j1 DISPLAY_METHOD=svgalib || die "emake failed (svgalib)";
+	}
+	[ `use ggi` ] && {
+		emake -j1 DISPLAY_METHOD=ggi || die "emake failed (ggi)";
+	}
+	[ `use opengl` ] && {
+		emake -j1 DISPLAY_METHOD=xgl || die "emake failed (xgl)";
+	}
+}
+
+src_install() {
+	sed -i \
+		-e "s:Xmame:${TARGET}:g" \
+		-e "s:xmame:${TARGET}:g" \
+		doc/*.6
+	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;
+	}
+
+	cp -r ctrlr ${D}/${GAMES_DATADIR}/${PN}/ || \
+		die "cp failed"
+	dodoc doc/{changes.*,*.txt,mame/*,${TARGET}rc.dist} README todo || \
+		die "dodoc failed"
+	dohtml -r doc/* || \
+		die "dohtml failed"
+
+	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 ggi` ]                       && einfo " ${TARGET}.ggi"
+	[ `use svga` ]                      && einfo " ${TARGET}.svgalib"
+	[ `use opengl` ]                    && einfo " ${TARGET}.xgl"
+}