Added roe USE flag to trigger installation of files for Resurrection of Evil expansion and closing bug #127174.

Package-Manager: portage-2.1_pre6-r3

4 files changed, 42 insertions, 14 deletions

diff --git a/games-fps/doom3-data/ChangeLog b/games-fps/doom3-data/ChangeLog
index 3b59abb3329d..e22465ed896d 100644
--- a/games-fps/doom3-data/ChangeLog
+++ b/games-fps/doom3-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/doom3-data
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-data/ChangeLog,v 1.4 2005/12/30 15:53:37 wolf31o2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-data/ChangeLog,v 1.5 2006/03/22 15:12:04 wolf31o2 Exp $
+
+  22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  doom3-data-1.1.1282.ebuild:
+  Added roe USE flag to trigger installation of files for Resurrection of Evil
+  expansion and closing bug #127174.
 
   30 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   doom3-data-1.1.1282.ebuild:
diff --git a/games-fps/doom3-data/doom3-data-1.1.1282.ebuild b/games-fps/doom3-data/doom3-data-1.1.1282.ebuild
index d9ae63dd930a..323c45bab440 100644
--- a/games-fps/doom3-data/doom3-data-1.1.1282.ebuild
+++ b/games-fps/doom3-data/doom3-data-1.1.1282.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-fps/doom3-data/doom3-data-1.1.1282.ebuild,v 1.4 2005/12/30 15:53:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-data/doom3-data-1.1.1282.ebuild,v 1.5 2006/03/22 15:12:04 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -11,7 +11,7 @@ SRC_URI=""
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE=""
+IUSE="roe"
 RESTRICT="nostrip"
 
 DEPEND="app-arch/bzip2
@@ -45,8 +45,11 @@ src_install() {
 	einfo "Copying files from Disk 3..."
 	doins ${CDROM_ROOT}/Setup/Data/base/pak00{3,4}.pk4 \
 		|| die "copying pak003 and pak004"
-	dodir ${dir}/d3xp
-	cp ${Ddir}/base/pak000.pk4 ${Ddir}/d3xp
+	if use roe
+	then
+		dodir ${dir}/d3xp
+		cp ${Ddir}/base/pak000.pk4 ${Ddir}/d3xp
+	fi
 
 	find ${Ddir} -exec touch '{}' \;
 
diff --git a/games-fps/doom3/ChangeLog b/games-fps/doom3/ChangeLog
index 6fe2879e53e4..3cd905d1df67 100644
--- a/games-fps/doom3/ChangeLog
+++ b/games-fps/doom3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/doom3
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.22 2006/03/15 22:25:06 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.23 2006/03/22 15:11:38 wolf31o2 Exp $
+
+  22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  doom3-1.3.1302-r1.ebuild:
+  Added roe USE flag to trigger installation of files for Resurrection of Evil
+  expansion and closing bug #127174.
 
   15 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   doom3-1.3.1302-r1.ebuild:
diff --git a/games-fps/doom3/doom3-1.3.1302-r1.ebuild b/games-fps/doom3/doom3-1.3.1302-r1.ebuild
index c9ea37fe39d9..01be15609d5e 100644
--- a/games-fps/doom3/doom3-1.3.1302-r1.ebuild
+++ b/games-fps/doom3/doom3-1.3.1302-r1.ebuild
@@ -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.5 2006/03/15 22:25:06 wolf31o2 Exp $
+# $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 $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://3dgamers/${PN}/${PN}-linux-${PV}.x86.run
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="cdinstall alsa opengl dedicated"
+IUSE="cdinstall alsa dedicated opengl roe"
 RESTRICT="nostrip"
 
 DEPEND="app-arch/bzip2
@@ -32,6 +32,15 @@ GAMES_CHECK_LICENSE="yes"
 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
 }
@@ -52,8 +61,11 @@ src_install() {
 
 	insinto "${dir}"/pb
 	doins pb/* || die "doins pb"
-	insinto "${dir}"/d3xp
-	doins d3xp/* || die "doins d3xp"
+	if use roe
+	then
+		insinto "${dir}"/d3xp
+		doins d3xp/* || die "doins d3xp"
+	fi
 	insinto "${dir}"/base
 	doins base/* || die "doins base"
 
@@ -74,8 +86,11 @@ pkg_postinst() {
 		einfo "pak004.pk4 from either your installation media or your hard drive to"
 		einfo "${dir}/base before running the game."
 		echo
-		einfo "To use the Ressurection of Evil expansion pack, you also need to copy"
-		einfo "pak000.pk4 to ${dir}/d3xp before running the game."
+		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:"