Clean up older ebuilds and port 0.83.1 to modular X.

(Portage version: 2.1_pre6-r6)

4 files changed, 33 insertions, 247 deletions

diff --git a/games-emulation/xmess/ChangeLog b/games-emulation/xmess/ChangeLog
index 33fd373e9c27..57929bc2e098 100644
--- a/games-emulation/xmess/ChangeLog
+++ b/games-emulation/xmess/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/xmess
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/ChangeLog,v 1.47 2006/03/23 03:16:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/ChangeLog,v 1.48 2006/03/24 21:47:03 wolf31o2 Exp $
+
+  24 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org> xmess-0.83.1.ebuild,
+  -xmess-0.103.ebuild:
+  Clean up older ebuilds and port 0.83.1 to modular X.
 
 *xmess-0.104 (23 Mar 2006)
 
diff --git a/games-emulation/xmess/files/digest-xmess-0.103 b/games-emulation/xmess/files/digest-xmess-0.103
deleted file mode 100644
index 19a1e651b3a7..000000000000
--- a/games-emulation/xmess/files/digest-xmess-0.103
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06b3c5f38d6e124d6b4d07b292830f03 xmame-0.103.tar.bz2 16122491
diff --git a/games-emulation/xmess/xmess-0.103.ebuild b/games-emulation/xmess/xmess-0.103.ebuild
deleted file mode 100644
index 39ee03a5f59c..000000000000
--- a/games-emulation/xmess/xmess-0.103.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.103.ebuild,v 1.3 2006/01/29 06:20:50 mr_bones_ Exp $
-
-inherit flag-o-matic toolchain-funcs eutils games
-
-TARGET="${PN}"
-
-DESCRIPTION="Multiple Arcade Machine Emulator for X11"
-HOMEPAGE="http://x.mame.net/"
-SRC_URI="http://x.mame.net/download/xmame-${PV}.tar.bz2"
-
-LICENSE="XMAME"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ppc sparc x86"
-IUSE="alsa arts dga esd expat ggi joystick lirc mmx net opengl sdl svga X xinerama xv"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	dga? ( || ( ( x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
-	)
-	esd? ( >=media-sound/esound-0.2.29 )
-	expat? ( dev-libs/expat )
-	ggi? ( media-libs/libggi )
-	lirc? ( app-misc/lirc )
-	opengl? (
-		virtual/opengl
-		virtual/glu )
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	svga? ( media-libs/svgalib )
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
-	xv? ( || ( x11-libs/libXv virtual/x11 ) )
-	X? ( || ( x11-libs/libXext virtual/x11 ) )"
-DEPEND="${RDEPEND}
-	dga? ( || ( ( x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
-	)
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
-	xv? ( || ( x11-proto/videoproto virtual/x11 ) )
-	x86? ( dev-lang/nasm )"
-# Icc sucks. bug #41342
-#	icc? ( dev-lang/icc )
-
-S=${WORKDIR}/xmame-${PV}
-
-toggle_feature() {
-	if use $1 ; then
-		sed -i \
-			-e "/$2.*=/s:#::" Makefile \
-			|| die "sed Makefile ($1 / $2) failed"
-	fi
-}
-
-toggle_feature2() {
-	use $1 && toggle_feature $2 $3
-}
-
-src_unpack() {
-	local mycpu=
-
-	unpack ${A}
-	cd "${S}"
-
-	case ${ARCH} in
-		x86)	mycpu="i386";;
-		ia64)	mycpu="ia64";;
-		amd64)	mycpu="amd64";;
-		ppc)	mycpu="risc";;
-		sparc)	mycpu="risc";;
-		hppa)	mycpu="risc";;
-		alpha)	mycpu="alpha";;
-		mips)	mycpu="mips";;
-	esac
-
-	sed -i \
-		-e '/^BUILD_EXPAT/s/^/#/' \
-		-e "/^PREFIX/s:=.*:=/usr:" \
-		-e "/^MY_CPU/s:i386:${mycpu}:" \
-		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
-		-e "/^MANDIR/s:=.*:=/usr/share/man/man6:" \
-		-e "/^XMAMEROOT/s:=.*:=${GAMES_DATADIR}/${TARGET}:" \
-		-e "/^TARGET/s:mame:${TARGET:1}:" \
-		-e "/^CFLAGS =/d" \
-		-e "/\bCFLAGS +=/d" \
-		Makefile \
-		|| die "sed Makefile failed"
-
-	if use ppc ; then
-		sed -i \
-			-e '/LD.*--relax/s:^# ::' Makefile \
-			|| die "sed Makefile (ppc/LD) failed"
-	fi
-
-	if use mmx ; then
-		cat >> src/unix/effect_asm.asm <<EOF
-		%ifidn __OUTPUT_FORMAT__,elf
-		section .note.GNU-stack noalloc noexec nowrite progbits
-		%endif
-EOF
-	fi
-
-	toggle_feature x86 X86_MIPS3_DRC
-	toggle_feature2 x86 mmx EFFECT_MMX_ASM
-	toggle_feature joystick JOY_STANDARD
-	toggle_feature2 joystick X XINPUT_DEVICES
-	use net && ewarn "Network support is currently (${PV}) broken :("
-	#toggle_feature net XMAME_NET # Broken
-	toggle_feature esd SOUND_ESOUND
-	toggle_feature alsa SOUND_ALSA
-	toggle_feature arts SOUND_ARTS
-	toggle_feature dga X11_DGA
-	toggle_feature xv X11_XV
-	toggle_feature expat BUILD_EXPAT
-	toggle_feature opengl X11_OPENGL
-	toggle_feature lirc LIRC
-	toggle_feature xinerama X11_XINERAMA
-
-	case ${ARCH} in
-		x86|ia64|amd64)
-			append-flags -Wno-unused -fomit-frame-pointer -fstrict-aliasing -fstrength-reduce
-			use amd64 || append-flags -ffast-math #54270
-			[[ $(gcc-major-version) -ge 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
-			;;
-		hppa)
-			append-flags -ffunction-sections
-			;;
-	esac
-
-	sed -i \
-		-e "s:[Xx]mame:${TARGET}:g" \
-		doc/*.6 \
-		|| die "sed man pages failed"
-	# no, we don't want to install setuid (bug #81693)
-	sed -i \
-		-e 's/^doinstallsuid/notforus/' \
-		-e 's/doinstallsuid/doinstall/' \
-		-e '/^QUIET/s:^:#:' src/unix/unix.mak \
-		|| die "sed src/unix/unix.mak failed"
-}
-
-src_compile() {
-	local disp=0
-	if use sdl ; then
-		emake DISPLAY_METHOD=SDL || die "emake failed (SDL)"
-		disp=1
-	fi
-	if use svga ; then
-		emake DISPLAY_METHOD=svgalib || die "emake failed (svgalib)"
-		disp=1
-	fi
-	if use ggi ; then
-		#emake DISPLAY_METHOD=ggi || die "emake failed (ggi)"
-		#disp=1
-		ewarn "GGI support is currently (${PV}) broken :("
-	fi
-	if  [ ${disp} -eq 0 ] || use opengl || use X || use dga || use xv ; then
-		emake DISPLAY_METHOD=x11 || die "emake failed (x11)"
-	fi
-}
-
-src_install() {
-	local disp=0
-
-	sed -i \
-		-e "s:^PREFIX.*:PREFIX=${D}/usr:" \
-		-e "s:^BINDIR.*:BINDIR=${D}/${GAMES_BINDIR}:" \
-		-e "s:^MANDIR.*:MANDIR=${D}/usr/share/man/man6:" \
-		-e "s:^XMAMEROOT.*:XMAMEROOT=${D}/${GAMES_DATADIR}/${TARGET}:" \
-		Makefile \
-		|| die "sed Makefile failed"
-
-	if use sdl ; then
-		make DISPLAY_METHOD=SDL install || die "install failed (sdl)"
-		disp=1
-	fi
-	if use svga ; then
-		make DISPLAY_METHOD=svgalib install || die "install failed (svga)"
-		disp=1
-	fi
-	if use ggi ; then
-		#make DISPLAY_METHOD=ggi install || die "install failed (ggi)"
-		#disp=1
-		ewarn "GGI support is currently (${PV}) broken :("
-	fi
-	if [ ${disp} -eq 0 ] || use opengl || use X || use dga || use xv ; then
-		make DISPLAY_METHOD=x11 install || die "install failed (x11)"
-	fi
-	exeinto "${GAMES_LIBDIR}/${PN}"
-	doexe chdman || die "doexe failed"
-	if [[ ${PN} == "xmame" ]] ; then
-		doexe xml2info || die "doexe failed"
-	fi
-
-	dodir "${GAMES_DATADIR}/${PN}"
-	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"
-
-	# default to sdl since the client is a bit more featureful
-	if use sdl ; then
-		dosym "${TARGET}.SDL" "${GAMES_BINDIR}/${TARGET}"
-	elif [ ${disp} -eq 0 ] || use opengl || use X || use dga || use xv ; then
-		dosym "${TARGET}.x11" "${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: ${TARGET}"
-	if useq opengl || useq X || useq dga || useq xv ; then
-		einfo " ${TARGET}.x11"
-	fi
-	useq sdl    && einfo " ${TARGET}.SDL"
-	#useq ggi    && einfo " ${TARGET}.ggi"
-	useq svga   && einfo " ${TARGET}.svgalib"
-}
diff --git a/games-emulation/xmess/xmess-0.83.1.ebuild b/games-emulation/xmess/xmess-0.83.1.ebuild
index 55b998519f40..6d3f8d42202a 100644
--- a/games-emulation/xmess/xmess-0.83.1.ebuild
+++ b/games-emulation/xmess/xmess-0.83.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.83.1.ebuild,v 1.5 2005/05/30 18:40:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/xmess/xmess-0.83.1.ebuild,v 1.6 2006/03/24 21:47:04 wolf31o2 Exp $
 
 inherit flag-o-matic toolchain-funcs eutils games
 
@@ -16,18 +16,36 @@ KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 IUSE="sdl dga xv alsa esd opengl X 3dfx svga ggi arts joystick net"
 
 RDEPEND="sys-libs/zlib
-	sdl? ( >=media-libs/libsdl-1.2.0 )
 	alsa? ( media-libs/alsa-lib )
-	xv? ( virtual/x11 )
-	dga? ( virtual/x11 )
-	X? ( virtual/x11 )
+	arts? ( kde-base/arts )
+	dga? ( || ( ( x11-libs/libXxf86dga
+				x11-libs/libXxf86vm
+			)
+			virtual/x11
+		)
+	)
 	esd? ( >=media-sound/esound-0.2.29 )
-	svga? ( media-libs/svgalib )
+	expat? ( dev-libs/expat )
 	ggi? ( media-libs/libggi )
-	arts? ( kde-base/arts )"
+	lirc? ( app-misc/lirc )
+	opengl? (
+		virtual/opengl
+		virtual/glu )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	svga? ( media-libs/svgalib )
+	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
+	xv? ( || ( x11-libs/libXv virtual/x11 ) )
+	X? ( || ( x11-libs/libXext virtual/x11 ) )"
 DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	>=sys-apps/sed-4"
+	dga? ( || ( ( x11-proto/xf86dgaproto
+				x11-proto/xf86vidmodeproto
+			)
+			virtual/x11
+		)
+	)
+	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	xv? ( || ( x11-proto/videoproto virtual/x11 ) )
+	x86? ( dev-lang/nasm )"
 # Icc sucks. bug #41342
 #	icc? ( dev-lang/icc )