Version bump (bug #59826). Thanks Sascha Geschwandtner

(Portage version: 2.1_pre5-r2)

7 files changed, 145 insertions, 4 deletions

diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index 5dd9e753d090..e7b8cb3bcf05 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.12 2006/02/14 22:22:53 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.13 2006/03/06 22:21:51 tupone Exp $
+
+*prboom-2.2.6 (06 Mar 2006)
+
+  06 Mar 2006; <Tupone@gentoo.org> +files/2.2.6-nvidia.patch,
+  +files/2.2.6-nvidia-test.c, +files/prboom.png, +prboom-2.2.6.ebuild:
+  Version bump (Bug #59826), thanks Sascha Geschwandtner
+  Added prboom icon to menu
 
   14 Feb 2006; <Tupone@gentoo.org> prboom-2.2.4-r1.ebuild:
   Modular X dependency fix
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index f81116a80c7a..cfe4f754ab43 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -1,6 +1,6 @@
-MD5 b9b7187d572104acf97992a6fd580768 ChangeLog 1756
-RMD160 187f0bf0d429ea93998c5c4ff5b881953a7c0709 ChangeLog 1756
-SHA256 4f08196bdfd28446a7161909c422d534ebc87d9c81068d57d8adb73ecfca34d0 ChangeLog 1756
+MD5 8b7f80d21906baabab4ecdf8f54a9da0 ChangeLog 2004
+RMD160 5c347432a6fd61092ff4e8cee8a3baa6998030f2 ChangeLog 2004
+SHA256 2552991c69197bc86d9e983313f3f5081a7c7046c8588c0c2aaab552b1209548 ChangeLog 2004
 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
@@ -10,12 +10,27 @@ SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 files/2.
 MD5 d8fff22fba51330be33cc8905f81d425 files/2.2.4-nvidia.patch 1761
 RMD160 8c980004ffca3fc69fdf25301ea629428599b75a files/2.2.4-nvidia.patch 1761
 SHA256 b097c952ea093751448d0082424f09a7ef1d5fefe253dd22ea3d0c5b0f5aa0bc files/2.2.4-nvidia.patch 1761
+MD5 6baf3ffdd34dfe4b85618dd603616a80 files/2.2.6-nvidia-test.c 90
+RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c files/2.2.6-nvidia-test.c 90
+SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 files/2.2.6-nvidia-test.c 90
+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 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 ffbfee35e7a2580f5f0cdadcb05132e0 files/prboom.png 4254
+RMD160 a673654eab9d87d34537e3d42c9274245be9e45f files/prboom.png 4254
+SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542 files/prboom.png 4254
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
 MD5 2f9d637fd33e8f614b07d7bda4aaf7e3 prboom-2.2.4-r1.ebuild 1837
 RMD160 11eb2b186c9f2b388208ba5384b47331f56d8b72 prboom-2.2.4-r1.ebuild 1837
 SHA256 11e73ac19169fe5d34f46cf0f27e6aeceae4e102d033728555c9e4d7854de773 prboom-2.2.4-r1.ebuild 1837
+MD5 c99d44079b98a0642f1f5626562261a2 prboom-2.2.6.ebuild 1780
+RMD160 88d9546524b7c1afaccb1b36da05f6503acc079d prboom-2.2.6.ebuild 1780
+SHA256 42afcf84b5eb9cc08b344734c3b475b68fa40cd89a5476df6b9cdc292298c1a1 prboom-2.2.6.ebuild 1780
diff --git a/games-fps/prboom/files/2.2.6-nvidia-test.c b/games-fps/prboom/files/2.2.6-nvidia-test.c
new file mode 100644
index 000000000000..f9e4bd700f8a
--- /dev/null
+++ b/games-fps/prboom/files/2.2.6-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.2.6-nvidia.patch b/games-fps/prboom/files/2.2.6-nvidia.patch
new file mode 100644
index 000000000000..cbadbd82c1e4
--- /dev/null
+++ b/games-fps/prboom/files/2.2.6-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.2.6 b/games-fps/prboom/files/digest-prboom-2.2.6
new file mode 100644
index 000000000000..dd7f717e7450
--- /dev/null
+++ b/games-fps/prboom/files/digest-prboom-2.2.6
@@ -0,0 +1,3 @@
+MD5 ef0abe0aad017514857552434b5c6aaa prboom-2.2.6.tar.gz 1047612
+RMD160 8d6d005037a17b1b046f5a51c3e01b014896fbcd prboom-2.2.6.tar.gz 1047612
+SHA256 200d3c50b082ae46be8c014bb576b4e2d23b1704508fd528c47e3e2b3b04759e prboom-2.2.6.tar.gz 1047612
diff --git a/games-fps/prboom/files/prboom.png b/games-fps/prboom/files/prboom.png
new file mode 100644
index 000000000000..5541436f96ea
--- /dev/null
+++ b/games-fps/prboom/files/prboom.png
diff --git a/games-fps/prboom/prboom-2.2.6.ebuild b/games-fps/prboom/prboom-2.2.6.ebuild
new file mode 100644
index 000000000000..1f5620fabab8
--- /dev/null
+++ b/games-fps/prboom/prboom-2.2.6.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.2.6.ebuild,v 1.1 2006/03/06 22:21:51 tupone 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" ${PN}.png
+	prepgamesdirs
+}