change USE=cdinstall to USE=nocd

Package-Manager: portage-2.0.51.22-r1

3 files changed, 26 insertions, 16 deletions

diff --git a/games-fps/doom3/Manifest b/games-fps/doom3/Manifest
index 85f65d2b727d..daf36cecbf20 100644
--- a/games-fps/doom3/Manifest
+++ b/games-fps/doom3/Manifest
@@ -1,6 +1,16 @@
-MD5 ae59ad03aa6b5cbf632452e841820274 doom3-1.3.1302.ebuild 3025
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 29d62b233282afe45bbf175124bd32d0 doom3-1.1.1286.ebuild 2709
+MD5 01a1b03def6304c659e05e9c1de70982 doom3-1.3.1302.ebuild 3000
 MD5 7b2d88509d14187743c0e5213e0a3fb3 ChangeLog 2065
+MD5 f6b87af8a18827e4e9d07e95193ef5aa doom3-1.1.1286.ebuild 2684
 MD5 91ee8fec9a0c95f5df1d813212718bfa files/digest-doom3-1.1.1286 74
 MD5 ee418b79762e7a8192014b3288671c9d files/digest-doom3-1.3.1302 127
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCwezogIKl8Uu19MoRArr+AJ9ITIKcI9wReDXDwmmn2Xd8e1fImgCfWG1K
+GGDDWKCtZek3aUx0BK0hi6Q=
+=ihCj
+-----END PGP SIGNATURE-----
diff --git a/games-fps/doom3/doom3-1.1.1286.ebuild b/games-fps/doom3/doom3-1.1.1286.ebuild
index d9e0b5d2df39..1381d4551bd0 100644
--- a/games-fps/doom3/doom3-1.1.1286.ebuild
+++ b/games-fps/doom3/doom3-1.1.1286.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.1.1286.ebuild,v 1.3 2005/04/18 15:20:31 wolf31o2 Exp $
+# $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
 
@@ -13,12 +13,12 @@ SRC_URI="mirror://3dgamers/3dgamers/games/${PN}/${PN}-linux-${PV}.x86.run
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* x86 amd64"
-IUSE="cdinstall alsa opengl dedicated"
+IUSE="nocd alsa opengl dedicated"
 RESTRICT="nostrip"
 
 DEPEND="app-arch/bzip2
 	app-arch/tar"
-RDEPEND="virtual/libc
+RDEPEND="sys-libs/glibc
 	opengl? ( virtual/opengl )
 	dedicated? ( app-misc/screen )
 	alsa? ( >=media-libs/alsa-lib-1.0.6 )"
@@ -30,7 +30,7 @@ Ddir=${D}/${dir}
 
 pkg_setup() {
 	check_license
-	use cdinstall && cdrom_get_cds Setup/Data/base/pak002.pk4 \
+	use nocd && cdrom_get_cds Setup/Data/base/pak002.pk4 \
 		Setup/Data/base/pak000.pk4 \
 		 Setup/Data/base/pak003.pk4
 	games_pkg_setup
@@ -58,7 +58,7 @@ src_install() {
 
 	insinto ${dir}/base
 	doins base/* || die "doins base"
-	if use cdinstall; then
+	if use nocd; then
 		einfo "Copying files from Disk 1..."
 		doins ${CDROM_ROOT}/Setup/Data/base/pak002.pk4 \
 			|| die "copying pak002"
@@ -75,7 +75,7 @@ src_install() {
 	games_make_wrapper doom3 ./doom.x86 ${dir}
 	games_make_wrapper doom3-ded ./doomded.x86 ${dir}
 
-	use cdinstall && find ${Ddir} -exec touch '{}' \;
+	use nocd && find ${Ddir} -exec touch '{}' \;
 
 	insinto /usr/share/pixmaps
 	doins doom3.png
@@ -87,7 +87,7 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 
-	if use cdinstall; then
+	if use nocd; then
 		einfo "To play the game run:"
 		einfo " doom3"
 	else
diff --git a/games-fps/doom3/doom3-1.3.1302.ebuild b/games-fps/doom3/doom3-1.3.1302.ebuild
index 338eb3635daf..26925eeec064 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.5 2005/05/27 15:51:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1302.ebuild,v 1.6 2005/06/29 00:35:11 vapier Exp $
 
 inherit eutils games
 
@@ -14,12 +14,12 @@ SRC_URI="mirror://3dgamers/3dgamers/games/${PN}/${PN}-linux-${PV}.x86.run
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* ~x86 ~amd64"
-IUSE="cdinstall alsa opengl dedicated"
+IUSE="nocd alsa opengl dedicated"
 RESTRICT="nostrip"
 
 DEPEND="app-arch/bzip2
 	app-arch/tar"
-RDEPEND="virtual/libc
+RDEPEND="sys-libs/glibc
 	opengl? ( virtual/opengl )
 	dedicated? ( app-misc/screen )
 	alsa? ( >=media-libs/alsa-lib-1.0.6 )"
@@ -31,7 +31,7 @@ Ddir=${D}/${dir}
 
 pkg_setup() {
 	check_license
-	use cdinstall && cdrom_get_cds Setup/Data/base/pak002.pk4 \
+	use nocd && 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 cdinstall; then
+	if use nocd; 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 cdinstall && find ${Ddir} -exec touch '{}' \;
+	use nocd && find ${Ddir} -exec touch '{}' \;
 
 	doicon ${DISTDIR}/doom3.png || die "Copying icon"
 
@@ -91,7 +91,7 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 
-	if use cdinstall; then
+	if use nocd; then
 		einfo "To play the game run:"
 		einfo " doom3"
 	else