Changed nocd to cdinstall, since it is optional and breaks interactivity.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 16 insertions, 23 deletions

diff --git a/games-action/d2x/ChangeLog b/games-action/d2x/ChangeLog
index 482f42ca09ff..2bb640c76609 100644
--- a/games-action/d2x/ChangeLog
+++ b/games-action/d2x/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/d2x
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.9 2005/01/09 10:48:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/ChangeLog,v 1.10 2005/07/07 13:39:28 wolf31o2 Exp $
+
+  07 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> d2x-0.2.5-r1.ebuild:
+  Changed nocd to cdinstall, since it is optional and breaks interactivity.
 
   09 Jan 2005; Sven Wegener <swegener@gentoo.org> d2x-0.2.5-r1.ebuild:
   Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
diff --git a/games-action/d2x/Manifest b/games-action/d2x/Manifest
index 7fc814731b22..699e0389cf3d 100644
--- a/games-action/d2x/Manifest
+++ b/games-action/d2x/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0a7a398ca1b13c0eccf26c863530145a d2x-0.2.5-r1.ebuild 2617
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 b12ce707e74812859c7ae92c1d007aca ChangeLog 1342
+MD5 abfafce3ebdf03bbcfa5c289391e0986 d2x-0.2.5-r1.ebuild 2649
 MD5 e560b26a3a230cfe16b0871e80234121 d2x-0.2.5.ebuild 1978
-MD5 82ad65f111df1092db5ea9b305885feb ChangeLog 1189
-MD5 b298d324cbce31e8cc4779c765fabc4d files/digest-d2x-0.2.5-r1 123
-MD5 b298d324cbce31e8cc4779c765fabc4d files/digest-d2x-0.2.5 123
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 499b24f4949333a0c04d1177aa3213e5 files/0.2.5-shellscripts.patch 747
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCwexCgIKl8Uu19MoRAjrhAJ9b4b0+yGRIo2B5ax2TZltblwA+TQCaA3d3
-9sYn13uWsa1pF8XCZBzA8hM=
-=xGUl
------END PGP SIGNATURE-----
+MD5 b298d324cbce31e8cc4779c765fabc4d files/digest-d2x-0.2.5 123
+MD5 b298d324cbce31e8cc4779c765fabc4d files/digest-d2x-0.2.5-r1 123
diff --git a/games-action/d2x/d2x-0.2.5-r1.ebuild b/games-action/d2x/d2x-0.2.5-r1.ebuild
index f3a76fa789e5..fd805fbf1be7 100644
--- a/games-action/d2x/d2x-0.2.5-r1.ebuild
+++ b/games-action/d2x/d2x-0.2.5-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-action/d2x/d2x-0.2.5-r1.ebuild,v 1.7 2005/06/29 00:32:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d2x/d2x-0.2.5-r1.ebuild,v 1.8 2005/07/07 13:39:28 wolf31o2 Exp $
 
 inherit flag-o-matic eutils games
 
@@ -8,16 +8,16 @@ DATAFILE="d2shar10"
 DESCRIPTION="Descent 2"
 HOMEPAGE="http://icculus.org/d2x/"
 SRC_URI="http://icculus.org/d2x/src/${P}.tar.gz
-	!nocd? ( http://icculus.org/d2x/data/${DATAFILE}.tar.gz )"
+	!cdinstall? ( http://icculus.org/d2x/data/${DATAFILE}.tar.gz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc x86"
-IUSE="nocd debug opengl ggi svga"
+IUSE="cdinstall debug opengl ggi svga"
 
 RDEPEND="media-libs/libsdl
 	media-libs/sdl-image
-	nocd? ( app-arch/unarj )
+	cdinstall? ( app-arch/unarj )
 	opengl? ( virtual/opengl )
 	ggi? ( media-libs/libggi )
 	svga? ( media-libs/svgalib )"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 pkg_setup() {
 	games_pkg_setup
 
-	if use nocd ; then
+	if use cdinstall ; then
 		if [[ ! -e ${DISTDIR}/descent2.sow ]] ; then
 			cdrom_get_cds d2data
 			if [ -e ${CDROM_ROOT}/d2data/descent2.sow ] ; then
@@ -44,7 +44,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	if use nocd ; then
+	if use cdinstall ; then
 		cd ${WORKDIR}
 		mkdir SOW
 		cd SOW
@@ -89,7 +89,7 @@ src_install() {
 	make install DESTDIR=${D} || die
 	dogamesbin my-bins/*
 	dodir ${GAMES_DATADIR}/${PN}
-	if use nocd ; then
+	if use cdinstall ; then
 		cp -r ${WORKDIR}/SOW/* ${D}/${GAMES_DATADIR}/${PN}/
 	else
 		cp -r ${WORKDIR}/${DATAFILE}/* ${D}/${GAMES_DATADIR}/${PN}/