rename

2 files changed, 30 insertions, 32 deletions

diff --git a/games-puzzle/pingus/files/0.6.0-gcc3.patch b/games-puzzle/pingus/files/pingus-0.6.0-gcc3.patch
index cb1b56615447..3dbe617bfed1 100644
--- a/games-puzzle/pingus/files/0.6.0-gcc3.patch
+++ b/games-puzzle/pingus/files/pingus-0.6.0-gcc3.patch
@@ -1,6 +1,9 @@
-diff -ur -x '*Po' pingus-0.6.0.orig/src/blitter.cxx pingus-0.6.0/src/blitter.cxx
---- pingus-0.6.0.orig/src/blitter.cxx	2003-09-10 01:01:17.022128512 -0400
-+++ pingus-0.6.0/src/blitter.cxx	2003-09-10 01:09:43.097193408 -0400
+Pingus uses assert() but never includes assert.h, boo !
+
+http://bugs.gentoo.org/show_bug.cgi?id=28281
+
+--- pingus-0.6.0/src/blitter.cxx
++++ pingus-0.6.0/src/blitter.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -9,9 +12,8 @@ diff -ur -x '*Po' pingus-0.6.0.orig/src/blitter.cxx pingus-0.6.0/src/blitter.cxx
  #include <config.h>
  #include <stdio.h>
  #include "pingus_error.hxx"
-diff -ur -x '*Po' pingus-0.6.0.orig/src/col_map.cxx pingus-0.6.0/src/col_map.cxx
---- pingus-0.6.0.orig/src/col_map.cxx	2003-09-10 01:01:17.054123648 -0400
-+++ pingus-0.6.0/src/col_map.cxx	2003-09-10 01:10:52.076706928 -0400
+--- pingus-0.6.0/src/col_map.cxx
++++ pingus-0.6.0/src/col_map.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -20,9 +22,8 @@ diff -ur -x '*Po' pingus-0.6.0.orig/src/col_map.cxx pingus-0.6.0/src/col_map.cxx
  #include <iostream>
  #include <ClanLib/Display/SurfaceProviders/canvas.h>
  #include "gui/graphic_context.hxx"
-diff -ur -x '*Po' pingus-0.6.0.orig/src/console.cxx pingus-0.6.0/src/console.cxx
---- pingus-0.6.0.orig/src/console.cxx	2003-09-10 01:01:17.025128056 -0400
-+++ pingus-0.6.0/src/console.cxx	2003-09-10 01:11:17.323868776 -0400
+--- pingus-0.6.0/src/console.cxx
++++ pingus-0.6.0/src/console.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -31,9 +32,8 @@ diff -ur -x '*Po' pingus-0.6.0.orig/src/console.cxx pingus-0.6.0/src/console.cxx
  #include <config.h>
  #include <ClanLib/Display/Display/display.h>
  #include <ClanLib/Display/Font/font.h>
-diff -ur -x '*Po' pingus-0.6.0.orig/src/demo_recorder.cxx pingus-0.6.0/src/demo_recorder.cxx
---- pingus-0.6.0.orig/src/demo_recorder.cxx	2003-09-10 01:01:17.049124408 -0400
-+++ pingus-0.6.0/src/demo_recorder.cxx	2003-09-10 01:11:50.095886672 -0400
+--- pingus-0.6.0/src/demo_recorder.cxx
++++ pingus-0.6.0/src/demo_recorder.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -42,9 +42,8 @@ diff -ur -x '*Po' pingus-0.6.0.orig/src/demo_recorder.cxx pingus-0.6.0/src/demo_
  #include <time.h>
  #include <iostream>
  #include "system.hxx"
-diff -ur -x '*Po' pingus-0.6.0.orig/src/editor/generic_property_frame.cxx pingus-0.6.0/src/editor/generic_property_frame.cxx
---- pingus-0.6.0.orig/src/editor/generic_property_frame.cxx	2003-09-10 01:01:17.028127600 -0400
-+++ pingus-0.6.0/src/editor/generic_property_frame.cxx	2003-09-10 01:01:47.907433232 -0400
+--- pingus-0.6.0/src/editor/generic_property_frame.cxx
++++ pingus-0.6.0/src/editor/generic_property_frame.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -53,9 +52,8 @@ diff -ur -x '*Po' pingus-0.6.0.orig/src/editor/generic_property_frame.cxx pingus
  #include <iostream>
  #include <ClanLib/GUI/label.h>
  #include <ClanLib/GUI/inputbox.h>
-diff -ur -x '*Po' pingus-0.6.0.orig/src/gui/root_gui_manager.cxx pingus-0.6.0/src/gui/root_gui_manager.cxx
---- pingus-0.6.0.orig/src/gui/root_gui_manager.cxx	2003-09-10 01:01:17.002131552 -0400
-+++ pingus-0.6.0/src/gui/root_gui_manager.cxx	2003-09-10 01:04:11.164654824 -0400
+--- pingus-0.6.0/src/gui/root_gui_manager.cxx
++++ pingus-0.6.0/src/gui/root_gui_manager.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -64,9 +62,8 @@ diff -ur -x '*Po' pingus-0.6.0.orig/src/gui/root_gui_manager.cxx pingus-0.6.0/sr
  #include "root_gui_manager.hxx"
  #include "../input/controller.hxx"
  
-diff -ur -x '*Po' pingus-0.6.0.orig/src/pingu_holder.cxx pingus-0.6.0/src/pingu_holder.cxx
---- pingus-0.6.0.orig/src/pingu_holder.cxx	2003-09-10 01:01:17.054123648 -0400
-+++ pingus-0.6.0/src/pingu_holder.cxx	2003-09-10 01:13:48.283919360 -0400
+--- pingus-0.6.0/src/pingu_holder.cxx
++++ pingus-0.6.0/src/pingu_holder.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -75,9 +72,8 @@ diff -ur -x '*Po' pingus-0.6.0.orig/src/pingu_holder.cxx pingus-0.6.0/src/pingu_
  #include <iostream>
  #include "pingu_holder.hxx"
  #include "pingu.hxx"
-diff -ur -x '*Po' pingus-0.6.0.orig/src/savegame_manager.cxx pingus-0.6.0/src/savegame_manager.cxx
---- pingus-0.6.0.orig/src/savegame_manager.cxx	2003-09-10 01:01:17.035126536 -0400
-+++ pingus-0.6.0/src/savegame_manager.cxx	2003-09-10 01:15:43.254441184 -0400
+--- pingus-0.6.0/src/savegame_manager.cxx
++++ pingus-0.6.0/src/savegame_manager.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -86,9 +82,8 @@ diff -ur -x '*Po' pingus-0.6.0.orig/src/savegame_manager.cxx pingus-0.6.0/src/sa
  #include <iostream>
  #include <fstream>
  #include "system.hxx"
-diff -ur -x '*Po' pingus-0.6.0.orig/src/worldmap/dot.cxx pingus-0.6.0/src/worldmap/dot.cxx
---- pingus-0.6.0.orig/src/worldmap/dot.cxx	2003-09-10 01:01:17.036126384 -0400
-+++ pingus-0.6.0/src/worldmap/dot.cxx	2003-09-10 01:06:29.392640976 -0400
+--- pingus-0.6.0/src/worldmap/dot.cxx
++++ pingus-0.6.0/src/worldmap/dot.cxx
 @@ -17,6 +17,7 @@
  //  along with this program; if not, write to the Free Software
  //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -97,9 +92,8 @@ diff -ur -x '*Po' pingus-0.6.0.orig/src/worldmap/dot.cxx pingus-0.6.0/src/worldm
  #include <iostream>
  #include "../xml_file_reader.hxx"
  #include "dot.hxx"
-diff -ur -x '*Po' pingus-0.6.0.orig/src/worldmap/graph.hxx pingus-0.6.0/src/worldmap/graph.hxx
---- pingus-0.6.0.orig/src/worldmap/graph.hxx	2003-09-10 01:01:17.037126232 -0400
-+++ pingus-0.6.0/src/worldmap/graph.hxx	2003-09-10 01:07:31.004274584 -0400
+--- pingus-0.6.0/src/worldmap/graph.hxx
++++ pingus-0.6.0/src/worldmap/graph.hxx
 @@ -20,6 +20,8 @@
  #ifndef HEADER_GRAPH_HXX
  #define HEADER_GRAPH_HXX
diff --git a/games-puzzle/pingus/files/0.6.0-gcc34.patch b/games-puzzle/pingus/files/pingus-0.6.0-gcc34.patch
index b0f52ed4084d..e7f3a7328285 100644
--- a/games-puzzle/pingus/files/0.6.0-gcc34.patch
+++ b/games-puzzle/pingus/files/pingus-0.6.0-gcc34.patch
@@ -1,5 +1,9 @@
---- src/story_screen.cxx.orig	2004-09-12 17:09:51.000000000 -0700
-+++ src/story_screen.cxx	2004-09-12 17:10:43.000000000 -0700
+Make sure we type the cast properly.
+
+http://bugs.gentoo.org/show_bug.cgi?id=63773
+
+--- src/story_screen.cxx
++++ src/story_screen.cxx
 @@ -142,7 +142,7 @@
  
    if (!page_displayed_completly)