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

Package-Manager: portage-2.0.51-r13

5 files changed, 117 insertions, 28 deletions

diff --git a/games-fps/lsdldoom/ChangeLog b/games-fps/lsdldoom/ChangeLog
index b16b917b9cc0..abc610b00e04 100644
--- a/games-fps/lsdldoom/ChangeLog
+++ b/games-fps/lsdldoom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/lsdldoom
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.6 2004/12/29 00:04:45 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.7 2005/01/15 09:12:46 vapier Exp $
+
+  15 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/1.4.4.4-gcc34.patch, +files/1.4.4.4-gentoo-paths.patch,
+  lsdldoom-1.4.4.4.ebuild:
+  Clean up ebuild: add games.eclass support, fix stupid paths, and fix gcc
+  errors #77846 by Pinky.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
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
diff --git a/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild b/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild
index c9fcf334b2b8..4c40cc90b0f5 100644
--- a/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild
+++ b/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild
@@ -1,43 +1,47 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild,v 1.9 2004/06/24 22:42:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/lsdldoom-1.4.4.4.ebuild,v 1.10 2005/01/15 09:12:46 vapier Exp $
+
+inherit games eutils
 
 DESCRIPTION="Port of ID's doom to SDL"
 HOMEPAGE="http://firehead.org/~jessh/lsdldoom/"
-SRC_URI="http://www.lbjhs.net/~jessh/lsdldoom/src/${P}.tar.gz
-	http://www.lbjhs.net/~jessh/lsdldoom/doom1.wad.gz"
+SRC_URI="http://www.lbjhs.net/~jessh/lsdldoom/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
+KEYWORDS="ppc sparc x86"
 IUSE=""
 
-DEPEND=">=media-libs/sdl-mixer-1.2.0
-	media-sound/timidity++"
+DEPEND="media-libs/libsdl
+	media-libs/sdl-net
+	games-fps/doom-data"
 
 src_unpack() {
-	unpack ${P}.tar.gz
-	cp ${DISTDIR}/doom1.wad.gz ${S}
-	chmod 0644 ${S}/doom1.wad.gz
-	gzip -d ${S}/*.gz
+	unpack ${A}
+	cp -r ${S}{,.orig}
+	cd ${S}
+	epatch "${FILESDIR}"/${PV}-gentoo-paths.patch
+	epatch "${FILESDIR}"/${PV}-gcc34.patch #77846
 }
 
 src_compile() {
-	./configure \
-		--prefix=/usr \
-		--datadir=/usr/share/doom \
-		--bindir=/usr/bin \
-		--host=${CHOST} \
+	# The SDL_mixer implementation is VERY broken ...
+	# it relies on internal function calls rather than 
+	# the exported API ... bad programmer !
+	# i386-asm -> build failure
+	# cpu-opt -> just adds -mcpu crap to CFLAGS
+	ac_cv_lib_SDL_mixer_Mix_LoadMUS=no \
+	egamesconf \
+		--disable-i386-asm \
+		--disable-cpu-opt \
 		|| die
-	make || die
+	emake || die
 }
 
 src_install() {
-	dobin "${FILESDIR}/lsdldoom"
-	exeinto /usr/share/doom
-	doexe src/lsdldoom src/lxdoom-game-server
-	insinto /usr/share/doom/
-	doins doom1.wad data/*.wad
-	doman doc/boom.cfg.5 doc/lsdldoom.6 doc/lxdoom-game-server.6
-	dodoc AUTHORS ChangeLog INSTALL NEWS README doc/*.txt
+	make install DESTDIR="${D}" || die
+	prepalldocs
+	dodoc ChangeLog
+	prepgamesdirs
 }