games-fps/uhexen2: Drop old (2nd attempt) :P

svn path=/sunrise/; revision=4744

3 files changed, 5 insertions, 469 deletions

diff --git a/games-fps/uhexen2/ChangeLog b/games-fps/uhexen2/ChangeLog
index fad215066..2c1c8cc98 100644
--- a/games-fps/uhexen2/ChangeLog
+++ b/games-fps/uhexen2/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   03 Oct 2007; Davide Cendron (scen) <scen@gentoo.org>
+  -uhexen2-1.4.2_rc2.ebuild:
+  Drop old (2nd attempt) :P
+
+  03 Oct 2007; Davide Cendron (scen) <scen@gentoo.org>
   -files/uhexen2-1.4.2_rc1-h2launcher_improvements.diff,
   +uhexen2-1.4.2.ebuild:
   Version bump (and drop old)
diff --git a/games-fps/uhexen2/Manifest b/games-fps/uhexen2/Manifest
index 7e24aa6a4..67741d310 100644
--- a/games-fps/uhexen2/Manifest
+++ b/games-fps/uhexen2/Manifest
@@ -1,9 +1,6 @@
-DIST gamedata-all-1.19-rc2.tgz 3703813 RMD160 1be90cca1a76130ca5c602a7092c3aae3c110465 SHA1 6f2a626a95f368370acf2230932ee7373cecf1f1 SHA256 00f63a7c1aafae08f3786d5d78312f602a667d9ee8fcba43515a505223afe7cd
 DIST gamedata-all-1.19.tgz 3703620 RMD160 091d7fbb6db27dab197ad5932be9f40764b21209 SHA1 f898157169316a6557a70b469976b22ddc3c03cd SHA256 1d291d06f3de337bc0ef13dae3d1c0d7593d5a9308a8a2451196730ffb5fe7b1
-DIST hexen2source-1.4.2-rc2.tgz 2045275 RMD160 700e5d4d2ace7303998f0c25e71043a5573bbf53 SHA1 00d93600348bf88bda907581eaa2965dc796baf7 SHA256 ca56ac2f3a4958ae06c460f6bb43843d2ba78704ad209f3407adc5c78c274e52
 DIST hexen2source-1.4.2.tgz 2062106 RMD160 bc9f000ce11b5be06ddce64e3a6fe09008b5ea71 SHA1 5b4470a615e82f43f7a4d75896402b1c83a93cc3 SHA256 cd12e4a24edf1958e773110493a6ef67947d400eb74be2821c3b6786c7769c49
 DIST hexenworld-pakfiles-0.15.tgz 4956848 RMD160 cd6cafb8e597028e1405638b7a60e1f30ce6d846 SHA1 57af1db9a92f2e41f8fa0f1e5f779f4ec648e730 SHA256 215e92f58bc7ed6098f076b45a20b94092599bfce6c4cd00f2895b24a6ee72fe
 EBUILD uhexen2-1.4.2.ebuild 12831 RMD160 6dc640d9164a44c4faa9a083a017405f9c141ce7 SHA1 1533dc80312d6f77fb55d02fc68a12d88b7f88f3 SHA256 a4ddd3ba640cbb4e10e9a615292f61412ad126c1afce3a0168ebc18a64cfb013
-EBUILD uhexen2-1.4.2_rc2.ebuild 12840 RMD160 c38f95d4df8e07a9964f29d0820cd2b3eb86c120 SHA1 d12d5df2af622f4db594c2ea0d98ca8da7684db7 SHA256 f2a2f965e8c1d84e2d73a84885bcb37c94265fb99a7e63acf1fc862c3142c33d
-MISC ChangeLog 941 RMD160 b201b0a5e4563d5bffe0bfbbed1028940e0684a7 SHA1 99473469cbcc718a3e51eb6b3f072f5a1ce61e36 SHA256 0e272638b9577eb282bd0964b9062240d21ea2b140371780301426c4f2a880fa
+MISC ChangeLog 1054 RMD160 7b8bcf87b23acfb1bf990d53d89c064fe84aab43 SHA1 ce788938c13553e6a545ae7698db0ea6bda4f1ae SHA256 a269098bc1f5e4295c15a64489b44296097f8c13e685ae474b87171e315df6f0
 MISC metadata.xml 321 RMD160 38328099fe4e3737564b5075ba94015829a70953 SHA1 48dbdf9f010778df1a854d8b1cce37da8adfac62 SHA256 df59705cd6050e64fd7d238a1ee22836d82f34a69c0db9d8cc70edfded51dc7e
diff --git a/games-fps/uhexen2/uhexen2-1.4.2_rc2.ebuild b/games-fps/uhexen2/uhexen2-1.4.2_rc2.ebuild
deleted file mode 100644
index eeba1b974..000000000
--- a/games-fps/uhexen2/uhexen2-1.4.2_rc2.ebuild
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils flag-o-matic toolchain-funcs versionator games
-
-DATA_PV="1.19-rc2"
-HW_PV="0.15"
-MY_PN="hexen2"
-MY_PV=$(replace_version_separator 3 '-')
-DEMO_PV="1.4.1"
-
-DESCRIPTION="Hexen 2 port - Hammer of Thyrion"
-HOMEPAGE="http://uhexen2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}source-${MY_PV}.tgz
-	mirror://sourceforge/${PN}/gamedata-all-${DATA_PV}.tgz
-	hexenworld? ( mirror://sourceforge/${PN}/hexenworld-pakfiles-${HW_PV}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3dfx alsa asm cdaudio debug dedicated demo dynamic hexenworld gtk lights
-midi opengl optimize-cflags oss sdlaudio sdlcd tools"
-
-QA_EXECSTACK="${GAMES_BINDIR:1}/hexen2
-	${GAMES_BINDIR:1}/glhexen2
-	${GAMES_BINDIR:1}/hexen2-demo
-	${GAMES_BINDIR:1}/glhexen2-demo
-	${GAMES_BINDIR:1}/hwcl
-	${GAMES_BINDIR:1}/glhwcl
-	${GAMES_BINDIR:1}/hwcl-demo
-	${GAMES_BINDIR:1}/glhwcl-demo"
-
-UIDEPEND=">=media-libs/libsdl-1.2.7
-	>=media-libs/sdl-mixer-1.2.5
-	3dfx? ( media-libs/glide-v3 )
-	alsa? ( >=media-libs/alsa-lib-1.0.7 )
-	midi? ( media-sound/timidity++ )
-	opengl? ( virtual/opengl )"
-
-# Launcher depends from GTK+ libs
-LNCHDEPEND="gtk? ( =x11-libs/gtk+-2* )"
-
-# xdelta is needed to manually run the patch script
-RDEPEND="!games-fps/uhexen2-cvs
-	${UIDEPEND}
-	${LNCHDEPEND}
-	demo? ( >=games-fps/hexen2-demodata-${DEMO_PV} )
-	lights? ( games-fps/hexen2-lights )
-	>=dev-util/xdelta-1.1.3-r1"
-DEPEND="${UIDEPEND}
-	${LNCHDEPEND}
-	x86? ( asm? ( >=dev-lang/nasm-0.98.38 ) )"
-
-S=${WORKDIR}/hexen2source-${MY_PV}
-dir="${GAMES_DATADIR}/${MY_PN}"
-
-pkg_setup() {
-	games_pkg_setup
-
-	if use midi ; then
-		if ! built_with_use "media-libs/sdl-mixer" timidity ; then
-			eerror "Recompile media-libs/sdl-mixer with 'timidity' USE flag."
-			die "sdl-mixer without timidity support detected"
-		fi
-		use sdlaudio && ewarn "MIDI music does not work with sdlaudio."
-	else
-		ewarn "MIDI support disabled! MIDI music won't be played at all."
-		ewarn "If you want to hear it, recompile this package"
-		ewarn "with \"midi\" USE flag enabled."
-	fi
-
-	use alsa || ewarn "alsa is the recommended sound driver."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cd hexen2
-	epatch "${S}/00_Patches/external-music-file-support.diff"
-	cd ..
-
-	# Whether to use the demo directory
-	local demo
-	use demo && demo="/demo"
-
-	# Use default basedir - has 2 variations
-	sed -i \
-		-e "s:parms.basedir = cwd;:parms.basedir = \"${dir}${demo}\";:" \
-		-e "s:parms.basedir = \".\";:parms.basedir = \"${dir}${demo}\";:" \
-		{hexen2,hexen2/server,hexenworld/{Client,Server}}/sys_unix.c \
-		|| die "sed sys_unix.c failed"
-
-	# Change default sndspeed from 11025 to 44100,
-	# to improve the quality/reliability.
-	sed -i \
-		-e "s:desired_speed = 11025:desired_speed = 44100:" \
-		{hexen2,hexenworld/Client}/snd_dma.c || die "sed snd_dma.c failed"
-
-	# Change patch script to be suitable
-	sed -i \
-		-e "s:chmod :#chmod :" \
-		-e 's:"xdelta113":"/usr/bin/xdelta":' \
-		-e "s:./xdelta113:xdelta": \
-		"${WORKDIR}"/update_xdelta.sh || die "sed update_xdelta.sh failed"
-
-	# Honour Portage CFLAGS also when debuggins is enabled
-	use debug && append-flags "-g2"
-	for u in `grep -lr '\-g \-Wall' *`; do
-		sed -i \
-		-e "s/^CFLAGS \:\= \-g \-Wall/CFLAGS \:\= ${CFLAGS}/" \
-		${u} || die "sed ${u} failed"
-	done
-
-	if use demo ; then
-		# Allow lightmaps in demo
-		sed -i \
-			-e "s:!override_pack:0:" \
-			hexen2/common.c || die "sed common.c demo failed"
-	fi
-
-	if use gtk ; then
-		# Tweak the default games data dir for graphical launcher
-		sed -i \
-			-e "/int basedir_nonstd/s:= 0:= 1:" \
-			-e "/game_basedir\[0\]/d" \
-			launcher/config_file.c || die "sed config_file.c failed"
-		# Tweak the default name for binary executables,if DEMO version is enabled
-		if use demo ; then
-			sed -i \
-				-e "/BINARY_NAME/s:\"$:-demo\":" \
-				launcher/games.h || die "sed games.h failed"
-		fi
-	fi
-
-	rm -rf docs/{COMPILE,COPYING,README.win32}
-}
-
-src_compile() {
-
-	local h2bin="h2" hwbin="hw" link_gl_libs="no" opts
-	local \
-		h2bin="h2" hwbin="hw" \
-		USE_ALSA="no" \
-		USE_CDAUDIO="no" \
-		LINK_GL_LIBS="no" \
-		USE_MIDI="no" \
-		OPT_EXTRA="no" \
-		USE_OSS="no" \
-		USE_SDLCD="no" \
-		X86_ASM="no" \
-		USE_3DFX="no" \
-		opts
-
-	if use opengl ; then
-		h2bin="${h2bin} gl${h2bin}"
-		hwbin="${hwbin} gl${hwbin}"
-		use dynamic && LINK_GL_LIBS="yes"
-	fi
-
-	use debug && opts="${opts} DEBUG=1"
-	use demo && opts="${opts} DEMO=1"
-
-	use alsa && USE_ALSA="yes"
-	use cdaudio && USE_CDAUDIO="yes"
-	use optimize-cflags && OPT_EXTRA="yes"
-	use oss && USE_OSS="yes"
-	use sdlcd && USE_SDLCD="yes"
-	use midi && USE_MIDI="yes"
-	use x86 && use asm && X86_ASM="yes"
-	use 3dfx && USE_3DFX="yes"
-
-	if use gtk ; then
-	# Build launcher
-		cd "${S}/launcher"
-		einfo "Building graphical launcher"
-		emake \
-			AUTOTOOLS=1 \
-			${opts} \
-			CPUFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)" \
-			|| die "emake launcher failed"
-	fi
-
-	if use tools ; then
-		# Build Hexen2 utils
-		cd "${S}/utils"
-		einfo "Building utils"
-		local utils_list="hcc maputils genmodel qfiles dcc jsh2color hcc_old texutils/bsp2wal texutils/lmp2pcx"
-		for x in ${utils_list}
-		do
-			emake -C ${x} \
-				${opts} \
-				CPUFLAGS="${CFLAGS}" \
-				CC="$(tc-getCC)" \
-				|| die "emake ${x} failed"
-		done
-	fi
-
-	if use dedicated ; then
-		# Dedicated Server
-		cd "${S}/${MY_PN}"
-		einfo "Building Dedicated Server"
-		emake \
-			${opts} \
-			OPT_EXTRA=${OPT_EXTRA} \
-			CPUFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)" \
-			-f Makefile.sv \
-			|| die "emake Dedicated server failed"
-	fi
-
-	if use hexenworld ; then
-		if use tools; then
-			# Hexenworld utils
-			local hw_utils="hwmquery hwrcon"
-			einfo "Building Hexenworld utils"
-			cd "${S}/hw_utils"
-			for x in ${hw_utils} ; do
-				emake \
-					${opts} \
-					CPUFLAGS="${CFLAGS}" \
-					CC="$(tc-getCC)" \
-					-C ${x} \
-					|| die "emake ${x} failed"
-			done
-		fi
-
-		# Hexenworld
-		einfo "Building Hexenworld servers"
-		cd "${S}"/hexenworld
-		# Hexenworld servers
-		emake \
-			${opts} \
-			CPUFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)" \
-			-C Server \
-			|| die "emake HexenWorld Server failed"
-		emake \
-			${opts} \
-			CPUFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)" \
-			-C Master \
-			|| die "emake HexenWorld Master failed"
-
-		# Hexenworld client
-		einfo "Building Hexenworld client(s)"
-		for m in ${hwbin} ; do
-			emake -C Client clean
-			emake \
-				${opts} \
-				USE_ALSA=${USE_ALSA} \
-				USE_OSS=${USE_OSS} \
-				USE_CDAUDIO=${USE_CDAUDIO} \
-				USE_MIDI=${USE_MIDI} \
-				USE_SDLAUDIO=${USE_SDLAUDIO} \
-				USE_SDLCD=${USE_SDLCD} \
-				USE_X86_ASM=${X86_ASM} \
-				OPT_EXTRA=${OPT_EXTRA} \
-				LINK_GL_LIBS=${LINK_GL_LIBS} \
-				USE_3DFXGAMMA="${USE_3DFX}" \
-				CPUFLAGS="${CFLAGS}" \
-				CC="$(tc-getCC)" \
-				${m} \
-				-C Client \
-				|| die "emake Hexenworld Client (${m}) failed"
-		done
-	fi
-
-	# Hexen 2 game executable
-	cd "${S}/${MY_PN}"
-
-	einfo "Building UHexen2 game executable(s)"
-	for m in ${h2bin} ; do
-		emake clean
-		emake \
-			${opts} \
-			USE_ALSA=${USE_ALSA} \
-			USE_OSS=${USE_OSS} \
-			USE_CDAUDIO=${USE_CDAUDIO} \
-			USE_MIDI=${USE_MIDI} \
-			USE_SDLAUDIO=${USE_SDLAUDIO} \
-			USE_SDLCD=${USE_SDLCD} \
-			USE_X86_ASM=${X86_ASM} \
-			OPT_EXTRA=${OPT_EXTRA} \
-			LINK_GL_LIBS=${LINK_GL_LIBS} \
-			USE_3DFXGAMMA=${USE_3DFX} \
-			CPUFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)" \
-			${m} \
-			|| die "emake Hexen2 (${m}) failed"
-	done
-
-}
-
-src_install() {
-	local demo demo_title demo_suffix
-	use demo && demo="-demo" && demo_title=" (Demo)" && demo_suffix="demo"
-
-	newicon hexen2/icons/h2_32x32x4.png ${PN}.png || die
-
-	make_desktop_entry "${MY_PN}${demo}" "Hexen 2${demo_title}" ${PN}.png
-	newgamesbin "${MY_PN}/${MY_PN}" "${MY_PN}${demo}" \
-		|| die "newgamesbin ${MY_PN} failed"
-
-	if use opengl ; then
-		make_desktop_entry "gl${MY_PN}${demo}" "GLHexen 2${demo_title}" ${PN}.png
-		newgamesbin "${MY_PN}/gl${MY_PN}" "gl${MY_PN}${demo}" \
-			|| die "newgamesbin gl${MY_PN} failed"
-	fi
-
-	if use dedicated ; then
-		newgamesbin "${MY_PN}"/h2ded "${MY_PN}${demo}-ded" \
-			|| die "newgamesbin h2ded failed"
-	fi
-
-	if use hexenworld ; then
-		if use tools; then
-			# Hexenworld utils
-			dobin hw_utils/hwmquery/hwmquery || die "dobin hwmquery failed"
-			dobin hw_utils/hwrcon/{hwrcon,hwterm} || die "dobin hwrcon/hwterm failed"
-
-			dodoc hw_utils/hwmquery/hwmquery.txt || die "dodoc hwmquery.txt failed"
-			dodoc hw_utils/hwrcon/{hwrcon,hwterm}.txt \
-			|| die "dodoc hwrcon/hwterm.txt failed"
-		fi
-
-		# Hexenworld Servers
-		newgamesbin hexenworld/Server/hwsv hwsv${demo} \
-			|| die "newgamesbin hwsv failed"
-
-		newgamesbin hexenworld/Master/hwmaster hwmaster${demo} \
-			|| die "newgamesbin hwmaster failed"
-
-		# HexenWorld client(s)
-		newicon hexenworld/icons/hw2_32x32x8.png hwcl.png || die
-
-		make_desktop_entry \
-			"hwcl${demo}" "Hexen 2${demo_title} Hexenworld Client" hwcl.png
-		newgamesbin "hexenworld/Client/hwcl" "hwcl${demo}" \
-			|| die "newgamesbin hwcl failed"
-
-		if use opengl ; then
-			make_desktop_entry \
-				"glhwcl${demo}" "GLHexen 2${demo_title} Hexenworld Client" hwcl.png
-			newgamesbin "hexenworld/Client/glhwcl" "glhwcl${demo}" \
-				|| die "newgamesbin glhwcl failed"
-		fi
-
-		insinto "${dir}"/${demo_suffix}
-		doins -r "${WORKDIR}"/hw || die "doins hexenworld pak failed"
-	fi
-
-	if use gtk ; then
-		# GTK launcher
-		local lnch_name="h2launcher"
-		use demo && lnch_name="h2demo"
-		newgamesbin launcher/${lnch_name} h2launcher \
-			|| die "newgamesbin h2launcher failed"
-		make_desktop_entry \
-			"h2launcher" "Hexen 2${demo_title} Launcher" ${PN}.png
-	fi
-
-	# Forge a new useful document 8)
-	head -22 "00_Patches/external-music-file-support.diff" > \
-	"docs/external_music.README" || die "make readme failed"
-
-	dodoc docs/*
-
-	if ! use demo ; then
-		# Install updated game data
-		insinto "${dir}"
-		doins -r "${WORKDIR}"/{data1,patchdata,portals,siege} || die
-		# Patching should really be done by a future "hexen2-data" ebuild.
-		# But this works for now.
-		doins "${WORKDIR}"/update_xdelta.sh || die
-		dodoc "${WORKDIR}"/*.txt
-	fi
-
-	if use tools ; then
-		dobin \
-			utils/bin/{bsp2wal,bspinfo,dhcc,genmodel,hcc} \
-			|| die "dobin utils part 1 failed"
-		dobin \
-			utils/bin/{jsh2colour,light,lmp2pcx,qbsp,qfiles,vis} \
-			|| die "dobin utils part 2 failed"
-		newbin utils/hcc_old/hcc hcc_old || die "newbin hcc_old failed"
-		docinto utils
-		dodoc utils/README || die "dodoc README failed"
-		newdoc utils/dcc/README README.dcc || die "newdoc dcc failed"
-		dodoc utils/dcc/dcc.txt || die "dodoc dcc.txt failed"
-		newdoc utils/hcc/README README.hcc || die "newdoc hcc failed"
-		newdoc utils/hcc_old/README hcc_old.txt || die "newdoc hcc_old failed"
-		newdoc utils/jsh2color/README README.jsh2color \
-			|| die "newdoc README.jsh2color failed"
-		newdoc utils/jsh2color/ChangeLog ChangeLog.jsh2color \
-			|| die "newdoc Changelog.jsh2color failed"
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if use demo ; then
-		elog "uhexen2 has been compiled specifically to play the demo maps."
-		elog "Example command-line:"
-		elog "   hexen2-demo -width 1024 -height 768 -conwidth 640"
-		echo
-	else
-		elog "To play the demo, emerge with the 'demo' USE flag."
-		elog
-		elog "For the Hexen 2 original game..."
-		elog "Put the following files into ${dir}/data1 before playing:"
-		elog "   pak0.pak pak1.pak"
-		elog "Then to play:  hexen2"
-		elog
-		elog "For the 'Portal of Praevus' mission pack..."
-		elog "Put the following file into ${dir}/portals before playing:"
-		elog "   pak3.pak"
-		elog "Then to play:  hexen2 -portals"
-		elog
-		elog "To ensure the data files from the CD are patched, run as root:"
-		elog "   cd ${dir} && sh update_xdelta.sh"
-		elog
-		elog "Example command-line:"
-		elog "   hexen2 -width 1024 -height 768 -conwidth 640"
-		echo
-	fi
-	if use gtk ; then
-		elog "You've also installed a nice graphical launcher. Simply run:"
-		elog
-		elog "   h2launcher"
-		elog
-		elog "to enjoy it :)"
-		echo
-	fi
-	if use tools ; then
-		if use hexenworld; then
-			elog "You've also installed some Hexenworld utility:"
-			elog
-			elog " - hwmquery (console app to query HW master servers)"
-			elog " - hwrcon (remote interface to HW rcon command)"
-			elog " - hwterm (HW remote console terminal)"
-			echo
-		fi
-		elog "You've also installed some Hexen2 utility"
-		elog "(useful for mod developing)"
-		elog
-		elog " - dhcc (old progs.dat compiler/decompiler)"
-		elog " - genmodel (3-D model grabber)"
-		elog " - hcc (HexenC compiler)"
-		elog " - hcc_old (old version of HexenC compiler)"
-		elog " - jsh2color (light colouring utility)"
-		elog " - maputils (Map compiling tools: bspinfo, light, qbsp, vis)"
-		elog " - qfiles (build pak files and regenerate bsp models)"
-		elog " - bsp2wal (extract all textures from a bsp file)"
-		elog " - lmp2pcx (convert hexen2 texture data into pcx and tga)"
-		elog
-		elog "See relevant documentation for further informations"
-		echo
-	fi
-}