10 files changed, 17 insertions, 175 deletions
diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog
index bf28ad60f19f..853183c73c24 100644
--- a/games-fps/doomsday/ChangeLog
+++ b/games-fps/doomsday/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-fps/doomsday
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.21 2007/03/13 01:29:19 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.22 2007/11/23 20:50:17 mr_bones_ Exp $
+
+*doomsday-1.9.0_beta52 (23 Nov 2007)
+
+  23 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/doomsday-1.9.0_beta4-configure.patch,
+  -files/doomsday-1.9.0_beta4-music-driver.patch,
+  -doomsday-1.9.0_beta4.ebuild, -doomsday-1.9.0_beta4-r1.ebuild,
+  -doomsday-1.9.0_beta5.ebuild, +doomsday-1.9.0_beta52.ebuild:
+  version bump; clean out old, insecure versions
 
   13 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   doomsday-1.9.0_beta5.ebuild:
diff --git a/games-fps/doomsday/doomsday-1.9.0_beta4-r1.ebuild b/games-fps/doomsday/doomsday-1.9.0_beta4-r1.ebuild
deleted file mode 100644
index 47356efc76e3..000000000000
--- a/games-fps/doomsday/doomsday-1.9.0_beta4-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.9.0_beta4-r1.ebuild,v 1.2 2006/12/04 23:10:26 wolf31o2 Exp $
-
-inherit eutils games
-
-MY_PV=${PV/_/-}
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.doomsdayhq.com/"
-SRC_URI="mirror://sourceforge/deng/deng-${MY_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
-	openal? ( media-libs/openal )"
-
-S=${WORKDIR}/deng-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-music-driver.patch \
-		"${FILESDIR}"/${P}-configure.patch
-}
-
-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
-
-	# Make wrappers for the common wads
-	for n in doom doom2 ; do
-		games_make_wrapper ${PN}-${n} "jdoom -file ${GAMES_DATADIR}/doom-data/${n}.wad"
-	done
-
-	dodoc Doc/*.txt Doc/*/*.txt README
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	einfo "To play the original Doom levels, place doom.wad and/or doom2.wad"
-	einfo "into ${GAMES_DATADIR}/doom-data"
-	einfo "Then run doomsday-doom or doomsday-doom2 accordingly."
-	einfo
-	einfo "doom1.wad is the shareware demo wad consisting of 1 episode,"
-	einfo "and doom.wad is the full Doom 1 set of 3 episodes"
-	einfo "(or 4 in the Final Doom wad)."
-	einfo
-	einfo "You can even emerge doom-data and/or freedoom, with the doomsday use"
-	einfo "flag enabled, to play for free"
-
-	games_pkg_postinst
-}
diff --git a/games-fps/doomsday/doomsday-1.9.0_beta4.ebuild b/games-fps/doomsday/doomsday-1.9.0_beta4.ebuild
deleted file mode 100644
index 80f03b29222f..000000000000
--- a/games-fps/doomsday/doomsday-1.9.0_beta4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.9.0_beta4.ebuild,v 1.6 2006/12/04 23:10:26 wolf31o2 Exp $
-
-inherit eutils games
-
-MY_PV=${PV/_/-}
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.doomsdayhq.com/"
-SRC_URI="mirror://sourceforge/deng/deng-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="openal"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	media-libs/libpng
-	x11-libs/libXext
-	openal? ( media-libs/openal )"
-DEPEND="${RDEPEND}
-	app-arch/zip"
-
-S=${WORKDIR}/deng-${MY_PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-music-driver.patch \
-		"${FILESDIR}"/${P}-configure.patch
-}
-
-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.9.0_beta5.ebuild b/games-fps/doomsday/doomsday-1.9.0_beta52.ebuild
index 35bbb29e9032..070cb3301138 100644
--- a/games-fps/doomsday/doomsday-1.9.0_beta5.ebuild
+++ b/games-fps/doomsday/doomsday-1.9.0_beta52.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.0_beta5.ebuild,v 1.3 2007/04/09 17:52:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.0_beta52.ebuild,v 1.1 2007/11/23 20:50:17 mr_bones_ Exp $
 
 inherit toolchain-funcs games
 
-MY_P=deng-${PV/_/-}
+MY_P=deng-1.9.0-beta5.2 # FIXME, this is stupid
 DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
 HOMEPAGE="http://www.doomsdayhq.com/"
 SRC_URI="mirror://sourceforge/deng/${MY_P}.tar.gz"
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4
 	app-arch/zip"
 
-S=${WORKDIR}/${MY_P}/${PN}/build
+S=${WORKDIR}/${MY_P}/${MY_P}/build
 
 src_compile() {
 	cmake \
@@ -60,7 +60,7 @@ src_install() {
 	done
 
 	doman ../engine/doc/${PN}.6
-	dodoc ../engine/doc/*.txt ../../README
+	dodoc ../engine/doc/*.txt README
 	prepgamesdirs
 }
 
diff --git a/games-fps/doomsday/files/digest-doomsday-1.9.0_beta4 b/games-fps/doomsday/files/digest-doomsday-1.9.0_beta4
deleted file mode 100644
index 934f7796a87d..000000000000
--- a/games-fps/doomsday/files/digest-doomsday-1.9.0_beta4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b2bec9a475eee1438f55ebde00b3d13f deng-1.9.0-beta4.tar.gz 4433485
-RMD160 5bd03b90dbbdc88fe1a4e128912c9be8dd91c93a deng-1.9.0-beta4.tar.gz 4433485
-SHA256 643fbd1a5be0db8ca1884ee389e111f2a7cfa61a2ee3acb4ed0f08a1b38660ae deng-1.9.0-beta4.tar.gz 4433485
diff --git a/games-fps/doomsday/files/digest-doomsday-1.9.0_beta4-r1 b/games-fps/doomsday/files/digest-doomsday-1.9.0_beta4-r1
deleted file mode 100644
index 934f7796a87d..000000000000
--- a/games-fps/doomsday/files/digest-doomsday-1.9.0_beta4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b2bec9a475eee1438f55ebde00b3d13f deng-1.9.0-beta4.tar.gz 4433485
-RMD160 5bd03b90dbbdc88fe1a4e128912c9be8dd91c93a deng-1.9.0-beta4.tar.gz 4433485
-SHA256 643fbd1a5be0db8ca1884ee389e111f2a7cfa61a2ee3acb4ed0f08a1b38660ae deng-1.9.0-beta4.tar.gz 4433485
diff --git a/games-fps/doomsday/files/digest-doomsday-1.9.0_beta5 b/games-fps/doomsday/files/digest-doomsday-1.9.0_beta5
deleted file mode 100644
index fcbbe30e8d02..000000000000
--- a/games-fps/doomsday/files/digest-doomsday-1.9.0_beta5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2aafcb12a33c1363f141137daeeff3b6 deng-1.9.0-beta5.tar.gz 6210089
-RMD160 f47288f3b795682ab2ae0af216bbb77d4a4c32eb deng-1.9.0-beta5.tar.gz 6210089
-SHA256 4c5aabdd9dc28a5241fe5272f3660177da4b5f5a04d6a9c996fa77d190b0ee44 deng-1.9.0-beta5.tar.gz 6210089
diff --git a/games-fps/doomsday/files/digest-doomsday-1.9.0_beta52 b/games-fps/doomsday/files/digest-doomsday-1.9.0_beta52
new file mode 100644
index 000000000000..a8258ecc027e
--- /dev/null
+++ b/games-fps/doomsday/files/digest-doomsday-1.9.0_beta52
@@ -0,0 +1,3 @@
+MD5 0f879f92442f706b00bc00d0a97e2806 deng-1.9.0-beta5.2.tar.gz 7134253
+RMD160 0ba60e9dcea713bc76a15192208fd05e649cc96c deng-1.9.0-beta5.2.tar.gz 7134253
+SHA256 e0cf33a5984d3954b8b490ae96d2ddb82ae97304f92bd6d1ed544a1722bc4a24 deng-1.9.0-beta5.2.tar.gz 7134253
diff --git a/games-fps/doomsday/files/doomsday-1.9.0_beta4-configure.patch b/games-fps/doomsday/files/doomsday-1.9.0_beta4-configure.patch
deleted file mode 100644
index 47ace496ea0a..000000000000
--- a/games-fps/doomsday/files/doomsday-1.9.0_beta4-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN deng-1.9.0-beta4.orig/configure deng-1.9.0-beta4/configure
---- deng-1.9.0-beta4.orig/configure	2006-05-28 13:54:06.000000000 -0400
-+++ deng-1.9.0-beta4/configure	2006-05-31 12:13:39.000000000 -0400
-@@ -21001,10 +21001,10 @@
-                                                                                                     ac_config_files="$ac_config_files Makefile Src/Makefile Src/drOpenGL/Makefile Src/jDoom/Makefile Src/jHeretic/Makefile Src/jHexen/Makefile Src/dpDehRead/Makefile Src/dpMapLoad/Makefile Src/dsSDLMixer/Makefile Src/dsOpenAL/Makefile"
- 
- 
--cd ..
-+#cd ..
- rm -f ./Data/Doomsday.pk3
- zip -v -0  ./Data/Doomsday.pk3  ./Data/Graphics/* ./Data/Fonts/* ./Data/KeyMaps/*
--cd Build
-+#cd Build
- 
- #cd ..
- #python ./Scripts/makedmt.py < ./Include/mapdata.hs
diff --git a/games-fps/doomsday/files/doomsday-1.9.0_beta4-music-driver.patch b/games-fps/doomsday/files/doomsday-1.9.0_beta4-music-driver.patch
deleted file mode 100644
index 3165933ee1a0..000000000000
--- a/games-fps/doomsday/files/doomsday-1.9.0_beta4-music-driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -burN Src.orig/s_mus.c Src/s_mus.c
---- Src.orig/s_mus.c	2006-05-31 11:30:58.000000000 -0400
-+++ Src/s_mus.c	2006-05-31 11:32:04.000000000 -0400
-@@ -122,7 +122,7 @@
- #endif
- #ifdef UNIX
-     // The available interfaces have already been loaded.
--    if(musd_loaded.Init())
-+    if(musd_loaded.Init && musd_loaded.Init())
-     {
-         imus = (musd_loaded_imus.gen.Init ? &musd_loaded_imus : 0);
-         iext = (musd_loaded_iext.gen.Init ? &musd_loaded_iext : 0);
-@@ -174,7 +174,7 @@
-     musd_win.Shutdown();
- #endif
- #ifdef UNIX
--    musd_loaded.Shutdown();
-+    if (musd_loaded.Shutdown) musd_loaded.Shutdown();
- #endif
- 
-     // No more interfaces.