version bump

Package-Manager: portage-2.1.1

6 files changed, 148 insertions, 5 deletions

diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index 557a46176736..8f0c121cbe10 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.22 2006/08/25 22:17:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.23 2006/10/19 03:13:31 mr_bones_ Exp $
+
+*prboom-2.4.6 (19 Oct 2006)
+
+  19 Oct 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/2.4.6-nvidia.patch, +files/2.4.6-nvidia-test.c,
+  +prboom-2.4.6.ebuild:
+  version bump
 
 *prboom-2.4.5 (25 Aug 2006)
 
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index b4339ee7a0ea..bdbce0090400 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -38,6 +38,14 @@ AUX 2.4.5-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1
 MD5 a20d23cae8e179f4d2b3e7d30f55cf2d files/2.4.5-nvidia.patch 1734
 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 files/2.4.5-nvidia.patch 1734
 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe files/2.4.5-nvidia.patch 1734
+AUX 2.4.6-nvidia-test.c 90 RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c SHA1 dc9d0930e6f0ca7826554101e4d54a3405bb6f34 SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185
+MD5 6baf3ffdd34dfe4b85618dd603616a80 files/2.4.6-nvidia-test.c 90
+RMD160 423a4874c8c9c92482b7df72cb88f5140ebbbd5c files/2.4.6-nvidia-test.c 90
+SHA256 5df0930928328c700cafba8ac3367dc799118dddcd16d71d2bb0d65eb3a2d185 files/2.4.6-nvidia-test.c 90
+AUX 2.4.6-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1 5cd90ca85012d2d1ffb703861dcb9d9ff92b2388 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe
+MD5 a20d23cae8e179f4d2b3e7d30f55cf2d files/2.4.6-nvidia.patch 1734
+RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 files/2.4.6-nvidia.patch 1734
+SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe files/2.4.6-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
@@ -46,6 +54,7 @@ DIST prboom-2.4.2.tar.gz 928017 RMD160 0390624d76a04b18f6e798ba5972e69c765a5438
 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
 DIST prboom-2.4.5.tar.gz 970658 RMD160 7495750f0ed35e96dd8ea8a1546dcf0cfc1bdf89 SHA1 732305dd21770e38103340e5af824c303fd8212b SHA256 1fdeb7148e92c84ced2416ba2b29a1bf594a542c46f5625b9af9e8f5ee505246
+DIST prboom-2.4.6.tar.gz 997997 RMD160 07370e5dc42c938b275cb0c1bb1e50dd0ce096d5 SHA1 00486df7aaf72c164767adeaa01c083401c44b30 SHA256 70bf0884213b7d806a4cdf40d39bcc638e8ccf99e67e95229ef079108cd30564
 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
@@ -62,10 +71,14 @@ EBUILD prboom-2.4.5.ebuild 1791 RMD160 ca96087dbd485f849399d3673080b468fa952544
 MD5 802f55e670b8cbd98d3f9ac122899eb6 prboom-2.4.5.ebuild 1791
 RMD160 ca96087dbd485f849399d3673080b468fa952544 prboom-2.4.5.ebuild 1791
 SHA256 25d29d82e0498c53a0a3e0d845c2152221f056129d286efcd342552499b46b18 prboom-2.4.5.ebuild 1791
-MISC ChangeLog 3678 RMD160 e31b94f61c25f335878e47d7a8ed2d476233df01 SHA1 f2927965ac8b16a3d001e0c168ca52b07a36d6c7 SHA256 ccee900b8d3068bc8e918802ceba4aaf415e3509885f99c1b3c268390f5e1f1a
-MD5 a0f2528cc6fbb28b012300dea99f26ba ChangeLog 3678
-RMD160 e31b94f61c25f335878e47d7a8ed2d476233df01 ChangeLog 3678
-SHA256 ccee900b8d3068bc8e918802ceba4aaf415e3509885f99c1b3c268390f5e1f1a ChangeLog 3678
+EBUILD prboom-2.4.6.ebuild 1791 RMD160 30dd2f0818fa7025bd2cbee4418a1278c141a192 SHA1 712285d7370d6f6cda74b18fbd7c63b2d33e1752 SHA256 be34dee3c8c4d36dcdd0eb54cb3764523ea7ffa773331c0af2a136cc5c7b46d2
+MD5 388127d10222f66170f66bc8613bf36b prboom-2.4.6.ebuild 1791
+RMD160 30dd2f0818fa7025bd2cbee4418a1278c141a192 prboom-2.4.6.ebuild 1791
+SHA256 be34dee3c8c4d36dcdd0eb54cb3764523ea7ffa773331c0af2a136cc5c7b46d2 prboom-2.4.6.ebuild 1791
+MISC ChangeLog 3859 RMD160 14ee827195ca1c0d1280f5fd5b55850f6c25fdc4 SHA1 52b86ad4cf22d64775fa3c393bd0bde5ab22947a SHA256 fae145114b6092403cd25f3f39ef158cc60ca77bba4f855c3469f21552d1bab0
+MD5 b8ba426b1eec9e744f5262b573c607ee ChangeLog 3859
+RMD160 14ee827195ca1c0d1280f5fd5b55850f6c25fdc4 ChangeLog 3859
+SHA256 fae145114b6092403cd25f3f39ef158cc60ca77bba4f855c3469f21552d1bab0 ChangeLog 3859
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -82,3 +95,6 @@ SHA256 1a50dac117203221dbbc102c43660a467a490585567129817c73cf463b233e80 files/di
 MD5 f50dabe51cc95c517f8afdb545b1a96f files/digest-prboom-2.4.5 238
 RMD160 42322ec5c8f4874cfe5f5006f7eeb693f4a1a38b files/digest-prboom-2.4.5 238
 SHA256 c359cddfba1e445cce73b74d1c1050bb46abce300023ac14b485de53e330db9a files/digest-prboom-2.4.5 238
+MD5 50e7551445b8d33cb81ec36ee49f6ae6 files/digest-prboom-2.4.6 238
+RMD160 256753c3a9432d429bf69a340bfe26c92b4a1920 files/digest-prboom-2.4.6 238
+SHA256 cafa1d8a8822494caf8218429aa4add77a21112e42edc2222f18dc20c64882a9 files/digest-prboom-2.4.6 238
diff --git a/games-fps/prboom/files/2.4.6-nvidia-test.c b/games-fps/prboom/files/2.4.6-nvidia-test.c
new file mode 100644
index 000000000000..f9e4bd700f8a
--- /dev/null
+++ b/games-fps/prboom/files/2.4.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.4.6-nvidia.patch b/games-fps/prboom/files/2.4.6-nvidia.patch
new file mode 100644
index 000000000000..2b7aa9b32d46
--- /dev/null
+++ b/games-fps/prboom/files/2.4.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.4.6 b/games-fps/prboom/files/digest-prboom-2.4.6
new file mode 100644
index 000000000000..442454c04e12
--- /dev/null
+++ b/games-fps/prboom/files/digest-prboom-2.4.6
@@ -0,0 +1,3 @@
+MD5 0f60f3ad6a8dad5b2c6d4360f181ac22 prboom-2.4.6.tar.gz 997997
+RMD160 07370e5dc42c938b275cb0c1bb1e50dd0ce096d5 prboom-2.4.6.tar.gz 997997
+SHA256 70bf0884213b7d806a4cdf40d39bcc638e8ccf99e67e95229ef079108cd30564 prboom-2.4.6.tar.gz 997997
diff --git a/games-fps/prboom/prboom-2.4.6.ebuild b/games-fps/prboom/prboom-2.4.6.ebuild
new file mode 100644
index 000000000000..49f685be4cf1
--- /dev/null
+++ b/games-fps/prboom/prboom-2.4.6.ebuild
@@ -0,0 +1,66 @@
+# 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.6.ebuild,v 1.1 2006/10/19 03:13:31 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
+	sed -i \
+		-e '/^gamesdir/ s/\/games/\/bin/' \
+		src/Makefile.in \
+		|| die "sed failed"
+	sed -i \
+		-e 's/: install-docDATA/:/' \
+		-e '/^SUBDIRS/ s/doc//' \
+		Makefile.in \
+		|| die "sed failed"
+}
+
+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 \
+		--disable-dependency-tracking \
+		${myconf} \
+		$(use_enable x86 i386-asm) \
+		--disable-cpu-opt \
+		--with-waddir="${GAMES_DATADIR}/doom-data" \
+		|| die
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	doman doc/*.{5,6}
+	dodoc AUTHORS NEWS README TODO doc/README.* doc/*.txt
+	doicon "${FILESDIR}/${PN}.png"
+	make_desktop_entry ${PN} "PrBoom"
+	prepgamesdirs
+}