Move icon to mirror://gentoo

(Portage version: 2.1.2-r9)

8 files changed, 21 insertions, 127 deletions

diff --git a/games-fps/prboom/ChangeLog b/games-fps/prboom/ChangeLog
index e9408c01b2f1..c51cd85f4e90 100644
--- a/games-fps/prboom/ChangeLog
+++ b/games-fps/prboom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/prboom
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.25 2007/01/10 00:21:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/ChangeLog,v 1.26 2007/02/14 01:06:08 nyhm Exp $
+
+  14 Feb 2007; Tristan Heaven <nyhm@gentoo.org> -files/prboom.png,
+  prboom-2.4.7.ebuild:
+  Move icon to mirror://gentoo
 
   10 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   -files/2.4.2-nvidia.patch, -files/2.4.2-nvidia-test.c,
diff --git a/games-fps/prboom/files/2.4.6-nvidia-test.c b/games-fps/prboom/files/2.4.6-nvidia-test.c
deleted file mode 100644
index f9e4bd700f8a..000000000000
--- a/games-fps/prboom/files/2.4.6-nvidia-test.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#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
deleted file mode 100644
index 2b7aa9b32d46..000000000000
--- a/games-fps/prboom/files/2.4.6-nvidia.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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
deleted file mode 100644
index 442454c04e12..000000000000
--- a/games-fps/prboom/files/digest-prboom-2.4.6
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-prboom-2.4.7 b/games-fps/prboom/files/digest-prboom-2.4.7
index 87c3aa83a94f..ccb28c37fcbe 100644
--- a/games-fps/prboom/files/digest-prboom-2.4.7
+++ b/games-fps/prboom/files/digest-prboom-2.4.7
@@ -1,3 +1,6 @@
 MD5 9942f521764d7f89df2218a456da4f02 prboom-2.4.7.tar.gz 999524
 RMD160 78c8548954dd95469f8099bc8fa697f62a69c17e prboom-2.4.7.tar.gz 999524
 SHA256 de22dbaacd25a0f0b16c507aa2326a90b7f5dcfcf862c3dc7076996c6187cd2f prboom-2.4.7.tar.gz 999524
+MD5 ffbfee35e7a2580f5f0cdadcb05132e0 prboom.png 4254
+RMD160 a673654eab9d87d34537e3d42c9274245be9e45f prboom.png 4254
+SHA256 ed79c4712b57b0c5e8ef975412e22d6936fa4b62657707e8f1cda63302008542 prboom.png 4254
diff --git a/games-fps/prboom/files/prboom.png b/games-fps/prboom/files/prboom.png
deleted file mode 100644
index 5541436f96ea..000000000000
--- a/games-fps/prboom/files/prboom.png
+++ /dev/null
diff --git a/games-fps/prboom/prboom-2.4.6.ebuild b/games-fps/prboom/prboom-2.4.6.ebuild
deleted file mode 100644
index ddc72a495a4c..000000000000
--- a/games-fps/prboom/prboom-2.4.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 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.3 2007/01/26 22:54:06 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
-	!games-fps/lsdldoom
-	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
-}
diff --git a/games-fps/prboom/prboom-2.4.7.ebuild b/games-fps/prboom/prboom-2.4.7.ebuild
index 1892d5eb822a..08961abb23c7 100644
--- a/games-fps/prboom/prboom-2.4.7.ebuild
+++ b/games-fps/prboom/prboom-2.4.7.ebuild
@@ -1,23 +1,27 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.4.7.ebuild,v 1.3 2007/01/26 22:54:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/prboom/prboom-2.4.7.ebuild,v 1.4 2007/02/14 01:06:08 nyhm 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"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="opengl"
 
-DEPEND=">=media-libs/libsdl-1.1.3
+DEPEND="media-libs/libsdl
 	media-libs/sdl-mixer
 	media-libs/sdl-net
 	!games-fps/lsdldoom
-	opengl? ( virtual/opengl virtual/glu )"
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)"
 
 src_unpack() {
 	unpack ${A}
@@ -36,6 +40,10 @@ src_unpack() {
 		-e '/^SUBDIRS/ s/doc//' \
 		Makefile.in \
 		|| die "sed failed"
+	sed -i \
+		-e 's:-ffast-math $CFLAGS_OPT::' \
+		configure \
+		|| die "sed configure failed"
 }
 
 src_compile() {
@@ -61,7 +69,7 @@ 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"
+	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry ${PN} "PrBoom"
 	prepgamesdirs
 }