Fix for bug #113067 , segfault with openal and minor dep fixes

(Portage version: 2.1_pre5-r4)

7 files changed, 91 insertions, 36 deletions

diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog
index 6abc78dd3e68..86350e5e8ce4 100644
--- a/games-fps/doomsday/ChangeLog
+++ b/games-fps/doomsday/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/doomsday
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.10 2005/09/16 22:12:26 ciaranm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.11 2006/03/13 21:33:02 tupone Exp $
+
+*doomsday-1.8.6-r1 (13 Mar 2006)
+
+  13 Mar 2006; <Tupone@gentoo.org> -files/1.8.0-filename-case.patch,
+  doomsday-1.8.6.ebuild, +doomsday-1.8.6-r1.ebuild:
+  Fix for bug #113067 (segfault with openal). Thanks Anton Romanov for report.
+  Minor dependency fixes.
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index d61bd3e3e1ae..8e0e1ecf2256 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,16 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a56605ab549ada0dc3cc85439131054b doomsday-1.8.6.ebuild 1129
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 a8b3d78b09410ccc3edc91842579597e ChangeLog 1607
-MD5 5f91dc6393ff5aba59c015a5ab9ccbd0 files/1.8.0-filename-case.patch 502
+MD5 210d7c54decb5e5829fed18baaf6492c ChangeLog 1868
+RMD160 9b47d6d782b14161e8900265b3585bf244ce4239 ChangeLog 1868
+SHA256 5fa10a67e8a627f0227effeae4448dcc98d3fb4a3fcaa41acbce5da95f7f6da1 ChangeLog 1868
+MD5 dc6f91494a3f9eddacf0c661d5d398e2 doomsday-1.8.6-r1.ebuild 1421
+RMD160 84b9c18ccd613886abc227aecd3884a754c8b4d1 doomsday-1.8.6-r1.ebuild 1421
+SHA256 6c61de07e87f3cbe14bd348a855dd7ded81ef03a9e53971895952a2fac8213fa doomsday-1.8.6-r1.ebuild 1421
+MD5 f2e4fa4344b720bf424b6e46a1e2d21d doomsday-1.8.6.ebuild 1185
+RMD160 e6c1712ab9158f6372776275c7daafca39f86de4 doomsday-1.8.6.ebuild 1185
+SHA256 9d30647ba44e8d84f410fc27dee7d0fbaca2c4d0fb9c67983a5433962665999c doomsday-1.8.6.ebuild 1185
+MD5 4406244484e6be19557eee89dc6f91d9 files/digest-doomsday-1.8.6 235
+RMD160 7e61b42606aea6f4700ebe6eea2ba40e96773563 files/digest-doomsday-1.8.6 235
+SHA256 a18ba2bfaceea76a0c3f102f1a36647429e95cb1219129b94342b4bfca8bf970 files/digest-doomsday-1.8.6 235
+MD5 4406244484e6be19557eee89dc6f91d9 files/digest-doomsday-1.8.6-r1 235
+RMD160 7e61b42606aea6f4700ebe6eea2ba40e96773563 files/digest-doomsday-1.8.6-r1 235
+SHA256 a18ba2bfaceea76a0c3f102f1a36647429e95cb1219129b94342b4bfca8bf970 files/digest-doomsday-1.8.6-r1 235
 MD5 5fa792096b783fb6b3cd3bd45c2f709c files/wrapper 136
-MD5 71acf317b5b79c25ed9aba5de47e4708 files/digest-doomsday-1.8.6 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK0N8LLFUmVNQ7rkRAl50AJ9RJ5Hn4XDS4m0IARwjuEuUSMQTrwCfQnzL
-hk+GB5qP+ChxZDIa7fDIWGU=
-=o3zr
------END PGP SIGNATURE-----
+RMD160 9eb253537d5e2b443cf0807401b86a7526ae3e4e files/wrapper 136
+SHA256 64b959cfeb77bd778f16768c0ee509cd128eb855fa4acd8e7c37046c5885dbc8 files/wrapper 136
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-fps/doomsday/doomsday-1.8.6-r1.ebuild b/games-fps/doomsday/doomsday-1.8.6-r1.ebuild
new file mode 100644
index 000000000000..c1ac23adec77
--- /dev/null
+++ b/games-fps/doomsday/doomsday-1.8.6-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.8.6-r1.ebuild,v 1.1 2006/03/13 21:33:02 tupone Exp $
+
+inherit eutils games
+
+DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
+HOMEPAGE="http://www.doomsdayhq.com/"
+SRC_URI="mirror://sourceforge/deng/deng-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="openal"
+
+DEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	media-libs/sdl-net
+	media-libs/libpng
+	|| ( x11-libs/libXext virtual/x11 )
+	openal? ( media-libs/openal )"
+
+S=${WORKDIR}/deng-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Fixing music driver init
+	sed -i \
+		-e "s/musd_loaded.Init/musd_loaded.Init \&\& musd_loaded.Init/" \
+		-e "s/musd_loaded.Shut/if (musd_loaded.Shutdown) musd_loaded.Shut/" \
+		Src/s_mus.c
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	rmdir "${D}/${GAMES_PREFIX}/include"
+	mv "${D}/${GAMES_DATADIR}/"{deng/Data/jDoom,doom-data}
+	dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/deng/Data/jDoom
+
+	local game
+	for game in jdoom jheretic jhexen ; do
+		newgamesbin "${FILESDIR}/wrapper" ${game}
+		sed -i \
+			-e "s:GAME:${game}:" "${D}"/${GAMES_BINDIR}/${game} \
+			|| die "sed ${GAMES_BINDIR}/${game} failed"
+	done
+
+	dodoc Doc/*.txt Doc/*/*.txt README
+	prepgamesdirs
+}
diff --git a/games-fps/doomsday/doomsday-1.8.6.ebuild b/games-fps/doomsday/doomsday-1.8.6.ebuild
index bae30d71f8ad..288aba8a5a7b 100644
--- a/games-fps/doomsday/doomsday-1.8.6.ebuild
+++ b/games-fps/doomsday/doomsday-1.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.8.6.ebuild,v 1.1 2005/01/25 02:45:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.8.6.ebuild,v 1.2 2006/03/13 21:33:02 tupone Exp $
 
 inherit eutils games
 
@@ -18,6 +18,8 @@ DEPEND="virtual/opengl
 	media-libs/libsdl
 	media-libs/sdl-mixer
 	media-libs/sdl-net
+	media-libs/libpng
+	|| ( x11-libs/libXext virtual/x11 )
 	openal? ( media-libs/openal )"
 
 S=${WORKDIR}/deng-${PV}
diff --git a/games-fps/doomsday/files/1.8.0-filename-case.patch b/games-fps/doomsday/files/1.8.0-filename-case.patch
deleted file mode 100644
index 7458c39f5013..000000000000
--- a/games-fps/doomsday/files/1.8.0-filename-case.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- deng-1.8.0/Src/jDoom/d_main.c.orig	2004-07-20 23:26:09.811971144 -0400
-+++ deng-1.8.0/Src/jDoom/d_main.c	2004-07-20 23:26:22.532300424 -0400
-@@ -139,10 +139,10 @@
- 	fspec_t iwads[] = {
- 		{"TNT.wad", "-tnt"},
- 		{"Plutonia.wad", "-plutonia"},
--		{"Doom2.wad", "-doom2"},
--		{"Doom1.wad", "-sdoom"},
--		{"Doom.wad", "-doom"},
--		{"Doom.wad", "-ultimate"},
-+		{"doom2.wad", "-doom2"},
-+		{"doom1.wad", "-sdoom"},
-+		{"doom.wad", "-doom"},
-+		{"doom.wad", "-ultimate"},
- 		{0, 0}
- 	};
- 	int     i, k;
diff --git a/games-fps/doomsday/files/digest-doomsday-1.8.6 b/games-fps/doomsday/files/digest-doomsday-1.8.6
index 7603c0bf30a0..a12c4aba08b0 100644
--- a/games-fps/doomsday/files/digest-doomsday-1.8.6
+++ b/games-fps/doomsday/files/digest-doomsday-1.8.6
@@ -1 +1,3 @@
 MD5 1717d0de5bc8efba9076d6b8e2055d08 deng-1.8.6.tar.gz 3157590
+RMD160 2bb272b871b4e256699b42db32baf975dd11b30e deng-1.8.6.tar.gz 3157590
+SHA256 06e33d9efe3522c72940bda0d6892e58e2b1479f2b261a885b7854b9ce0201a6 deng-1.8.6.tar.gz 3157590
diff --git a/games-fps/doomsday/files/digest-doomsday-1.8.6-r1 b/games-fps/doomsday/files/digest-doomsday-1.8.6-r1
new file mode 100644
index 000000000000..a12c4aba08b0
--- /dev/null
+++ b/games-fps/doomsday/files/digest-doomsday-1.8.6-r1
@@ -0,0 +1,3 @@
+MD5 1717d0de5bc8efba9076d6b8e2055d08 deng-1.8.6.tar.gz 3157590
+RMD160 2bb272b871b4e256699b42db32baf975dd11b30e deng-1.8.6.tar.gz 3157590
+SHA256 06e33d9efe3522c72940bda0d6892e58e2b1479f2b261a885b7854b9ce0201a6 deng-1.8.6.tar.gz 3157590