version bump

Package-Manager: portage-2.1.1_pre3

5 files changed, 138 insertions, 15 deletions

diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index b57d15fef990..05c9a100a059 100644
--- a/games-fps/prboom/ChangeLog
+++ b/games-fps/prboom/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2006/05/23 17:50:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.18 2006/07/18 01:28:43 mr_bones_ Exp $
+
+*prboom-2.4.2 (18 Jul 2006)
+
+  18 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/2.4.2-nvidia.patch, +prboom-2.4.2.ebuild:
+  version bump
 
   23 May 2006; Gustavo Zacarias <gustavoz@gentoo.org> prboom-2.4.1.ebuild:
   Stable on sparc
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
index f8a4f319367c..f9d069a6f522 100644
--- a/games-fps/prboom/Manifest
+++ b/games-fps/prboom/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.2.4-gcc34.patch 629 RMD160 941aeeda5371d8b711fc91b07972c2316d8e3df4 SHA1 a2befd5f5c395f0b438e90fb0be7f7f7c2fd5d72 SHA256 bc3726ecc1630c5369280085f171a87e529cf969d9596116730228e47c4a51e2
 MD5 e3d9b24d0bbddd7177cdc13ec010c225 files/2.2.4-gcc34.patch 629
 RMD160 941aeeda5371d8b711fc91b07972c2316d8e3df4 files/2.2.4-gcc34.patch 629
@@ -37,6 +34,10 @@ AUX 2.4.1-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1
 MD5 a20d23cae8e179f4d2b3e7d30f55cf2d files/2.4.1-nvidia.patch 1734
 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 files/2.4.1-nvidia.patch 1734
 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe files/2.4.1-nvidia.patch 1734
+AUX 2.4.2-nvidia.patch 1734 RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 SHA1 5cd90ca85012d2d1ffb703861dcb9d9ff92b2388 SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe
+MD5 a20d23cae8e179f4d2b3e7d30f55cf2d files/2.4.2-nvidia.patch 1734
+RMD160 89aeec2e42cc8dc29d1dd79f17fd91abe77ceb44 files/2.4.2-nvidia.patch 1734
+SHA256 db77ce8107f97f2886d89c53777b2f9c7ef5e2559dcdd4ea455f3cf0ae2491fe files/2.4.2-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
@@ -45,6 +46,7 @@ DIST prboom-2.2.4.tar.gz 1001103 RMD160 644e018cc94d60841728310c44afdf2cd202a20f
 DIST prboom-2.2.6.tar.gz 1047612 RMD160 8d6d005037a17b1b046f5a51c3e01b014896fbcd SHA256 200d3c50b082ae46be8c014bb576b4e2d23b1704508fd528c47e3e2b3b04759e
 DIST prboom-2.4.0.tar.gz 880867 RMD160 ae8c895e7cb1cd8534b874ad8eb877ea9882b976 SHA256 f7834fba92f816d00904d9809c80909b7d0f55986eb85a4bf548f6b77edaddd4
 DIST prboom-2.4.1.tar.gz 879712 RMD160 5ac0d1ffe3ceeb3ce69adcc495074e7ac510a130 SHA256 07757422383b933ecef093a6892946ac4b89b8e891d3a48fdaa6f98615124a9b
+DIST prboom-2.4.2.tar.gz 928017 RMD160 0390624d76a04b18f6e798ba5972e69c765a5438 SHA1 164dc860acf447823e6ff14d7655fcb8b1279000 SHA256 0f393b65c8ce0fc84b3be8c5d38a516f1e0013f32b2e12a92bcf711e7e03b730
 EBUILD prboom-2.2.4-r1.ebuild 1837 RMD160 11eb2b186c9f2b388208ba5384b47331f56d8b72 SHA1 4dcbdc308f2185b1b842c91cdade3ea5344c3d0e SHA256 11e73ac19169fe5d34f46cf0f27e6aeceae4e102d033728555c9e4d7854de773
 MD5 2f9d637fd33e8f614b07d7bda4aaf7e3 prboom-2.2.4-r1.ebuild 1837
 RMD160 11eb2b186c9f2b388208ba5384b47331f56d8b72 prboom-2.2.4-r1.ebuild 1837
@@ -61,10 +63,14 @@ EBUILD prboom-2.4.1.ebuild 1741 RMD160 1b85141d4338a487867c790b99d92df6adf11101
 MD5 89061f90ccc45facd73fe7cea86aa604 prboom-2.4.1.ebuild 1741
 RMD160 1b85141d4338a487867c790b99d92df6adf11101 prboom-2.4.1.ebuild 1741
 SHA256 15dcf31407e8a3dd055c0cc4231aa329cbd72726e09d1f6c62ca3f3992e8230f prboom-2.4.1.ebuild 1741
-MISC ChangeLog 2581 RMD160 f3c09544b80c95aab5c02bf405289ea03f71b94e SHA1 4f82ef20ef1e3e73b9b2aecd78f2ccd334aa057d SHA256 dd7048bea16420b46e693c10f18f1bed20879d2292a30d3ad8c885cb0e920048
-MD5 072265d11f1f6d190a22fc980ccc76c3 ChangeLog 2581
-RMD160 f3c09544b80c95aab5c02bf405289ea03f71b94e ChangeLog 2581
-SHA256 dd7048bea16420b46e693c10f18f1bed20879d2292a30d3ad8c885cb0e920048 ChangeLog 2581
+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
+SHA256 4095f41d0539b2d15c7e87839f07cedaa0052e7967577b7e5eae95c301d6a53c prboom-2.4.2.ebuild 1744
+MISC ChangeLog 2733 RMD160 1398509199bfeffc0d3e994441a612770d18c9b5 SHA1 c6a11b39f20a00224189e0fb0500e4575835e0e8 SHA256 95af19b379624e7dec82cc0813ebde7d76a9ab08dc543cce8edaeefc1ff770a5
+MD5 9adf4f2a52bc9c1af432b0c44c0677a9 ChangeLog 2733
+RMD160 1398509199bfeffc0d3e994441a612770d18c9b5 ChangeLog 2733
+SHA256 95af19b379624e7dec82cc0813ebde7d76a9ab08dc543cce8edaeefc1ff770a5 ChangeLog 2733
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -81,10 +87,6 @@ SHA256 df1f6b01e8ff3f8e5ff4d48c3faa322134b705d420237d7bd817157ea3a197b2 files/di
 MD5 317d206473728e358bf8be4a74d1fdbf files/digest-prboom-2.4.1 238
 RMD160 4b9e83829b3208933fa2641ad8794d3d35965573 files/digest-prboom-2.4.1 238
 SHA256 d1cfaa8a2b8cc3912588b5970a09e82ae828c1200db74e42c29256bd7cc9541f files/digest-prboom-2.4.1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEirz/2+ySkm8kpY0RAlBCAJwPoOA6nrJkDN5LTTvISvfugEAyAwCgt75N
-I6m0pQDMMzdO4vn6UZCIB54=
-=FRff
------END PGP SIGNATURE-----
+MD5 75c64cd10cb561e72fdf2f6928cce307 files/digest-prboom-2.4.2 238
+RMD160 3dc88485b0bbdcd6f1bde3bf4b09b5a16acd3722 files/digest-prboom-2.4.2 238
+SHA256 2f2b9a5af0e4ff1fdfc1cc1efc4c8b9a2b4cbb7fc26e1916f2401bb99c1970ac files/digest-prboom-2.4.2 238
diff --git a/games-fps/prboom/files/2.4.2-nvidia.patch b/games-fps/prboom/files/2.4.2-nvidia.patch
new file mode 100644
index 000000000000..2b7aa9b32d46
--- /dev/null
+++ b/games-fps/prboom/files/2.4.2-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.2 b/games-fps/prboom/files/digest-prboom-2.4.2
new file mode 100644
index 000000000000..82dcbaed95ad
--- /dev/null
+++ b/games-fps/prboom/files/digest-prboom-2.4.2
@@ -0,0 +1,3 @@
+MD5 71a3e599bef7a5fc16ac308e378a5c9d prboom-2.4.2.tar.gz 928017
+RMD160 0390624d76a04b18f6e798ba5972e69c765a5438 prboom-2.4.2.tar.gz 928017
+SHA256 0f393b65c8ce0fc84b3be8c5d38a516f1e0013f32b2e12a92bcf711e7e03b730 prboom-2.4.2.tar.gz 928017
diff --git a/games-fps/prboom/prboom-2.4.2.ebuild b/games-fps/prboom/prboom-2.4.2.ebuild
new file mode 100644
index 000000000000..34e4a5d21068
--- /dev/null
+++ b/games-fps/prboom/prboom-2.4.2.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.2.ebuild,v 1.1 2006/07/18 01:28:43 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
+}