version bump

Package-Manager: portage-2.1.1_pre4-r1

6 files changed, 146 insertions, 5 deletions

diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index d925e6c23480..d91a391bde21 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.20 2006/07/24 20:05:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.21 2006/08/01 04:01:44 mr_bones_ Exp $
+
+*prboom-2.4.4 (01 Aug 2006)
+
+  01 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/2.4.4-nvidia.patch, +files/2.4.4-nvidia-test.c,
+  +prboom-2.4.4.ebuild:
+  version bump
 
 *prboom-2.4.3 (24 Jul 2006)
 
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index 3d6ba34de7fa..3986a27775cb 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -22,12 +22,21 @@ AUX 2.4.3-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1
 MD5 a20d23cae8e179f4d2b3e7d30f55cf2d files/2.4.3-nvidia.patch 1734
 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 files/2.4.3-nvidia.patch 1734
 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe files/2.4.3-nvidia.patch 1734
+AUX 2.4.4-nvidia-test.c 90 RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c SHA1 dc9d0930e6f0ca7826554101e4d54a3405bb6f34 SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185
+MD5 6baf3ffdd34dfe4b85618dd603616a80 files/2.4.4-nvidia-test.c 90
+RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c files/2.4.4-nvidia-test.c 90
+SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 files/2.4.4-nvidia-test.c 90
+AUX 2.4.4-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1 5cd90ca85012d2d1ffb703861dcb9d9ff92b2388 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe
+MD5 a20d23cae8e179f4d2b3e7d30f55cf2d files/2.4.4-nvidia.patch 1734
+RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 files/2.4.4-nvidia.patch 1734
+SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe files/2.4.4-nvidia.patch 1734
 AUX prboom.png 4254 RMD160 a673654eab9d87d34537e3d42c9274245be9e45f SHA1 c8e6a60b76ae93c44c5508ce5cb1308831c474a7 SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542
 MD5 ffbfee35e7a2580f5f0cdadcb05132e0 files/prboom.png 4254
 RMD160 a673654eab9d87d34537e3d42c9274245be9e45f files/prboom.png 4254
 SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542 files/prboom.png 4254
 DIST prboom-2.4.2.tar.gz 928017 RMD160 0390624d76a04b18f6e798ba5972e69c765a5438 SHA1 164dc860acf447823e6ff14d7655fcb8b1279000 SHA256 0f393b65c8ce0fc84b3be8c5d38a516f1e0013f32b2e12a92bcf711e7e03b730
 DIST prboom-2.4.3.tar.gz 947872 RMD160 b8412e8ed1e4ed28165e4862a76923b474776893 SHA1 f2d76fa8925226d7e3a623951413e6a10384f2e9 SHA256 4923cd6de8217b4212eae5cf8d0f8085370b837646a21412124bf0caa29f8dbe
+DIST prboom-2.4.4.tar.gz 961947 RMD160 e85213acc29eb5ff18a69f840185c76f95cdad71 SHA1 adb413ceef595292175ad22521acdfed99733af7 SHA256 1a0b5eb00725e9648bf63475121ae361907983b2fe4ec7a5c580ccebba3ea4bc
 EBUILD prboom-2.4.2.ebuild 1744 RMD160 8c4f45c8df76f281a24dac6bf888cf2371e0a266 SHA1 eb5928c1289f1c9b7c198af0f18d121b1ec2dda8 SHA256 4095f41d0539b2d15c7e87839f07cedaa0052e7967577b7e5eae95c301d6a53c
 MD5 cf741c8f37270d258a573ddfc7c8724d prboom-2.4.2.ebuild 1744
 RMD160 8c4f45c8df76f281a24dac6bf888cf2371e0a266 prboom-2.4.2.ebuild 1744
@@ -36,10 +45,14 @@ EBUILD prboom-2.4.3.ebuild 1744 RMD160 31d26c31bf9bfd9bd791b484ab6680f822dd5937
 MD5 1481a841e144dc86f381975769d6b20f prboom-2.4.3.ebuild 1744
 RMD160 31d26c31bf9bfd9bd791b484ab6680f822dd5937 prboom-2.4.3.ebuild 1744
 SHA256 6bb327c5fcc0db171c665de761515693fe8b4484fc2c87e84d69748bfc3ee359 prboom-2.4.3.ebuild 1744
-MISC ChangeLog 3316 RMD160 7195c5bafd28d02f3512dae6135b5c622f6a11d1 SHA1 7b07405c935ff081f2201616803ddbde49ac3112 SHA256 0310bf32c6c595985cbbcb7d5927cfe94dace369d4b2a3858b86b2307b5d63fe
-MD5 cb18689873ac6e138443157f57a3c01b ChangeLog 3316
-RMD160 7195c5bafd28d02f3512dae6135b5c622f6a11d1 ChangeLog 3316
-SHA256 0310bf32c6c595985cbbcb7d5927cfe94dace369d4b2a3858b86b2307b5d63fe ChangeLog 3316
+EBUILD prboom-2.4.4.ebuild 1744 RMD160 a8132d200a137cb67edec2dbb7ee61cf18e4c3df SHA1 7a844812ec29e487a1bc4d2f07fc4e1751f82650 SHA256 2ef50d87644854047c4629ba12b5206d6926d2a364ca0b5ebe5b7fe499d86bdc
+MD5 b057d58ddda08d2b19c63106153f2200 prboom-2.4.4.ebuild 1744
+RMD160 a8132d200a137cb67edec2dbb7ee61cf18e4c3df prboom-2.4.4.ebuild 1744
+SHA256 2ef50d87644854047c4629ba12b5206d6926d2a364ca0b5ebe5b7fe499d86bdc prboom-2.4.4.ebuild 1744
+MISC ChangeLog 3497 RMD160 c88a4a0076d2ebbebbd2e2b7a5291ae51e6cd96a SHA1 58d1ff7f63fa88d390479e20a3684dde7b9c15f4 SHA256 b92c35f1effa811c327eaf0e3bc7cdda54cdbcf172e4da2fe3bb281905edcc39
+MD5 c56052ac216f95d55e22aa899f326ffe ChangeLog 3497
+RMD160 c88a4a0076d2ebbebbd2e2b7a5291ae51e6cd96a ChangeLog 3497
+SHA256 b92c35f1effa811c327eaf0e3bc7cdda54cdbcf172e4da2fe3bb281905edcc39 ChangeLog 3497
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -50,3 +63,6 @@ SHA256 2f2b9a5af0e4ff1fdfc1cc1efc4c8b9a2b4cbb7fc26e1916f2401bb99c1970ac files/di
 MD5 7dac23156fd7cefca8494354b5fcdff6 files/digest-prboom-2.4.3 238
 RMD160 ba1bc0ddfa582086729cc78629dae000cd31927d files/digest-prboom-2.4.3 238
 SHA256 9c24101783450d8acffb7f571da5f86690e8d6bd4368f47a2579ac34f7f91a59 files/digest-prboom-2.4.3 238
+MD5 3277229930d1715f7519495b4b6b409b files/digest-prboom-2.4.4 238
+RMD160 9a5f6d043edbff0768db3568b926fbabd7c716c6 files/digest-prboom-2.4.4 238
+SHA256 1a50dac117203221dbbc102c43660a467a490585567129817c73cf463b233e80 files/digest-prboom-2.4.4 238
diff --git a/games-fps/prboom/files/2.4.4-nvidia-test.c b/games-fps/prboom/files/2.4.4-nvidia-test.c
new file mode 100644
index 000000000000..f9e4bd700f8a
--- /dev/null
+++ b/games-fps/prboom/files/2.4.4-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.4-nvidia.patch b/games-fps/prboom/files/2.4.4-nvidia.patch
new file mode 100644
index 000000000000..2b7aa9b32d46
--- /dev/null
+++ b/games-fps/prboom/files/2.4.4-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.4 b/games-fps/prboom/files/digest-prboom-2.4.4
new file mode 100644
index 000000000000..fa9eef6a91f5
--- /dev/null
+++ b/games-fps/prboom/files/digest-prboom-2.4.4
@@ -0,0 +1,3 @@
+MD5 20934b1950297f79b95f36c089ef037f prboom-2.4.4.tar.gz 961947
+RMD160 e85213acc29eb5ff18a69f840185c76f95cdad71 prboom-2.4.4.tar.gz 961947
+SHA256 1a0b5eb00725e9648bf63475121ae361907983b2fe4ec7a5c580ccebba3ea4bc prboom-2.4.4.tar.gz 961947
diff --git a/games-fps/prboom/prboom-2.4.4.ebuild b/games-fps/prboom/prboom-2.4.4.ebuild
new file mode 100644
index 000000000000..e9c921d1af2f
--- /dev/null
+++ b/games-fps/prboom/prboom-2.4.4.ebuild
@@ -0,0 +1,64 @@
+# 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.4.ebuild,v 1.1 2006/08/01 04:01:44 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 )"
+
+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 treated 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
+}