6 files changed, 93 insertions, 14 deletions
diff --git a/games-fps/doom3-data/ChangeLog b/games-fps/doom3-data/ChangeLog
index e22465ed896d..e66e071f804b 100644
--- a/games-fps/doom3-data/ChangeLog
+++ b/games-fps/doom3-data/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/doom3-data
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-data/ChangeLog,v 1.6 2006/03/23 00:53:56 wolf31o2 Exp $
+
+*doom3-data-1.1.1282-r1 (23 Mar 2006)
+
+  23 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  doom3-data-1.1.1282.ebuild, +doom3-data-1.1.1282-r1.ebuild:
+  Revision bumped to ensure that we aren't installing anything into d3xp, as
+  that is entirely up to games-fps/doom3-roe.
 
   22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   doom3-data-1.1.1282.ebuild:
diff --git a/games-fps/doom3-data/Manifest b/games-fps/doom3-data/Manifest
index 33fb18301852..2c57a16fbed1 100644
--- a/games-fps/doom3-data/Manifest
+++ b/games-fps/doom3-data/Manifest
@@ -1,12 +1,18 @@
-MD5 d03e61e8b02abdd67adba589175c921e ChangeLog 1209
-RMD160 270bd05f1b1571857ec830473029878139259ab9 ChangeLog 1209
-SHA256 32abb7d66509f3904706abcf03b85d765e19b3f3634346b786cde2109da50419 ChangeLog 1209
-MD5 dea2c6e9102a6dc8fdf130bc6fa5cc1c doom3-data-1.1.1282.ebuild 1463
-RMD160 06c64310d0ea325bc169221dde689f2fd59934e8 doom3-data-1.1.1282.ebuild 1463
-SHA256 fe7c6a4fab819dddc627399e6e5a51e94139bf7cad3b147e523d1397aa74d81c doom3-data-1.1.1282.ebuild 1463
+MD5 016572bf52cfce5e18dfbdf845cbdd85 ChangeLog 1488
+RMD160 9039978b7e05b3bcdd5c228868a2969694c3f112 ChangeLog 1488
+SHA256 dc6a23ef7824f2e817a53ddebfa972c71a879a534fcce4bb049518763c0f837a ChangeLog 1488
+MD5 56778cc1fcf507f50ed3316083d69fe9 doom3-data-1.1.1282-r1.ebuild 1379
+RMD160 8e5b35d776816acefad1ac930f5be44ec52d38c4 doom3-data-1.1.1282-r1.ebuild 1379
+SHA256 766902b606ab28aa7ed70be3a705551c88f4492178c7249eba25421db64e79b9 doom3-data-1.1.1282-r1.ebuild 1379
+MD5 a335a3a6fac26b0b0f1f38ddc5e3de49 doom3-data-1.1.1282.ebuild 1376
+RMD160 4e84ad0c9fdf940116e4720b7f49f6eeef6d7c50 doom3-data-1.1.1282.ebuild 1376
+SHA256 ea19ea55eb2f764ad6e92154ec94964b01e9f92f2a71660478d0f938ab493032 doom3-data-1.1.1282.ebuild 1376
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-doom3-data-1.1.1282 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-doom3-data-1.1.1282 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-doom3-data-1.1.1282 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-doom3-data-1.1.1282-r1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-doom3-data-1.1.1282-r1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-doom3-data-1.1.1282-r1 0
 MD5 c0c31e633eaaed2a501119d465d9cf70 metadata.xml 500
 RMD160 59fd98853bbdf70e6596b07fe51bd372eb8187ad metadata.xml 500
 SHA256 d4a8ed939029d8e07483bf73e5f6594ae2b48ef8e2a10df792e255c0d4b037a1 metadata.xml 500
diff --git a/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild b/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
new file mode 100644
index 000000000000..5790d6a8f766
--- /dev/null
+++ b/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
@@ -0,0 +1,59 @@
+# 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-r1.ebuild,v 1.1 2006/03/23 00:53:56 wolf31o2 Exp $
+
+inherit eutils games
+
+DESCRIPTION="Doom III - data portion"
+HOMEPAGE="http://www.doom3.com/"
+SRC_URI=""
+
+LICENSE="DOOM3"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="nostrip"
+
+DEPEND="app-arch/bzip2
+	app-arch/tar"
+RDEPEND="games-fps/doom3"
+
+S=${WORKDIR}
+
+GAMES_CHECK_LICENSE="yes"
+dir=${GAMES_PREFIX_OPT}/doom3
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	games_pkg_setup
+	cdrom_get_cds Setup/Data/base/pak002.pk4 \
+		Setup/Data/base/pak000.pk4 \
+		Setup/Data/base/pak003.pk4
+}
+
+src_install() {
+	insinto "${dir}"/base
+
+	einfo "Copying files from Disk 1..."
+	doins ${CDROM_ROOT}/Setup/Data/base/pak002.pk4 \
+		|| die "copying pak002"
+	cdrom_load_next_cd
+	einfo "Copying files from Disk 2..."
+	doins ${CDROM_ROOT}/Setup/Data/base/pak00{0,1}.pk4 \
+		|| die "copying pak000 and pak001"
+	cdrom_load_next_cd
+	einfo "Copying files from Disk 3..."
+	doins ${CDROM_ROOT}/Setup/Data/base/pak00{3,4}.pk4 \
+		|| die "copying pak003 and pak004"
+
+	find ${Ddir} -exec touch '{}' \;
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	einfo "This is just the data portion of the game.  You will need to emerge"
+	einfo "games-fps/doom3 to play the game."
+	echo
+}
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 323c45bab440..caf1f3332369 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-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.5 2006/03/22 15:12:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-data/doom3-data-1.1.1282.ebuild,v 1.6 2006/03/23 00:53:56 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -11,7 +11,7 @@ SRC_URI=""
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="roe"
+IUSE=""
 RESTRICT="nostrip"
 
 DEPEND="app-arch/bzip2
@@ -45,11 +45,6 @@ src_install() {
 	einfo "Copying files from Disk 3..."
 	doins ${CDROM_ROOT}/Setup/Data/base/pak00{3,4}.pk4 \
 		|| die "copying pak003 and pak004"
-	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-data/files/digest-doom3-data-1.1.1282-r1 b/games-fps/doom3-data/files/digest-doom3-data-1.1.1282-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/games-fps/doom3-data/files/digest-doom3-data-1.1.1282-r1
diff --git a/games-fps/doom3-roe/Manifest b/games-fps/doom3-roe/Manifest
new file mode 100644
index 000000000000..901b8ad38fae
--- /dev/null
+++ b/games-fps/doom3-roe/Manifest
@@ -0,0 +1,12 @@
+MD5 f57f4c5b0a9ed620573217f084ee6386 ChangeLog 417
+RMD160 7d3b16725430c5f8ad0092dd52d5cc45879cf0a2 ChangeLog 417
+SHA256 2ceb88a4818f11f4fae0bef00c8e4831807f358af55fb26b878e2016aee53168 ChangeLog 417
+MD5 d1abbb3022dd8ee9ae18a980db9e15d0 doom3-roe-1.ebuild 1004
+RMD160 426cab4a34f63c85806951841cd51c37dc89bcef doom3-roe-1.ebuild 1004
+SHA256 02a6631be4ef3d68d9b679813adb4805b70beb4ce5c3771313ed90b0412d4666 doom3-roe-1.ebuild 1004
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-doom3-roe-1 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-doom3-roe-1 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-doom3-roe-1 0
+MD5 6dc8bb8514d4dce12d192cff1d9ed47f metadata.xml 617
+RMD160 65cc9363737fadc0b31331b5251e1ad25a457ff6 metadata.xml 617
+SHA256 dd6c5d0057c8014886d088cbcec2cfadaca0799150977e5ecc3f913311a57665 metadata.xml 617