[patch] doom3-1.3.1302-r1.diff

diff.txt (text/plain), 2.47 KB, created by Paul Bredbury on 2006-03-22 15:57:14 UTC

--- /usr/portage/games-fps/doom3/doom3-1.3.1302-r1.ebuild	2006-03-22 15:36:29.000000000 +0000
+++ doom3-1.3.1302-r1.ebuild	2006-03-22 23:19:51.000000000 +0000
@@ -1,6 +1,6 @@
 # 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.6 2006/03/22 15:11:38 wolf31o2 Exp $
+# $Header: $
 
 inherit eutils games
 
@@ -13,16 +13,16 @@
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="cdinstall alsa dedicated opengl roe"
+IUSE="cdinstall alsa opengl roe"
 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 )
 	cdinstall? ( games-fps/doom3-data )
+	roe? ( games-fps/doom3-roe )
 	amd64? ( app-emulation/emul-linux-x86-xlibs
 		app-emulation/emul-linux-x86-soundlibs )"
 
@@ -32,15 +32,6 @@
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
-pkg_setup() {
-	games_pkg_setup
-	if use cdinstall && use roe
-	then
-		built_with_use games-fps/doom3-data roe || \
-			die "You must emerge games-fps/doom3-data with USE=roe"
-	fi
-}
-
 src_unpack() {
 	unpack_makeself ${PN}-linux-${PV}.x86.run
 }
@@ -59,15 +50,8 @@
 		die "Cannot copy executables!"
 	fi
 
-	insinto "${dir}"/pb
-	doins pb/* || die "doins pb"
-	if use roe
-	then
-		insinto "${dir}"/d3xp
-		doins d3xp/* || die "doins d3xp"
-	fi
-	insinto "${dir}"/base
-	doins base/* || die "doins base"
+	insinto "${dir}"
+	doins -r base d3xp pb || die "doins data"
 
 	games_make_wrapper doom3 ./doom.x86 "${dir}" "${dir}"
 	games_make_wrapper doom3-ded ./doomded.x86 "${dir}" "${dir}"
@@ -84,14 +68,17 @@
 	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."
+		einfo "${dir}/base before running the game,"
+		einfo "or 'emerge doom3-data' to install from CD."
 		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
+
+	if ! use roe; then
+		einfo "To use the Resurrection of Evil expansion pack, you need to copy"
+		einfo "pak000.pk4 to ${dir}/d3xp before running the game,"
+		einfo "or 'emerge doom3-roe' to install from CD."
+	fi
+
 	echo
 	einfo "To play the game run:"
 	einfo " doom3"