Added dependencies for amd64, marking stable on x86/amd64, and removing older versions.

(Portage version: 2.1_pre1)

4 files changed, 11 insertions, 114 deletions

diff --git a/games-fps/doom3/ChangeLog b/games-fps/doom3/ChangeLog
index e3a2ae3b2420..5e96b966ad9c 100644
--- a/games-fps/doom3/ChangeLog
+++ b/games-fps/doom3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/doom3
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.20 2005/10/26 23:07:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.21 2005/12/30 15:55:40 wolf31o2 Exp $
+
+  30 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -doom3-1.3.1302.ebuild, doom3-1.3.1302-r1.ebuild:
+  Added dependencies for amd64, marking stable on x86/amd64, and removing
+  older versions.
 
   26 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   doom3-1.3.1302-r1.ebuild:
diff --git a/games-fps/doom3/doom3-1.3.1302-r1.ebuild b/games-fps/doom3/doom3-1.3.1302-r1.ebuild
index 2d3d3eba74e9..e8725e3b6a63 100644
--- a/games-fps/doom3/doom3-1.3.1302-r1.ebuild
+++ b/games-fps/doom3/doom3-1.3.1302-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1302-r1.ebuild,v 1.3 2005/10/26 23:07:18 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1302-r1.ebuild,v 1.4 2005/12/30 15:55:40 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://3dgamers/${PN}/${PN}-linux-${PV}.x86.run
 
 LICENSE="DOOM3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="cdinstall alsa opengl dedicated"
 RESTRICT="nostrip"
 
@@ -23,7 +23,9 @@ RDEPEND="sys-libs/glibc
 	opengl? ( virtual/opengl )
 	dedicated? ( app-misc/screen )
 	alsa? ( >=media-libs/alsa-lib-1.0.6 )
-	cdinstall? ( games-fps/doom3-data )"
+	cdinstall? ( games-fps/doom3-data )
+	amd64? ( app-emulation/emul-linux-x86-xlibs
+		app-emulation/emul-linux-x86-soundlibs )"
 
 S=${WORKDIR}
 
diff --git a/games-fps/doom3/doom3-1.3.1302.ebuild b/games-fps/doom3/doom3-1.3.1302.ebuild
deleted file mode 100644
index 8cf34470995e..000000000000
--- a/games-fps/doom3/doom3-1.3.1302.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1302.ebuild,v 1.10 2005/10/21 17:29:42 wolf31o2 Exp $
-
-inherit eutils games
-
-DESCRIPTION="Doom III - 3rd installment of the classic id 3D first-person shooter"
-HOMEPAGE="http://www.doom3.com/"
-SRC_URI="mirror://3dgamers/${PN}/${PN}-linux-${PV}.x86.run
-	ftp://ftp.idsoftware.com/idstuff/${PN}/linux/${PN}-linux-${PV}.x86.run
-	ftp://dl.xs4all.nl/pub/mirror/idsoftware/idstuff/${PN}/linux/${PN}-linux-${PV}.x86.run
-	http://zerowing.idsoftware.com/linux/doom3.png"
-
-LICENSE="DOOM3"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-IUSE="cdinstall alsa opengl dedicated"
-RESTRICT="nostrip"
-
-DEPEND="app-arch/bzip2
-	app-arch/tar"
-RDEPEND="sys-libs/glibc
-	opengl? ( virtual/opengl )
-	dedicated? ( app-misc/screen )
-	alsa? ( >=media-libs/alsa-lib-1.0.6 )"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	check_license DOOM3
-	use cdinstall && cdrom_get_cds Setup/Data/base/pak002.pk4 \
-		Setup/Data/base/pak000.pk4 \
-		 Setup/Data/base/pak003.pk4
-	games_pkg_setup
-}
-
-src_unpack() {
-	unpack_makeself ${PN}-linux-${PV}.x86.run
-}
-
-src_install() {
-	dodir ${dir}
-
-	insinto ${dir}
-	doins License.txt CHANGES README version.info doom3.png
-	exeinto ${dir}
-	doexe libgcc_s.so.1 libstdc++.so.5 || die "doexe libs"
-	doexe openurl.sh || die "openurl.sh"
-	if use x86; then
-		doexe bin/Linux/x86/doom{,ded}.x86 || die "doexe x86 exes"
-	elif use amd64; then
-		doexe bin/Linux/amd64/doom{,ded}.x86 || die "doexe amd64 exes"
-	else
-		die "Cannot copy executables!"
-	fi
-
-	insinto ${dir}/pb
-	doins pb/* || die "doins pb"
-	insinto ${dir}/d3xp
-	doins d3xp/* || die "doins d3xp"
-	insinto ${dir}/base
-	doins base/* || die "doins base"
-	if use cdinstall; then
-		einfo "Copying files from Disk 1..."
-		doins ${CDROM_ROOT}/Setup/Data/base/pak002.pk4 \
-			|| die "copying pak002"
-		cdrom_load_next_cd
-		einfo "Copying files from Disk 2..."
-		doins ${CDROM_ROOT}/Setup/Data/base/pak00* \
-			|| die "copying pak000 and pak001"
-		cdrom_load_next_cd
-		einfo "Copying files from Disk 3..."
-		doins ${CDROM_ROOT}/Setup/Data/base/pak00* \
-			|| die "copying pak003 and pak004"
-	fi
-
-	games_make_wrapper doom3 ./doom.x86 "${dir}" "${dir}"
-	games_make_wrapper doom3-ded ./doomded.x86 ${dir}
-
-	use cdinstall && find ${Ddir} -exec touch '{}' \;
-
-	doicon ${DISTDIR}/doom3.png || die "Copying icon"
-
-	prepgamesdirs
-	make_desktop_entry doom3 "Doom III" doom3.png
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if use cdinstall; then
-		einfo "To play the game run:"
-		einfo " doom3"
-	else
-		einfo "You need to copy pak000.pk4, pak001.pk4, pak002.pk4, pak003.pk4, and"
-		einfo "pak004.pk4 from either your installation media or your hard drive to"
-		einfo "${dir}/base before running the game."
-		echo
-		einfo "To use the Ressurection of Evil expansion pack, you also need to copy"
-		einfo "pak000.pk4 to ${dir}/d3xp before running the game."
-		echo
-		einfo "To play the game run:"
-		einfo " doom3"
-	fi
-}
diff --git a/games-fps/doom3/files/digest-doom3-1.3.1302 b/games-fps/doom3/files/digest-doom3-1.3.1302
deleted file mode 100644
index 244d9de7aeb1..000000000000
--- a/games-fps/doom3/files/digest-doom3-1.3.1302
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b1d04da2d64bb8d54f64cbaa2fdb4490 doom3-linux-1.3.1302.x86.run 17199582
-MD5 f99eb141eecc4b9dd188d6819d741546 doom3.png 6502