Version bump to add multiplayer-compat patch from upstream #73102 by Keith Constable.

9 files changed, 31 insertions, 275 deletions

diff --git a/games-arcade/crack-attack/ChangeLog b/games-arcade/crack-attack/ChangeLog
index 55c39a421e42..19322fd87433 100644
--- a/games-arcade/crack-attack/ChangeLog
+++ b/games-arcade/crack-attack/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-arcade/crack-attack
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/ChangeLog,v 1.11 2004/11/12 19:17:15 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/ChangeLog,v 1.12 2004/12/03 02:46:49 vapier Exp $
+
+*crack-attack-1.1.11-r1 (02 Dec 2004)
+
+  02 Dec 2004; Mike Frysinger <vapier@gentoo.org> -files/1.1.10-GL.patch,
+  -files/1.1.10-gcc34.patch, -files/1.1.10-i865g.patch,
+  +files/1.1.11-multi-compat.patch, -crack-attack-1.1.10.ebuild,
+  +crack-attack-1.1.11-r1.ebuild, -crack-attack-1.1.11.ebuild:
+  Version bump to add multiplayer-compat patch from upstream #73102 by Keith
+  Constable.
 
   12 Nov 2004; Simon Stelling <blubb@gentoo.org> crack-attack-1.1.11.ebuild:
   added ~amd64
diff --git a/games-arcade/crack-attack/crack-attack-1.1.10.ebuild b/games-arcade/crack-attack/crack-attack-1.1.10.ebuild
deleted file mode 100644
index 46df1fb220fe..000000000000
--- a/games-arcade/crack-attack/crack-attack-1.1.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/crack-attack-1.1.10.ebuild,v 1.10 2004/07/16 04:19:04 vapier Exp $
-
-inherit eutils flag-o-matic gcc games
-
-DESCRIPTION="Addictive OpenGL-based block game"
-HOMEPAGE="http://aluminumangel.org/attack/"
-SRC_URI="http://aluminumangel.org/cgi-bin/download_counter.cgi?attack_linux+attack/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc hppa"
-IUSE=""
-
-RDEPEND="media-libs/glut"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e 's:-O6:@CXXFLAGS@:' src/Makefile.in \
-		|| die "sed src/Makefile.in failed"
-	epatch ${FILESDIR}/${PV}-gcc34.patch
-	epatch ${FILESDIR}/${PV}-i865g.patch #53320
-	epatch ${FILESDIR}/${PV}-GL.patch #48925
-}
-
-src_compile() {
-	append-flags -DGL_GLEXT_LEGACY
-	[ "$(gcc-fullversion)" == "3.2.3" ] && filter-flags -march=pentium3
-	egamesconf || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-	dohtml -A xpm doc/*
-	prepgamesdirs
-}
diff --git a/games-arcade/crack-attack/crack-attack-1.1.11.ebuild b/games-arcade/crack-attack/crack-attack-1.1.11-r1.ebuild
index 911e0c0bb2d0..7b7ac865f21a 100644
--- a/games-arcade/crack-attack/crack-attack-1.1.11.ebuild
+++ b/games-arcade/crack-attack/crack-attack-1.1.11-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/crack-attack-1.1.11.ebuild,v 1.3 2004/11/12 19:17:15 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/crack-attack/crack-attack-1.1.11-r1.ebuild,v 1.1 2004/12/03 02:46:49 vapier Exp $
 
-inherit eutils flag-o-matic gcc games
+inherit eutils flag-o-matic games
 
 DESCRIPTION="Addictive OpenGL-based block game"
 HOMEPAGE="https://savannah.nongnu.org/projects/crack-attack/"
@@ -10,15 +10,20 @@ SRC_URI="http://savannah.nongnu.org/download/crack-attack/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="arm hppa ia64 ppc sparc x86 ~amd64"
+KEYWORDS="amd64 arm hppa ia64 ppc sparc x86"
 IUSE="gtk"
 
 DEPEND="virtual/glut
 	gtk? ( >=x11-libs/gtk+-2.4 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-multi-compat.patch
+}
+
 src_compile() {
 	append-flags -DGL_GLEXT_LEGACY
-	[ "$(gcc-fullversion)" == "3.2.3" ] && filter-flags -march=pentium3
 	egamesconf $(use_enable gtk) || die
 	emake || die "emake failed"
 }
diff --git a/games-arcade/crack-attack/files/1.1.10-GL.patch b/games-arcade/crack-attack/files/1.1.10-GL.patch
deleted file mode 100644
index c5faa4f8ed67..000000000000
--- a/games-arcade/crack-attack/files/1.1.10-GL.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- crack-attack-1.1.10/src/Displayer.cxx.orig	2004-07-16 00:03:43.214681456 -0400
-+++ crack-attack-1.1.10/src/Displayer.cxx	2004-07-16 00:04:26.623082376 -0400
-@@ -28,6 +28,7 @@
- #include <cstring>
- #include <cctype>
- #include <GL/glut.h>
-+#include <GL/glext.h>
- 
- #ifndef _WIN32
- #else
---- crack-attack-1.1.10/src/DrawGarbage.cxx.orig	2004-07-16 00:07:09.182369608 -0400
-+++ crack-attack-1.1.10/src/DrawGarbage.cxx	2004-07-16 00:07:58.066938024 -0400
-@@ -26,8 +26,10 @@
-  */
- 
- #define GL_GLEXT_LEGACY
-+#define GL_GLEXT_PROTOTYPES
- 
- #include <GL/glut.h>
-+#include <GL/glext.h>
- 
- #ifndef _WIN32
- #else
---- crack-attack-1.1.10/src/obj_garbage.cxx.orig	2004-07-16 00:12:10.705531120 -0400
-+++ crack-attack-1.1.10/src/obj_garbage.cxx	2004-07-16 00:12:29.269708936 -0400
-@@ -26,8 +26,10 @@
-  */
- 
- #define GL_GLEXT_LEGACY
-+#define GL_GLEXT_PROTOTYPES
- 
- #include <GL/glut.h>
-+#include <GL/glext.h>
- 
- #ifndef _WIN32
- #else
diff --git a/games-arcade/crack-attack/files/1.1.10-gcc34.patch b/games-arcade/crack-attack/files/1.1.10-gcc34.patch
deleted file mode 100644
index 2c4730942816..000000000000
--- a/games-arcade/crack-attack/files/1.1.10-gcc34.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -u src_old/Attack.cxx src/Attack.cxx
---- src_old/Attack.cxx	2004-04-30 06:34:37.922069784 -0400
-+++ src/Attack.cxx	2004-04-30 06:37:21.790158048 -0400
-@@ -37,12 +37,12 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "Attack.h"
- #include "Communicator.h"
- #include "MetaState.h"
- #include "Random.h"
--#include "TextureLoader.h"
- 
- /*
-  * Documentation
-diff -u src_old/Displayer.cxx src/Displayer.cxx
---- src_old/Displayer.cxx	2004-04-30 06:34:37.950065528 -0400
-+++ src/Displayer.cxx	2004-04-30 06:37:27.623271280 -0400
-@@ -45,6 +45,7 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "Displayer.h"
- #include "CelebrationManager.h"
-@@ -53,7 +54,6 @@
- #include "LightManager.h"
- #include "MetaState.h"
- #include "SparkleManager.h"
--#include "TextureLoader.h"
- #include "String.h"
- #include "ScoreRecordManager.h"
- #include "Score.h"
-diff -u src_old/GarbageFlavorImage.cxx src/GarbageFlavorImage.cxx
---- src_old/GarbageFlavorImage.cxx	2004-04-30 06:34:37.970062488 -0400
-+++ src/GarbageFlavorImage.cxx	2004-04-30 06:37:34.219268536 -0400
-@@ -35,10 +35,10 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "Displayer.h"
- #include "GarbageFlavorImage.h"
--#include "TextureLoader.h"
- #include "Random.h"
- 
- int GarbageFlavorImage::current_texture;
-diff -u src_old/Score.cxx src/Score.cxx
---- src_old/Score.cxx	2004-04-30 06:34:37.984060360 -0400
-+++ src/Score.cxx	2004-04-30 06:37:38.823568576 -0400
-@@ -30,9 +30,9 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "MetaState.h"
--#include "TextureLoader.h"
- #include "Score.h"
- 
- int Score::score;
-diff -u src_old/String.cxx src/String.cxx
---- src_old/String.cxx	2004-04-30 06:34:37.985060208 -0400
-+++ src/String.cxx	2004-04-30 06:37:41.973089776 -0400
-@@ -36,10 +36,10 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "Displayer.h"
- #include "String.h"
--#include "TextureLoader.h"
- 
- const char *String::letter_texture_files[DC_FONT_NUMBER][DC_LETTER_NUMBER]
-  = { { GC_DATA_DIRECTORY "font0_0.tga",
-diff -u src_old/TextureLoader.cxx src/TextureLoader.cxx
---- src_old/TextureLoader.cxx	2004-04-30 06:34:38.057049264 -0400
-+++ src/TextureLoader.cxx	2004-04-30 06:37:45.029625112 -0400
-@@ -39,8 +39,8 @@
- 
- using namespace std;
- 
--#include "Game.h"
- #include "TextureLoader.h"
-+#include "Game.h"
- 
- // the header of an uncompressed TGA file
- const GLubyte header_image[11] = { 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-diff -u src_old/TextureLoader.h src/TextureLoader.h
---- src_old/TextureLoader.h	2004-04-30 06:34:38.057049264 -0400
-+++ src/TextureLoader.h	2004-04-30 06:34:54.967478488 -0400
-@@ -10,6 +10,8 @@
- #  include <strstrea.h>
- #endif
- 
-+#include "Game.h"
-+
- using namespace std;
- 
- #define TL_GARBAGE_TEXTURE_TGA_ID     "Crack Attack! garbage texture"
-diff -u src_old/obj_clock.cxx src/obj_clock.cxx
---- src_old/obj_clock.cxx	2004-04-30 06:34:38.067047744 -0400
-+++ src/obj_clock.cxx	2004-04-30 06:37:48.053165464 -0400
-@@ -34,9 +34,9 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "Displayer.h"
--#include "TextureLoader.h"
- 
- GLuint Displayer::clock_digit_textures[11];
- 
-diff -u src_old/obj_external_candy.cxx src/obj_external_candy.cxx
---- src_old/obj_external_candy.cxx	2004-04-30 06:34:38.068047592 -0400
-+++ src/obj_external_candy.cxx	2004-04-30 06:37:51.609624800 -0400
-@@ -34,9 +34,9 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "Displayer.h"
--#include "TextureLoader.h"
- #include "MetaState.h"
- #include "GarbageFlavorImage.h"
- 
-diff -u src_old/obj_garbage.cxx src/obj_garbage.cxx
---- src_old/obj_garbage.cxx	2004-04-30 06:34:38.068047592 -0400
-+++ src/obj_garbage.cxx	2004-04-30 06:37:55.281066656 -0400
-@@ -36,9 +36,9 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "Displayer.h"
--#include "TextureLoader.h"
- #include "GarbageFlavorImage.h"
- #include "MetaState.h"
- #include "Random.h"
-diff -u src_old/obj_messages.cxx src/obj_messages.cxx
---- src_old/obj_messages.cxx	2004-04-30 06:34:38.074046680 -0400
-+++ src/obj_messages.cxx	2004-04-30 06:37:58.898516720 -0400
-@@ -38,9 +38,9 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "Displayer.h"
--#include "TextureLoader.h"
- #include "MessageManager.h"
- 
- GLuint Displayer::message_1x1_list;
-diff -u src_old/obj_sign.cxx src/obj_sign.cxx
---- src_old/obj_sign.cxx	2004-04-30 06:34:38.075046528 -0400
-+++ src/obj_sign.cxx	2004-04-30 06:38:01.752082912 -0400
-@@ -34,9 +34,9 @@
- 
- using namespace std;
- 
-+#include "TextureLoader.h"
- #include "Game.h"
- #include "Displayer.h"
--#include "TextureLoader.h"
- 
- GLuint Displayer::sign_small_list;
- GLuint Displayer::sign_large_list;
diff --git a/games-arcade/crack-attack/files/1.1.10-i865g.patch b/games-arcade/crack-attack/files/1.1.10-i865g.patch
deleted file mode 100644
index 8dbd99e67f08..000000000000
--- a/games-arcade/crack-attack/files/1.1.10-i865g.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/obj_block.cxx.orig	2004-06-11 16:53:45.000000000 -0700
-+++ src/obj_block.cxx	2004-06-11 16:55:19.000000000 -0700
-@@ -1480,6 +1480,12 @@
-       "since it segfaults\n**********" << endl;
-     return;
-   }
-+  if (strstr((char*) renderer, "865G 20021115")) {
-+    cerr << "**********\nWARNING:"
-+      "disabling call to 1d texturing on 865G 20021115 renderer "
-+      "since it segfaults\n**********" << endl;
-+    return;
-+  }
- 
-   glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE, 32, GL_FALSE, GL_LUMINANCE,
-    GL_UNSIGNED_BYTE, texture);
diff --git a/games-arcade/crack-attack/files/1.1.11-multi-compat.patch b/games-arcade/crack-attack/files/1.1.11-multi-compat.patch
new file mode 100644
index 000000000000..5db0a720fa6a
--- /dev/null
+++ b/games-arcade/crack-attack/files/1.1.11-multi-compat.patch
@@ -0,0 +1,12 @@
+diff -u -r1.3 -r1.4
+--- crack-attack/crack-attack/src/Communicator.h	2004/10/13 17:03:06	1.3
++++ crack-attack/crack-attack/src/Communicator.h	2004/11/10 18:22:52	1.4
+@@ -53,7 +53,7 @@
+ #define CO_TEST_INT                              (47)
+
+ // protocol version number
+-#define CO_VERSION                               "1.1.9"
++#define CO_VERSION                               "1.1.8"
+
+ class BufferElement {
+ public:
diff --git a/games-arcade/crack-attack/files/digest-crack-attack-1.1.10 b/games-arcade/crack-attack/files/digest-crack-attack-1.1.10
deleted file mode 100644
index 5f5379a569d3..000000000000
--- a/games-arcade/crack-attack/files/digest-crack-attack-1.1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39311aa7ac2a80fcf53d3163b4e7be65 crack-attack-1.1.10.tar.gz 596062
diff --git a/games-arcade/crack-attack/files/digest-crack-attack-1.1.11 b/games-arcade/crack-attack/files/digest-crack-attack-1.1.11-r1
index 7fbbccba35a5..7fbbccba35a5 100644
--- a/games-arcade/crack-attack/files/digest-crack-attack-1.1.11
+++ b/games-arcade/crack-attack/files/digest-crack-attack-1.1.11-r1