Clean up ebuild: add games.eclass support, fix stupid paths, and fix gcc errors #77846 by Pinky.

(Portage version: 2.0.51-r13)

3 files changed, 81 insertions, 2 deletions

diff --git a/games-fps/lsdldoom/files/1.4.4.4-gcc34.patch b/games-fps/lsdldoom/files/1.4.4.4-gcc34.patch
new file mode 100644
index 000000000000..988905f84931
--- /dev/null
+++ b/games-fps/lsdldoom/files/1.4.4.4-gcc34.patch
@@ -0,0 +1,42 @@
+diff -ur lsdldoom-1.4.4.4.orig/src/d_main.c lsdldoom-1.4.4.4/src/d_main.c
+--- lsdldoom-1.4.4.4.orig/src/d_main.c	2005-01-15 02:38:13.077626072 -0500
++++ lsdldoom-1.4.4.4/src/d_main.c	2005-01-15 02:39:41.646161608 -0500
+@@ -230,6 +230,7 @@
+     case GS_LEVEL:
+       V_SetPalette(0); // cph - use default (basic) palette  
+     default:
++;
+     }
+ 
+     switch (gamestate) {
+@@ -243,6 +244,7 @@
+       D_PageDrawer();
+       break;
+     default:
++;
+     }
+   } else if (gametic) { // In a level
+     boolean redrawborderstuff;
+diff -ur lsdldoom-1.4.4.4.orig/src/g_game.c lsdldoom-1.4.4.4/src/g_game.c
+--- lsdldoom-1.4.4.4.orig/src/g_game.c	2005-01-15 02:38:13.043631240 -0500
++++ lsdldoom-1.4.4.4/src/g_game.c	2005-01-15 02:38:13.260598256 -0500
+@@ -875,6 +875,7 @@
+     case GS_INTERMISSION:
+       WI_End();
+     default:
++;
+     }
+     prevgamestate = gamestate;
+   }
+diff -ur lsdldoom-1.4.4.4.orig/src/p_maputl.h lsdldoom-1.4.4.4/src/p_maputl.h
+--- lsdldoom-1.4.4.4.orig/src/p_maputl.h	2005-01-15 02:38:13.044631088 -0500
++++ lsdldoom-1.4.4.4/src/p_maputl.h	2005-01-15 02:40:35.526970480 -0500
+@@ -82,7 +82,7 @@
+ void    P_SetThingPosition(mobj_t *thing);
+ boolean P_BlockLinesIterator (int x, int y, boolean func(line_t *));
+ boolean P_BlockThingsIterator(int x, int y, boolean func(mobj_t *));
+-boolean ThingIsOnLine(const mobj_t *t, const line_t *l);  /* killough 3/15/98 */
++boolean CONSTFUNC ThingIsOnLine(const mobj_t *t, const line_t *l);  /* killough 3/15/98 */
+ boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
+                        int flags, boolean trav(intercept_t *));
+ 
diff --git a/games-fps/lsdldoom/files/1.4.4.4-gentoo-paths.patch b/games-fps/lsdldoom/files/1.4.4.4-gentoo-paths.patch
new file mode 100644
index 000000000000..a180b96046cf
--- /dev/null
+++ b/games-fps/lsdldoom/files/1.4.4.4-gentoo-paths.patch
@@ -0,0 +1,39 @@
+--- lsdldoom-1.4.4.4.orig/configure	2005-01-15 03:08:57.000000000 -0500
++++ lsdldoom-1.4.4.4/configure	2005-01-15 03:18:34.814466112 -0500
+@@ -2445,6 +2445,6 @@
+-gamesdir=$prefix/games
++gamesdir=$bindir
+ exp_gamesdir=`eval "echo $gamesdir"`
+ exp_datadir=`eval "echo $datadir"`
+-waddir=$exp_datadir/games/doom
++waddir=$exp_datadir/doom-data
+ cat >> confdefs.h <<EOF
+ #define DOOMWADDIR "$waddir"
+--- lsdldoom-1.4.4.4.orig/src/Makefile.in	2005-01-15 03:08:57.000000000 -0500
++++ lsdldoom-1.4.4.4/src/Makefile.in	2005-01-15 03:19:19.298703480 -0500
+@@ -86,3 +86,3 @@
+-gamesdir = $(prefix)/games
++gamesdir = $(bindir)
+ EXTRA_PROGRAMS = lsdldoom lxdoom-game-server
+ games_PROGRAMS = @BUILD_SDLDOOM@ @BUILD_SERVER@
+--- lsdldoom-1.4.4.4.orig/doc/Makefile.in	2005-01-15 03:20:25.252676952 -0500
++++ lsdldoom-1.4.4.4/doc/Makefile.in	2005-01-15 03:23:34.686878576 -0500
+@@ -85,3 +85,3 @@
+ 
+-docdir = $(prefix)/share/doc/@PACKAGE@
++docdir = /usr/share/doc/$(PF)
+ man_MANS = lsdldoom.6 boom.cfg.5 lxdoom-game-server.6
+--- lsdldoom-1.4.4.4.orig/data/Makefile.in	2005-01-15 03:20:25.261675584 -0500
++++ lsdldoom-1.4.4.4/data/Makefile.in	2005-01-15 03:24:29.704514624 -0500
+@@ -85,3 +85,3 @@
+ 
+-waddir = $(datadir)/games/doom
++waddir = $(datadir)/doom-data
+ wad_DATA = boomlump.wad
+--- lsdldoom-1.4.4.4.orig/Makefile.in	2005-01-15 03:29:34.329204632 -0500
++++ lsdldoom-1.4.4.4/Makefile.in	2005-01-15 03:31:30.359565336 -0500
+@@ -85,3 +85,3 @@
+ 
+-docdir = $(prefix)/share/doc/@PACKAGE@
++docdir = /usr/share/doc/$(PF)
+ SUBDIRS = doc data src
diff --git a/games-fps/lsdldoom/files/lsdldoom b/games-fps/lsdldoom/files/lsdldoom
deleted file mode 100644
index 49849d6dedc7..000000000000
--- a/games-fps/lsdldoom/files/lsdldoom
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-cd /usr/share/doom  ; ./lsdldoom -width 800 -height 600 -grabmouse