Marked stable on x86 and amd64, removing old versions.

(Portage version: 2.0.51.22-r1)

4 files changed, 12 insertions, 110 deletions

diff --git a/games-fps/doom3/ChangeLog b/games-fps/doom3/ChangeLog
index 8d3ded7734f2..8ac8ee720558 100644
--- a/games-fps/doom3/ChangeLog
+++ b/games-fps/doom3/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2005/05/27 15:51:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.14 2005/07/01 00:13:25 wolf31o2 Exp $
+
+  01 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -doom3-1.1.1286.ebuild, doom3-1.3.1302.ebuild:
+  Marked stable on x86 and amd64, removing old versions.
 
   27 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> doom3-1.3.1302.ebuild:
   Added icon download and closing bug #94186.
diff --git a/games-fps/doom3/doom3-1.1.1286.ebuild b/games-fps/doom3/doom3-1.1.1286.ebuild
deleted file mode 100644
index 1381d4551bd0..000000000000
--- a/games-fps/doom3/doom3-1.1.1286.ebuild
+++ /dev/null
@@ -1,101 +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.1.1286.ebuild,v 1.4 2005/06/29 00:35:11 vapier 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/3dgamers/games/${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"
-
-LICENSE="DOOM3"
-SLOT="0"
-KEYWORDS="-* x86 amd64"
-IUSE="nocd 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
-	use nocd && 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 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}/base
-	doins base/* || die "doins base"
-	if use nocd; 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}
-	games_make_wrapper doom3-ded ./doomded.x86 ${dir}
-
-	use nocd && find ${Ddir} -exec touch '{}' \;
-
-	insinto /usr/share/pixmaps
-	doins doom3.png
-
-	prepgamesdirs
-	make_desktop_entry doom3 "Doom III" doom3.png
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if use nocd; 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 play the game run:"
-		einfo " doom3"
-	fi
-}
diff --git a/games-fps/doom3/doom3-1.3.1302.ebuild b/games-fps/doom3/doom3-1.3.1302.ebuild
index 26925eeec064..8fec37bdd7b1 100644
--- a/games-fps/doom3/doom3-1.3.1302.ebuild
+++ b/games-fps/doom3/doom3-1.3.1302.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.ebuild,v 1.6 2005/06/29 00:35:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1302.ebuild,v 1.7 2005/07/01 00:13:25 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://3dgamers/3dgamers/games/${PN}/${PN}-linux-${PV}.x86.run
 
 LICENSE="DOOM3"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-IUSE="nocd alsa opengl dedicated"
+KEYWORDS="-* x86 amd64"
+IUSE="cdinstall alsa opengl dedicated"
 RESTRICT="nostrip"
 
 DEPEND="app-arch/bzip2
@@ -31,7 +31,7 @@ Ddir=${D}/${dir}
 
 pkg_setup() {
 	check_license
-	use nocd && cdrom_get_cds Setup/Data/base/pak002.pk4 \
+	use cdinstall && cdrom_get_cds Setup/Data/base/pak002.pk4 \
 		Setup/Data/base/pak000.pk4 \
 		 Setup/Data/base/pak003.pk4
 	games_pkg_setup
@@ -63,7 +63,7 @@ src_install() {
 	doins d3xp/* || die "doins d3xp"
 	insinto ${dir}/base
 	doins base/* || die "doins base"
-	if use nocd; then
+	if use cdinstall; then
 		einfo "Copying files from Disk 1..."
 		doins ${CDROM_ROOT}/Setup/Data/base/pak002.pk4 \
 			|| die "copying pak002"
@@ -80,7 +80,7 @@ src_install() {
 	games_make_wrapper doom3 ./doom.x86 ${dir}
 	games_make_wrapper doom3-ded ./doomded.x86 ${dir}
 
-	use nocd && find ${Ddir} -exec touch '{}' \;
+	use cdinstall && find ${Ddir} -exec touch '{}' \;
 
 	doicon ${DISTDIR}/doom3.png || die "Copying icon"
 
@@ -91,7 +91,7 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 
-	if use nocd; then
+	if use cdinstall; then
 		einfo "To play the game run:"
 		einfo " doom3"
 	else
diff --git a/games-fps/doom3/files/digest-doom3-1.1.1286 b/games-fps/doom3/files/digest-doom3-1.1.1286
deleted file mode 100644
index 0e8174783692..000000000000
--- a/games-fps/doom3/files/digest-doom3-1.1.1286
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2a45d0769b39473887c61a11cbba981c doom3-linux-1.1.1286.x86.run 7941364