ver bump to fix #50549 #41339

8 files changed, 292 insertions, 7 deletions

diff --git a/games-fps/doom-data/Manifest b/games-fps/doom-data/Manifest
index fd83949df0ac..45c2b91b507d 100644
--- a/games-fps/doom-data/Manifest
+++ b/games-fps/doom-data/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 190b5a30cae945bf9f1d44e5c2825518 doom-data-1.ebuild 562
+MD5 7faba8a19b353cecc0fb6e270cac226b doom-data-1.ebuild 581
 MD5 664d393ce2c056c10b77f1de646532fc metadata.xml 258
 MD5 aa0e1cdd58c53fafd647eb3dcf18da09 ChangeLog 342
 MD5 1dc295be4491635b1546c955518b491d files/digest-doom-data-1 118
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.8 (GNU/Linux)
 
-iD8DBQFA/cUeHTu7gpaalycRAmVVAJ9Abvbms6n51m9jyZE/j3fx+3cbIQCg5xEh
-DWHePFnH0nr0ErSgIw8edRA=
-=Ax8z
+iD8DBQFA/dRvHTu7gpaalycRAoK7AJ9Ccc0Y4RR9ONsj2KnsZ13dipWEIgCgvSQA
+u5xEE66rYM/pcbCHEZbksjI=
+=VLCR
 -----END PGP SIGNATURE-----
diff --git a/games-fps/doomlegacy/ChangeLog b/games-fps/doomlegacy/ChangeLog
index 5a6885fb2fbd..0532c0872455 100644
--- a/games-fps/doomlegacy/ChangeLog
+++ b/games-fps/doomlegacy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/doomlegacy
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/ChangeLog,v 1.8 2004/06/24 22:41:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/ChangeLog,v 1.9 2004/07/21 02:22:31 vapier Exp $
+
+*doomlegacy-1.42 (20 Jul 2004)
+
+  20 Jul 2004; Mike Frysinger <vapier@gentoo.org> +files/1.42-errno.patch,
+  +files/1.42-makefile.patch, +files/1.42-sdl-gentoo-paths.patch,
+  +doomlegacy-1.42.ebuild:
+  Version bump #50549 by Florian Westphal and #41339 by Kimmo Sundqvist.
 
   30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
   doomlegacy-1.41-r1.ebuild:
diff --git a/games-fps/doomlegacy/Manifest b/games-fps/doomlegacy/Manifest
index 970329b950aa..e04f5ad260f0 100644
--- a/games-fps/doomlegacy/Manifest
+++ b/games-fps/doomlegacy/Manifest
@@ -1,6 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dc86d30f1873cd6b0109c8e95dd48daa ChangeLog 1807
+MD5 d0be0b58acac6f6ea623ec89d3d0fa27 doomlegacy-1.42.ebuild 2617
 MD5 63f645bcd9419dbffe4e47791d5f3b3c doomlegacy-1.41-r1.ebuild 2776
-MD5 85b234542204f293a2dcbb2741ba2025 ChangeLog 1535
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 bb9b722c1950d5def8c8b9acdaf97e50 files/digest-doomlegacy-1.42 131
 MD5 e885b725a7ac4856ab497c431c5baaf9 files/1.41-errno.patch 1141
-MD5 adb14f545729e3b8e033a068cb60d73a files/digest-doomlegacy-1.41-r1 189
 MD5 4148627cf6a4c044c2d8499c3d1263cb files/1.41-makefile.patch 4065
+MD5 0d6de7188dfe337db9cd0b99fc2dcf05 files/1.42-errno.patch 1327
+MD5 e816487fa8ac743f0b6e9691e79bac01 files/1.42-makefile.patch 4465
+MD5 939a6e8bb2387591d70d271c6a5c55be files/1.42-sdl-gentoo-paths.patch 495
+MD5 adb14f545729e3b8e033a068cb60d73a files/digest-doomlegacy-1.41-r1 189
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA/dN6HTu7gpaalycRAsooAKDO3M9zjqBWPiSUtgyVH9WmCFOOUQCfZn5v
+L8wxl853MnPS2GdBtA4sTpM=
+=M1zq
+-----END PGP SIGNATURE-----
diff --git a/games-fps/doomlegacy/doomlegacy-1.42.ebuild b/games-fps/doomlegacy/doomlegacy-1.42.ebuild
new file mode 100644
index 000000000000..bfeeb2ad1ca3
--- /dev/null
+++ b/games-fps/doomlegacy/doomlegacy-1.42.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomlegacy/doomlegacy-1.42.ebuild,v 1.1 2004/07/21 02:22:31 vapier Exp $
+
+inherit eutils games
+
+DESCRIPTION="Doom legacy, THE doom port"
+HOMEPAGE="http://legacy.newdoom.com/"
+SRC_URI="mirror://sourceforge/doomlegacy/legacy_${PV/.}_src.tar.gz
+	mirror://gentoo/legacy-${PV}.dat.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE="sdl X dga esd"
+
+RDEPEND="
+	virtual/opengl
+	virtual/x11
+	esd? ( media-sound/esound )
+	sdl? (
+		media-libs/libsdl
+		media-libs/sdl-mixer
+	)"
+DEPEND="${RDEPEND}
+	x86? ( >=dev-lang/nasm-0.98 )
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/doomlegacy_${PV/.}_src
+
+src_unpack() {
+	unpack ${A}
+	mkdir bin
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-errno.patch
+	epatch ${FILESDIR}/${PV}-makefile.patch
+	epatch ${FILESDIR}/${PV}-sdl-gentoo-paths.patch
+
+	# disable logfile writing
+	sed -i \
+		-e 's:#define LOGMESSAGES::' doomdef.h \
+		|| die 'sed doomdef.h failed'
+
+	# make sure the games can find the wads/data files
+	sed -i \
+		-e "/#define DEFAULTWADLOCATION1/s:\".*\":\"${GAMES_DATADIR}/doom-data\":" \
+		linux_x/i_system.c || die "sed linux_x/i_system.c failed"
+	sed -i \
+		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/doom-data:" \
+		sdl/i_system.c || die "sed sdl/i_system.c failed"
+
+	# move opengl lib file because it's not useful to anyone else
+	sed -i \
+		-e "s:\"r_opengl:\"${GAMES_LIBDIR}/${PN}/r_opengl:" \
+		linux_x/i_video_xshm.c \
+		|| die "sed linux_x/i_video_xshm.c failed"
+
+	cd linux_x/musserv
+	make -f Makefile.linux clean
+}
+
+src_compile() {
+	# this is ugly but it's late (here) and it works
+	local makeopts=""
+	local interfaces=""
+	use sdl && interfaces="${interfaces} SDL"
+	use X && interfaces="${interfaces} X"
+	[ -z "${interfaces}" ] && interfaces="X"
+	mkdir ${WORKDIR}/my-bins
+	for i in ${interfaces} ; do
+		case ${i} in
+			SDL)
+				makeopts="SDL=1";;
+			X)
+				makeopts="LINUX=1 X=1"
+				use x86 && makeopts="${makeopts} USEASM=1"
+				use dga && makeopts="${makeopts} WITH_DGA=1"
+				use esd && makeopts="${makeopts} HAVE_ESD=1";;
+		esac
+		emake EXTRAOPTS="${CFLAGS}" ${makeopts} || die "build failed"
+		mv \
+			${WORKDIR}/bin/* \
+			linux_x/musserv/linux/musserver \
+			linux_x/sndserv/linux/llsndserv \
+			${WORKDIR}/my-bins/
+		rm ${WORKDIR}/objs/*
+	done
+}
+
+src_install() {
+	dohtml _doc/*.html
+	rm _doc/*.html
+	dodoc _doc/*
+
+	cd ${WORKDIR}
+	exeinto ${GAMES_LIBDIR}/${PN}
+	doexe my-bins/r_opengl.so
+	rm my-bins/r_opengl.so
+	dogamesbin my-bins/*
+
+	insinto ${GAMES_DATADIR}/doom-data
+	newins legacy-${PV}.dat legacy.dat || die
+
+	prepgamesdirs
+}
diff --git a/games-fps/doomlegacy/files/1.42-errno.patch b/games-fps/doomlegacy/files/1.42-errno.patch
new file mode 100644
index 000000000000..ff62d004353e
--- /dev/null
+++ b/games-fps/doomlegacy/files/1.42-errno.patch
@@ -0,0 +1,33 @@
+diff -ur doomlegacy_142_src.orig/linux_x/i_sound.c doomlegacy_142_src/linux_x/i_sound.c
+--- doomlegacy_142_src.orig/linux_x/i_sound.c	2004-05-09 11:51:20.908123440 +0200
++++ doomlegacy_142_src/linux_x/i_sound.c	2004-05-09 11:40:26.257645440 +0200
+@@ -262,7 +262,6 @@
+ void myioctl(int fd, int command, int *arg)
+ {
+     int rc;
+-    extern int errno;
+ 
+     rc = ioctl(fd, command, arg);
+     if (rc < 0)
+diff -ur doomlegacy_142_src.orig/linux_x/i_video_xshm.c doomlegacy_142_src/linux_x/i_video_xshm.c
+--- doomlegacy_142_src.orig/linux_x/i_video_xshm.c	2004-05-09 11:51:20.909123288 +0200
++++ doomlegacy_142_src/linux_x/i_video_xshm.c	2004-05-09 11:40:15.969209520 +0200
+@@ -1401,7 +1401,6 @@
+       id = shmget((key_t)key, size, IPC_CREAT|0777);
+       if (id==-1)
+       {
+-        extern int errno;
+         fprintf(stderr, "errno=%d\n", errno);
+         I_Error("Could not get any shared memory");
+       }
+diff -ur doomlegacy_142_src.orig/linux_x/sndserv/linux.c doomlegacy_142_src/linux_x/sndserv/linux.c
+--- doomlegacy_142_src.orig/linux_x/sndserv/linux.c	2004-05-09 11:51:20.910123136 +0200
++++ doomlegacy_142_src/linux_x/sndserv/linux.c	2004-05-09 11:39:50.198127320 +0200
+@@ -74,7 +74,6 @@
+   int*  arg )
+ {   
+     int         rc;
+-    extern int  errno;
+     
+     rc = ioctl(fd, command, arg);  
+     if (rc < 0)
diff --git a/games-fps/doomlegacy/files/1.42-makefile.patch b/games-fps/doomlegacy/files/1.42-makefile.patch
new file mode 100644
index 000000000000..c6905cdb5588
--- /dev/null
+++ b/games-fps/doomlegacy/files/1.42-makefile.patch
@@ -0,0 +1,108 @@
+diff -ur doomlegacy_142_src.orig/linux_x/musserv/Makefile.linux doomlegacy_142_src/linux_x/musserv/Makefile.linux
+--- doomlegacy_142_src.orig/linux_x/musserv/Makefile.linux	2004-05-09 11:51:20.907123592 +0200
++++ doomlegacy_142_src/linux_x/musserv/Makefile.linux	2004-05-09 11:59:20.982141096 +0200
+@@ -3,7 +3,7 @@
+ #
+ 
+ CC	= gcc
+-CFLAGS	= -I. -Wall -O2 -m486
++CFLAGS	= -I. -Wall $(EXTRAOPTS)
+ LDFLAGS	=
+ #LDFLAGS	= -static
+ 
+diff -ur doomlegacy_142_src.orig/linux_x/sndserv/Makefile doomlegacy_142_src/linux_x/sndserv/Makefile
+--- doomlegacy_142_src.orig/linux_x/sndserv/Makefile	2004-05-09 11:51:20.909123288 +0200
++++ doomlegacy_142_src/linux_x/sndserv/Makefile	2004-05-09 11:59:20.983140944 +0200
+@@ -27,7 +27,7 @@
+ #
+ 
+ CC=gcc
+-CFLAGS=-O2 -m486 -Wall -DNORMALUNIX -DLINUX
++CFLAGS=$(EXTRAOPTS) -Wall -DNORMALUNIX -DLINUX
+ ifdef FREEBSD
+ CFLAGS:=${CFLAGS} -DFREEBSD
+ endif
+diff -ur doomlegacy_142_src.orig/makefile doomlegacy_142_src/makefile
+--- doomlegacy_142_src.orig/makefile	2004-05-09 11:51:20.934119488 +0200
++++ doomlegacy_142_src/makefile	2004-05-09 11:59:20.982141096 +0200
+@@ -533,11 +533,11 @@
+ 
+ ifndef SOLARIS
+ ifdef GCC30
+-	M5=-march=pentium
+-	M4=-march=486
++	M5=
++	M4=
+ else
+-	M5=-mpentium
+-	M4=-m486
++	M5=
++	M4=
+ endif
+ endif
+ 
+@@ -547,7 +547,7 @@
+ 	ifdef PGCC
+ 		CFLAGS = -g -pg -DPARANOIA -fwritable-strings $(OPTS)
+ 	else
+-		CFLAGS = -g -pg $(M4) -O3 -ffast-math -fwritable-strings $(OPTS)
++		CFLAGS = -g -pg $(M4) $(OPTS) $(EXTRAOPTS)
+ 	endif
+ 	LDFLAGS = -g -pg -L/usr/X11R6/lib
+ else
+@@ -555,13 +555,13 @@
+ 
+ 	# build a normal optimised version
+ 	ifdef PGCC
+-		CFLAGS = $(OPTS) $(M5) -O6 -ffast-math -fomit-frame-pointer -fwritable-strings
++		CFLAGS = $(OPTS) $(M5) -fwritable-strings $(EXTRAOPTS)
+ 		# -fgcse -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop -ffunction-cse \
+ 		# -fexpensive-optimizations -fforce-mem -fstrength-reduce -fthread-jumps  \
+ 		# -fregmove -fschedule-insns -fschedule-insns2 -fmove-all-movables \
+ 		# -fcaller-saves -finline-functions -mieee-fp -mfp-ret-in-387 -m80387 -mhard-float -finline
+ 	else
+-		CFLAGS = $(M4) -O3 -ffast-math -fomit-frame-pointer -fwritable-strings $(OPTS)
++		CFLAGS = $(M4) -fwritable-strings $(OPTS) $(EXTRAOPTS)
+ 	endif
+ endif
+ 
+@@ -735,7 +735,7 @@
+ 
+ #dll
+ dll : $(O)/r_opengl.o $(O)/ogl_x11.o
+-	$(CC) $(M5) -O6 -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lGLU -lm
++	$(CC) $(M5) -o $(BIN)/r_opengl.so -shared -nostartfiles $(O)/r_opengl.o $(O)/ogl_x11.o -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lGLU -lm
+ 
+ musserv:
+ 	@mkdir -p $(MUSSERV)/linux
+@@ -749,7 +749,7 @@
+ 
+ ifdef LINUX
+ $(O)/r_opengl.o:	hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
+-	$(CC) $(M5) -O6 -o $(O)/r_opengl.o	-DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
++	$(CC) $(M5) -o $(O)/r_opengl.o	-DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
+ endif
+ 
+ ifdef SDL
+@@ -763,7 +763,7 @@
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
+ else  #FBSD_SDL
+ $(O)/r_opengl.o:	hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
+-	$(CC) $(M5) -O6 -o $(O)/r_opengl.o	-DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
++	$(CC) $(M5) -o $(O)/r_opengl.o	-DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/r_opengl.c
+ endif #FBSD_SDL
+ endif #FREEBSD
+ 
+@@ -774,10 +774,10 @@
+ 
+ ifndef FREEBSD
+ $(O)/ogl_x11.o:  hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
+-	$(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
++	$(CC) $(M5) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
+ else
+ $(O)/ogl_x11.o:  hardware/r_opengl/ogl_x11.c hardware/r_opengl/r_opengl.h
+-	$(CC) $(M5) -O6 -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
++	$(CC) $(M5) -o $(O)/ogl_x11.o -DHWRENDER -DVID_X11 -DLINUX -DFREEBSD $(POLL_POINTER) -shared -nostartfiles -I/usr/X11R6/include -c hardware/r_opengl/ogl_x11.c
+ endif
+ 
+ 
diff --git a/games-fps/doomlegacy/files/1.42-sdl-gentoo-paths.patch b/games-fps/doomlegacy/files/1.42-sdl-gentoo-paths.patch
new file mode 100644
index 000000000000..995e557b74fc
--- /dev/null
+++ b/games-fps/doomlegacy/files/1.42-sdl-gentoo-paths.patch
@@ -0,0 +1,15 @@
+diff -ur doomlegacy_142_src.orig/sdl/i_system.c doomlegacy_142_src/sdl/i_system.c
+--- doomlegacy_142_src.orig/sdl/i_system.c	2004-05-09 11:51:20.913122680 +0200
++++ doomlegacy_142_src/sdl/i_system.c	2004-05-09 14:54:23.716482784 +0200
+@@ -734,6 +734,11 @@
+ 
+ void I_LocateWad(void) {
+     // relict from the Linux version
++#ifdef LINUX
++#define WADLOCATION "GENTOO_DATADIR"
++    if(chdir(WADLOCATION))
++    	fprintf (stderr, "Error: chdir() " WADLOCATION " failed\n");
++#endif
+     return;
+ }
+ 
diff --git a/games-fps/doomlegacy/files/digest-doomlegacy-1.42 b/games-fps/doomlegacy/files/digest-doomlegacy-1.42
new file mode 100644
index 000000000000..af8620e8c419
--- /dev/null
+++ b/games-fps/doomlegacy/files/digest-doomlegacy-1.42
@@ -0,0 +1,2 @@
+MD5 62f5cdad464463038d568a53b13c22f7 legacy_142_src.tar.gz 1687954
+MD5 7910062a0c722f2a2a83f5ca90c72c90 legacy-1.42.dat.bz2 314469