Added modular X dependencies and removing older revisions.

(Portage version: 2.1_pre3-r1)

4 files changed, 18 insertions, 108 deletions

diff --git a/games-action/descent3/ChangeLog b/games-action/descent3/ChangeLog
index 5f6730f73921..2955bdda3f93 100644
--- a/games-action/descent3/ChangeLog
+++ b/games-action/descent3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/descent3
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/ChangeLog,v 1.14 2005/11/12 16:11:19 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/ChangeLog,v 1.15 2006/01/10 20:08:05 wolf31o2 Exp $
+
+  10 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -descent3-1.4.0b.ebuild, descent3-1.4.0b-r1.ebuild:
+  Added modular X dependencies and removing older revisions.
 
 *descent3-1.4.0b-r1 (12 Nov 2005)
 
diff --git a/games-action/descent3/descent3-1.4.0b-r1.ebuild b/games-action/descent3/descent3-1.4.0b-r1.ebuild
index 34acc36c797a..016aba143504 100644
--- a/games-action/descent3/descent3-1.4.0b-r1.ebuild
+++ b/games-action/descent3/descent3-1.4.0b-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/descent3-1.4.0b-r1.ebuild,v 1.1 2005/11/12 16:11:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/descent3-1.4.0b-r1.ebuild,v 1.2 2006/01/10 20:08:05 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -17,8 +17,14 @@ RESTRICT="nostrip"
 
 DEPEND=""
 RDEPEND="virtual/opengl
-	virtual/x11
-	amd64? ( app-emulation/emul-linux-x86-xlibs
+	x86? (
+		|| (
+			(
+				x11-libs/libX11
+				x11-libs/libXext )
+			virtual/x11 ) )
+	amd64? (
+		app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-compat
 		app-emulation/emul-linux-x86-sdl
 		>=sys-libs/lib-compat-loki-0.2 )"
@@ -103,8 +109,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	games_pkg_postinst
 	einfo "To play the game run:"
 	einfo " descent3"
-
-	games_pkg_postinst
+	echo
 }
diff --git a/games-action/descent3/descent3-1.4.0b.ebuild b/games-action/descent3/descent3-1.4.0b.ebuild
deleted file mode 100644
index f8995200d6a8..000000000000
--- a/games-action/descent3/descent3-1.4.0b.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/descent3/descent3-1.4.0b.ebuild,v 1.13 2005/10/21 17:25:18 wolf31o2 Exp $
-
-inherit eutils games
-
-IUSE="nocd videos"
-DESCRIPTION="Descent 3 - 3-Dimensional indoor/outdoor spaceship combat"
-HOMEPAGE="http://www.lokigames.com/products/descent3/"
-SRC_URI="mirror://lokigames/${PN}/${PN}-1.4.0a-x86.run
-	mirror://lokigames/${PN}/${P}-x86.run"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="x86"
-RESTRICT="nostrip"
-
-DEPEND="games-util/loki_patch"
-RDEPEND="virtual/opengl"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	if use videos ; then
-		ewarn "The installed game takes about 1.2GB of space!"
-		cdrom_get_cds missions/d3.mn3 movies/level1.mve
-	else
-		cdrom_get_cds missions/d3.mn3
-	fi
-	if use nocd ; then
-		ewarn "The installed game takes about 510MB of space!"
-	else
-		ewarn "The installed game takes about 220MB of space!"
-	fi
-	games_pkg_setup
-}
-
-src_unpack() {
-	mkdir -p ${S}/{a,b}
-	cd ${S}/a
-	unpack_makeself ${PN}-1.4.0a-x86.run
-	cd ${S}/b
-	unpack_makeself ${P}-x86.run
-}
-
-src_install() {
-	dodir ${dir}
-	einfo "Copying files... this may take a while..."
-	exeinto ${dir}
-	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/{${PN},nettest} \
-		|| die "copying executables"
-	insinto ${dir}
-	doins ${CDROM_ROOT}/{FAQ.txt,README{,.mercenary},d3.hog,icon.{bmp,xpm}} \
-		|| die "copying files"
-
-	cd ${Ddir}
-	tar xzf ${CDROM_ROOT}/data.tar.gz || die "uncompressing data"
-	tar xzf ${CDROM_ROOT}/shared.tar.gz || die "uncompressing shared"
-
-	if use nocd; then
-		doins -r ${CDROM_ROOT}/missions || die "copying missions"
-	fi
-
-	if use videos ; then
-		cdrom_load_next_cd
-		doins -r ${CDROM_ROOT}/movies || die "copying movies"
-	fi
-
-	cd ${S}/a
-	loki_patch --verify patch.dat
-	loki_patch patch.dat ${Ddir} >& /dev/null || die "patching"
-	cd ${S}/b
-	loki_patch --verify patch.dat
-	loki_patch patch.dat ${Ddir} >& /dev/null || die "patching"
-
-	# now, since these files are coming off a cd, the times/sizes/md5sums wont
-	# be different ... that means portage will try to unmerge some files (!)
-	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find ${Ddir} -exec touch '{}' \;
-
-	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
-	newicon ${CDROM_ROOT}/icon.xpm ${PN}.xpm
-
-	# Fix for 2.6 kernel crash
-	cd ${Ddir}
-	ln -sf ppics.hog PPics.Hog
-
-	prepgamesdirs
-	make_desktop_entry ${PN} "Descent 3" ${PN}
-}
-
-pkg_postinst() {
-	einfo "To play the game run:"
-	einfo " descent3"
-
-	games_pkg_postinst
-}
diff --git a/games-action/descent3/files/digest-descent3-1.4.0b b/games-action/descent3/files/digest-descent3-1.4.0b
deleted file mode 100644
index c805eef5873e..000000000000
--- a/games-action/descent3/files/digest-descent3-1.4.0b
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 252e242e57e15a9afab7d6fd69f562ae descent3-1.4.0a-x86.run 2736956
-MD5 4cfd46f594fa40b2afd575842a197ba1 descent3-1.4.0b-x86.run 4504631