version bump

Package-Manager: portage-2.1_pre7-r3

6 files changed, 142 insertions, 4 deletions

diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index e7b8cb3bcf05..32e03d8d9613 100644
--- a/games-fps/prboom/ChangeLog
+++ b/games-fps/prboom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/prboom
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.13 2006/03/06 22:21:51 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.14 2006/04/03 03:50:58 mr_bones_ Exp $
+
+*prboom-2.4.0 (03 Apr 2006)
+
+  03 Apr 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/2.4.0-nvidia.patch, +files/2.4.0-nvidia-test.c,
+  +prboom-2.4.0.ebuild:
+  version bump
 
 *prboom-2.2.6 (06 Mar 2006)
 
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index cc117adc7dcd..d0ff661f21d2 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -1,6 +1,6 @@
-MD5 99e8b8567f5fdef941721b1bb69c133b ChangeLog 2004
-RMD160 4ef40922426a1b9555ad9b1cb25e59e3a11791a5 ChangeLog 2004
-SHA256 47e8d81acd772a1dc703b5285197b850c8cc075fb2184d0dc16eb699cedfd906 ChangeLog 2004
+MD5 0b44c416aeb20b1f3e9d31ca09915a50 ChangeLog 2188
+RMD160 2cc8077698ef5795d1c3d140753688823ae45183 ChangeLog 2188
+SHA256 c938c5ae765d97f235f99cfb568f94240237550029fbaa1ccd2529b1204f41a7 ChangeLog 2188
 MD5 e3d9b24d0bbddd7177cdc13ec010c225 files/2.2.4-gcc34.patch 629
 RMD160 941aeeda5371d8b711fc91b07972c2316d8e3df4 files/2.2.4-gcc34.patch 629
 SHA256 bc3726ecc1630c5369280085f171a87e529cf969d9596116730228e47c4a51e2 files/2.2.4-gcc34.patch 629
@@ -16,12 +16,21 @@ SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 files/2.
 MD5 d8fff22fba51330be33cc8905f81d425 files/2.2.6-nvidia.patch 1761
 RMD160 8c980004ffca3fc69fdf25301ea629428599b75a files/2.2.6-nvidia.patch 1761
 SHA256 b097c952ea093751448d0082424f09a7ef1d5fefe253dd22ea3d0c5b0f5aa0bc files/2.2.6-nvidia.patch 1761
+MD5 6baf3ffdd34dfe4b85618dd603616a80 files/2.4.0-nvidia-test.c 90
+RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c files/2.4.0-nvidia-test.c 90
+SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 files/2.4.0-nvidia-test.c 90
+MD5 a20d23cae8e179f4d2b3e7d30f55cf2d files/2.4.0-nvidia.patch 1734
+RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 files/2.4.0-nvidia.patch 1734
+SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe files/2.4.0-nvidia.patch 1734
 MD5 092d3523c655f13311d5f6c4b910d083 files/digest-prboom-2.2.4-r1 241
 RMD160 ef4cfff5ca532b62d922bc52be8023b6a3d9aa6d files/digest-prboom-2.2.4-r1 241
 SHA256 0e0628bae3270ae8cff114affa217d9f1fb90ea69b94bd0917198206d1e743fb files/digest-prboom-2.2.4-r1 241
 MD5 49a8a8ab77e503515395b48979e2d70c files/digest-prboom-2.2.6 241
 RMD160 0a2e64f954cbf010eb5fc0c284d44fad74b9d7cb files/digest-prboom-2.2.6 241
 SHA256 6d17b50e52ed78cb24fa3801c53b05f0409207288854bf1a5e189ee00e4ae2a6 files/digest-prboom-2.2.6 241
+MD5 9157f1ea7fdd6967bc708ddaf97efae9 files/digest-prboom-2.4.0 238
+RMD160 55f579c81c0c19bfe62cffe922b46980e7d8bffe files/digest-prboom-2.4.0 238
+SHA256 df1f6b01e8ff3f8e5ff4d48c3faa322134b705d420237d7bd817157ea3a197b2 files/digest-prboom-2.4.0 238
 MD5 ffbfee35e7a2580f5f0cdadcb05132e0 files/prboom.png 4254
 RMD160 a673654eab9d87d34537e3d42c9274245be9e45f files/prboom.png 4254
 SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542 files/prboom.png 4254
@@ -34,3 +43,6 @@ SHA256 11e73ac19169fe5d34f46cf0f27e6aeceae4e102d033728555c9e4d7854de773 prboom-2
 MD5 0b596d22fe8868f4e2a2e127ea1e3395 prboom-2.2.6.ebuild 1777
 RMD160 340870cdb30bb094f07e61b0dd5ff1f5b1cf1468 prboom-2.2.6.ebuild 1777
 SHA256 69ed66b746e009a176fe0d8432a66eda93f815f048c5b6ed529caa8885979a60 prboom-2.2.6.ebuild 1777
+MD5 b95874f2f81d493d1383fccd5059cf60 prboom-2.4.0.ebuild 1770
+RMD160 13dfa376a4f9564252a928cb1d6f0c491c823e22 prboom-2.4.0.ebuild 1770
+SHA256 c303270edbf3e62f8d5204589e8615f313ff924c08c2d7141bdda862146c265f prboom-2.4.0.ebuild 1770
diff --git a/games-fps/prboom/files/2.4.0-nvidia-test.c b/games-fps/prboom/files/2.4.0-nvidia-test.c
new file mode 100644
index 000000000000..f9e4bd700f8a
--- /dev/null
+++ b/games-fps/prboom/files/2.4.0-nvidia-test.c
@@ -0,0 +1,3 @@
+#include <SDL/SDL_opengl.h>
+PFNGLCOLORTABLEEXTPROC glColorTableEXT;
+int main(){return 0;}
diff --git a/games-fps/prboom/files/2.4.0-nvidia.patch b/games-fps/prboom/files/2.4.0-nvidia.patch
new file mode 100644
index 000000000000..2b7aa9b32d46
--- /dev/null
+++ b/games-fps/prboom/files/2.4.0-nvidia.patch
@@ -0,0 +1,48 @@
+--- src/gl_intern.h.orig	2003-09-21 16:39:30.247451624 -0400
++++ src/gl_intern.h	2003-09-21 16:39:41.610724144 -0400
+@@ -84,6 +84,6 @@
+ #define min(a,b) ((a)<(b)?(a):(b))
+ #endif
+ 
+-PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
++//PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
+ 
+ #endif // _GL_INTERN_H
+--- src/gl_main.c.orig	2003-09-21 16:39:55.436622288 -0400
++++ src/gl_main.c	2003-09-21 16:43:00.943420968 -0400
+@@ -285,6 +285,7 @@
+ 
+     if (strcasecmp(extension, "GL_EXT_texture_filter_anisotropic") == 0)
+       gl_texture_filter_anisotropic = true;
++/*
+     else if (strcasecmp(extension, "GL_EXT_paletted_texture") == 0) {
+       if (gl_use_paletted_texture) {
+         gl_paletted_texture = true;
+@@ -304,6 +305,7 @@
+ 	else
+           lprintf(LO_INFO,"using GL_EXT_shared_texture_palette\n",glGetString(GL_VENDOR));
+       }
++*/
+ 
+     extension = p;
+   } while (*extension != '\0');
+@@ -761,7 +763,7 @@
+     pal[transparent_pal_index*4+1]=0;
+     pal[transparent_pal_index*4+2]=0;
+     pal[transparent_pal_index*4+3]=0;
+-    gld_ColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
++//    gld_ColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
+     W_UnlockLumpName("PLAYPAL");
+   } else {
+     if (palette>0)
+--- src/gl_texture.c.orig	2003-09-21 16:43:18.450759448 -0400
++++ src/gl_texture.c	2003-09-21 16:43:39.549551944 -0400
+@@ -178,7 +178,7 @@
+   pal[transparent_pal_index*4+1]=0;
+   pal[transparent_pal_index*4+2]=0;
+   pal[transparent_pal_index*4+3]=0;
+-  gld_ColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
++//  gld_ColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
+   W_UnlockLumpName("PLAYPAL");
+ }
+ 
diff --git a/games-fps/prboom/files/digest-prboom-2.4.0 b/games-fps/prboom/files/digest-prboom-2.4.0
new file mode 100644
index 000000000000..2951c83355a2
--- /dev/null
+++ b/games-fps/prboom/files/digest-prboom-2.4.0
@@ -0,0 +1,3 @@
+MD5 9a17502070119fde2969a595b38a939e prboom-2.4.0.tar.gz 880867
+RMD160 ae8c895e7cb1cd8534b874ad8eb877ea9882b976 prboom-2.4.0.tar.gz 880867
+SHA256 f7834fba92f816d00904d9809c80909b7d0f55986eb85a4bf548f6b77edaddd4 prboom-2.4.0.tar.gz 880867
diff --git a/games-fps/prboom/prboom-2.4.0.ebuild b/games-fps/prboom/prboom-2.4.0.ebuild
new file mode 100644
index 000000000000..5d8b94ff0ec5
--- /dev/null
+++ b/games-fps/prboom/prboom-2.4.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.4.0.ebuild,v 1.1 2006/04/03 03:50:58 mr_bones_ Exp $
+
+inherit eutils toolchain-funcs games
+
+DESCRIPTION="Port of ID's doom to SDL and OpenGL"
+HOMEPAGE="http://prboom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/prboom/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="opengl"
+
+DEPEND=">=media-libs/libsdl-1.1.3
+		media-libs/sdl-mixer
+		media-libs/sdl-net
+		opengl? ( virtual/opengl virtual/glu )
+		media-libs/smpeg"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	ebegin "Detecting NVidia GL/prboom bug"
+	$(tc-getCC) "${FILESDIR}"/${PV}-nvidia-test.c 2> /dev/null
+	local ret=$?
+	eend ${ret} "NVidia GL/prboom bug found ;("
+	[ ${ret} -eq 0 ] || epatch "${FILESDIR}"/${PV}-nvidia.patch
+}
+
+src_compile() {
+	local myconf
+	# configure.in should be fixed as
+	# --enable-gl and 
+	# --disable-gl are threated the same
+	use opengl && myconf="--enable-gl"
+	# leave --disable-cpu-opt in otherwise the configure script
+	# will append -march=i686 and crap ... let the user's CFLAGS
+	# handle this ...
+	egamesconf \
+		${myconf} \
+		$(use_enable x86 i386-asm) \
+		--disable-cpu-opt \
+		|| die
+	# configure script screws up a few things
+	sed -i \
+		-e "/DOOMWADDIR/s:\".*\":\"${GAMES_DATADIR}/doom-data\":" config.h \
+		|| die "sed failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	dogamesbin src/prboom{,-game-server} || die "dogamesbin failed"
+
+	insinto "${GAMES_DATADIR}/doom-data"
+	doins data/*.wad || die "doins failed"
+
+	doman doc/*.{5,6}
+	dodoc AUTHORS NEWS README TODO doc/README.* doc/*.txt
+
+	doicon "${FILESDIR}/${PN}.png"
+	make_desktop_entry ${PN} "PrBoom"
+	prepgamesdirs
+}