Removed references to nvidia-glx since it is no longer in the tree, stable -r2 on amd64/x86, and removed -r1.

(Portage version: 2.1.2_pre2-r1)
 (Signed Manifest commit)

3 files changed, 18 insertions, 105 deletions

diff --git a/games-fps/doom3/Manifest b/games-fps/doom3/Manifest
index 6ae39a2302c3..5a8a3b3c0cfa 100644
--- a/games-fps/doom3/Manifest
+++ b/games-fps/doom3/Manifest
@@ -1,24 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST doom3-linux-1.3.1302.x86.run 17199582 RMD160 eccd25b0f9e1eb5810d981fdb3ffd7119d08e040 SHA1 c8ee8aaac7452db55a2d35064795fb4c09d8f910 SHA256 da90ba338eadb298a736af8786c0d7b11be698a399ac7a20549de0926a434677
 DIST doom3.png 6502 RMD160 4d8a692621c9bbe6c85f0508ade4c35b06abb46f SHA1 815c92ded2f0a58e44607ee4076aa965abdd1d5b SHA256 c9a701498a7b0f923182bf9f11aac8d2193026e509ae3643a5bc118b1a458c6b
-EBUILD doom3-1.3.1302-r1.ebuild 2301 RMD160 66f7064b948a17513741ceee6ed3590f3505f6da SHA1 ff39a776df6e91460d824318090e8ba795d1d2a3 SHA256 2a34eec2de430635e4f618293e79e1297238f20dafca102e6fc60680b03d6e01
-MD5 a45d7b828520b34f24eaa6fb3faeff00 doom3-1.3.1302-r1.ebuild 2301
-RMD160 66f7064b948a17513741ceee6ed3590f3505f6da doom3-1.3.1302-r1.ebuild 2301
-SHA256 2a34eec2de430635e4f618293e79e1297238f20dafca102e6fc60680b03d6e01 doom3-1.3.1302-r1.ebuild 2301
-EBUILD doom3-1.3.1302-r2.ebuild 2628 RMD160 fd767999a28ffee0b37d57061688de791846d358 SHA1 d9d7e47eeb14fc27d4d957b3e4ce914729a245bb SHA256 24c0a792af6bbbd407027d14053c77e01c09aa9f7624bba0865825a509868de8
-MD5 6c6f81282273e6aaa0a9d89663fc9fa6 doom3-1.3.1302-r2.ebuild 2628
-RMD160 fd767999a28ffee0b37d57061688de791846d358 doom3-1.3.1302-r2.ebuild 2628
-SHA256 24c0a792af6bbbd407027d14053c77e01c09aa9f7624bba0865825a509868de8 doom3-1.3.1302-r2.ebuild 2628
-MISC ChangeLog 4432 RMD160 6d0d74b65fca40a763c96d2a34cba27e1eeb7ff7 SHA1 5f92a90a151bd3dd5ea88b79cb0ddfb849009107 SHA256 9d4b27758aa3867e4766a3816263c7a3ea8ba68934536f4a16d87e889fa62a0e
-MD5 918dfa36bbd3d84840e3323050052acc ChangeLog 4432
-RMD160 6d0d74b65fca40a763c96d2a34cba27e1eeb7ff7 ChangeLog 4432
-SHA256 9d4b27758aa3867e4766a3816263c7a3ea8ba68934536f4a16d87e889fa62a0e ChangeLog 4432
+EBUILD doom3-1.3.1302-r2.ebuild 2586 RMD160 4f95db569f27f9e9d0050e4c2913f481688beaa1 SHA1 9df609b203affa7de4c3952ecdfc111da2a45663 SHA256 07d5ea3d5f84d7950a8ebf4df9611fff60724ad8b3bcaaebeafa6e7e1710d6f8
+MD5 398f6db91c272b07ffedf7b681184192 doom3-1.3.1302-r2.ebuild 2586
+RMD160 4f95db569f27f9e9d0050e4c2913f481688beaa1 doom3-1.3.1302-r2.ebuild 2586
+SHA256 07d5ea3d5f84d7950a8ebf4df9611fff60724ad8b3bcaaebeafa6e7e1710d6f8 doom3-1.3.1302-r2.ebuild 2586
+MISC ChangeLog 4656 RMD160 e98c0371fcd93295d9b6572a9975d7be966eb4ca SHA1 a200698691e3a5941f1d8bd230a945d8b78dc637 SHA256 0e2ab8a738f425b8437b64320786c672a54de243c0db1793dc469a4d5b12ac5e
+MD5 0019cec09b74c79009473397d7ceb1d8 ChangeLog 4656
+RMD160 e98c0371fcd93295d9b6572a9975d7be966eb4ca ChangeLog 4656
+SHA256 0e2ab8a738f425b8437b64320786c672a54de243c0db1793dc469a4d5b12ac5e ChangeLog 4656
 MISC metadata.xml 617 RMD160 65cc9363737fadc0b31331b5251e1ad25a457ff6 SHA1 51f2c24e823c68ac3bc44db3a866c8c8d75f5908 SHA256 dd6c5d0057c8014886d088cbcec2cfadaca0799150977e5ecc3f913311a57665
 MD5 6dc8bb8514d4dce12d192cff1d9ed47f metadata.xml 617
 RMD160 65cc9363737fadc0b31331b5251e1ad25a457ff6 metadata.xml 617
 SHA256 dd6c5d0057c8014886d088cbcec2cfadaca0799150977e5ecc3f913311a57665 metadata.xml 617
-MD5 989e4df8f3c46b60e0ca16e95c8ff4b5 files/digest-doom3-1.3.1302-r1 473
-RMD160 57ad3e5d354c92a25465679575f7cd84527368ca files/digest-doom3-1.3.1302-r1 473
-SHA256 3496958ba80e59b4a398ce0474e334e20b4723c356d9da33c7715f46b65022b9 files/digest-doom3-1.3.1302-r1 473
 MD5 989e4df8f3c46b60e0ca16e95c8ff4b5 files/digest-doom3-1.3.1302-r2 473
 RMD160 57ad3e5d354c92a25465679575f7cd84527368ca files/digest-doom3-1.3.1302-r2 473
 SHA256 3496958ba80e59b4a398ce0474e334e20b4723c356d9da33c7715f46b65022b9 files/digest-doom3-1.3.1302-r2 473
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFJPRWkT4lNIS36YERAmKSAKCpe7cY0BJn7Y2CfwYOd/mhM2UfBgCfXync
+m9lvoVvbcMrHFHlzsfqF/mo=
+=C6T+
+-----END PGP SIGNATURE-----
diff --git a/games-fps/doom3/doom3-1.3.1302-r1.ebuild b/games-fps/doom3/doom3-1.3.1302-r1.ebuild
deleted file mode 100644
index 619f33109d61..000000000000
--- a/games-fps/doom3/doom3-1.3.1302-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2006 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.7 2006/03/31 20:56:02 wolf31o2 Exp $
-
-inherit eutils games
-
-DESCRIPTION="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
-	mirror://idsoftware/${PN}/linux/${PN}-linux-${PV}.x86.run
-	http://zerowing.idsoftware.com/linux/${PN}.png"
-
-LICENSE="DOOM3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="cdinstall alsa dedicated opengl"
-RESTRICT="strip"
-
-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 )
-	cdinstall? ( games-fps/doom3-data )
-	amd64? ( app-emulation/emul-linux-x86-xlibs
-		app-emulation/emul-linux-x86-soundlibs )"
-
-S=${WORKDIR}
-
-GAMES_CHECK_LICENSE="yes"
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unpack_makeself ${PN}-linux-${PV}.x86.run
-}
-
-src_install() {
-	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}"
-	doins -r pb base || die "doins pb base"
-
-	games_make_wrapper doom3 ./doom.x86 "${dir}" "${dir}"
-	use dedicated && \
-		games_make_wrapper doom3-ded ./doomded.x86 "${dir}" "${dir}"
-
-	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 "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
-		if use roe
-		then
-			einfo "To use the Ressurection of Evil expansion pack, you also need to copy"
-			einfo "pak000.pk4 to ${dir}/d3xp before running the game."
-		fi
-	fi
-	echo
-	einfo "To play the game run:"
-	einfo " doom3"
-	echo
-}
diff --git a/games-fps/doom3/files/digest-doom3-1.3.1302-r1 b/games-fps/doom3/files/digest-doom3-1.3.1302-r1
deleted file mode 100644
index bec2a7905e96..000000000000
--- a/games-fps/doom3/files/digest-doom3-1.3.1302-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b1d04da2d64bb8d54f64cbaa2fdb4490 doom3-linux-1.3.1302.x86.run 17199582
-RMD160 eccd25b0f9e1eb5810d981fdb3ffd7119d08e040 doom3-linux-1.3.1302.x86.run 17199582
-SHA256 da90ba338eadb298a736af8786c0d7b11be698a399ac7a20549de0926a434677 doom3-linux-1.3.1302.x86.run 17199582
-MD5 f99eb141eecc4b9dd188d6819d741546 doom3.png 6502
-RMD160 4d8a692621c9bbe6c85f0508ade4c35b06abb46f doom3.png 6502
-SHA256 c9a701498a7b0f923182bf9f11aac8d2193026e509ae3643a5bc118b1a458c6b doom3.png 6502