4 files changed, 28 insertions, 13 deletions
diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index ca320ab4f094..9f3186910ca8 100644
--- a/games-fps/prboom/ChangeLog
+++ b/games-fps/prboom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/prboom
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.6 2004/06/24 22:42:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.7 2004/07/21 02:44:37 vapier Exp $
+
+*prboom-2.2.4-r1 (20 Jul 2004)
+
+  20 Jul 2004; Mike Frysinger <vapier@gentoo.org> +prboom-2.2.4-r1.ebuild,
+  -prboom-2.2.4.ebuild:
+  Version bump to support new doom-data dir.
 
   01 Jun 2004; Mike Frysinger <vapier@gentoo.org> +files/2.2.4-gcc34.patch,
   prboom-2.2.4.ebuild:
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index ad4ceff101b1..e079568733b5 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -1,7 +1,17 @@
-MD5 b349cdb5bd69cc2461f36db0af863834 ChangeLog 1013
-MD5 fe8e16ee64300cf68e3f6bc5e66f869c prboom-2.2.4.ebuild 1528
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a07b925514ea1d6d4516ffc0b1be1e07 ChangeLog 1188
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 a19bdd9832c7bc9f643ade48d0618399 prboom-2.2.4-r1.ebuild 1552
+MD5 6baf3ffdd34dfe4b85618dd603616a80 files/2.2.4-nvidia-test.c 90
 MD5 d8fff22fba51330be33cc8905f81d425 files/2.2.4-nvidia.patch 1761
-MD5 a63cc1470d89d188e3a667a1ddb12370 files/digest-prboom-2.2.4 123
 MD5 e3d9b24d0bbddd7177cdc13ec010c225 files/2.2.4-gcc34.patch 629
-MD5 6baf3ffdd34dfe4b85618dd603616a80 files/2.2.4-nvidia-test.c 90
+MD5 1f849cf0b94a12ff9f846fc538f27b83 files/digest-prboom-2.2.4-r1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA/dijHTu7gpaalycRAqzuAJ9PI4aGA9pMI+T/mjDLdbASqq1KlQCg6jAL
+HyPXZLaoP2uCx027AdStVi0=
+=dlzJ
+-----END PGP SIGNATURE-----
diff --git a/games-fps/prboom/files/digest-prboom-2.2.4 b/games-fps/prboom/files/digest-prboom-2.2.4-r1
index 3940354db5c7..c9a016540d2e 100644
--- a/games-fps/prboom/files/digest-prboom-2.2.4
+++ b/games-fps/prboom/files/digest-prboom-2.2.4-r1
@@ -1,2 +1 @@
 MD5 a7cd473d5b6bb69f815bf156b93aeacc prboom-2.2.4.tar.gz 1001103
-MD5 66851d7cecbc7845d612e7073c1355ad doom1.wad.gz 1765820
diff --git a/games-fps/prboom/prboom-2.2.4.ebuild b/games-fps/prboom/prboom-2.2.4-r1.ebuild
index 8312b7378add..1841b90c1f2a 100644
--- a/games-fps/prboom/prboom-2.2.4.ebuild
+++ b/games-fps/prboom/prboom-2.2.4-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.2.4.ebuild,v 1.7 2004/06/24 22:42:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.2.4-r1.ebuild,v 1.1 2004/07/21 02:44:37 vapier Exp $
 
 inherit games eutils gcc
 
 DESCRIPTION="Port of ID's doom to SDL and OpenGL"
 HOMEPAGE="http://prboom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/prboom/${P}.tar.gz
-	http://www.lbjhs.net/~jessh/lsdldoom/doom1.wad.gz"
+SRC_URI="mirror://sourceforge/prboom/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -41,16 +40,17 @@ src_compile() {
 		`use_enable x86 i386-asm` \
 		--disable-cpu-opt \
 		|| die
-	# configure script doesnt do opengl properly
+	# configure script screws up a few things
+	sed -i "/DOOMWADDIR/s:\".*\":\"${GAMES_DATADIR}/doom-data\":" config.h
 	use opengl || sed -i '/GL_DOOM/s:.*::' config.h
 	emake || die
 }
 
 src_install() {
-	dogamesbin src/prboom{,-game-server}
+	dogamesbin src/prboom{,-game-server} || die
 
-	insinto ${GAMES_DATADIR}/doom/
-	doins ../doom1.wad data/*.wad
+	insinto ${GAMES_DATADIR}/doom-data
+	doins data/*.wad || die
 
 	doman doc/*.{5,6}
 	dodoc AUTHORS ChangeLog NEWS README TODO doc/README.* doc/*.txt