games-fps/uhexen2-cvs: Version bump (and drop old)

svn path=/sunrise/; revision=4335

3 files changed, 26 insertions, 14 deletions

diff --git a/games-fps/uhexen2-cvs/ChangeLog b/games-fps/uhexen2-cvs/ChangeLog
index 904d60a78..c13ce772a 100644
--- a/games-fps/uhexen2-cvs/ChangeLog
+++ b/games-fps/uhexen2-cvs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jul 2007; Davide Cendron (scen) <scen@gentoo.org>
+  -uhexen2-cvs-20070722.ebuild, +uhexen2-cvs-20070725.ebuild:
+  Version bump (and drop old)
+
   23 Jul 2007; Davide Cendron (scen) <scen@gentoo.org>
   -uhexen2-cvs-20070715.ebuild, +uhexen2-cvs-20070722.ebuild:
   Version bump (and drop old)
diff --git a/games-fps/uhexen2-cvs/Manifest b/games-fps/uhexen2-cvs/Manifest
index 748ce5dc3..457e8b7cf 100644
--- a/games-fps/uhexen2-cvs/Manifest
+++ b/games-fps/uhexen2-cvs/Manifest
@@ -1,6 +1,6 @@
-DIST gamedata-all-1.19-rc1.tgz 3703567 RMD160 11a9181428bd1e964d3513fb46cb1e35bc3ef292 SHA1 af9f96446c5607cf0974fa0b898e6925de9723d8 SHA256 3914c4af9acbabdfbec772bdc61a43bc265820ddb33aec4ab804e434105ff42b
+DIST gamedata-all-1.19-rc2.tgz 3703813 RMD160 1be90cca1a76130ca5c602a7092c3aae3c110465 SHA1 6f2a626a95f368370acf2230932ee7373cecf1f1 SHA256 00f63a7c1aafae08f3786d5d78312f602a667d9ee8fcba43515a505223afe7cd
 DIST hexenworld-pakfiles-0.15.tgz 4956848 RMD160 cd6cafb8e597028e1405638b7a60e1f30ce6d846 SHA1 57af1db9a92f2e41f8fa0f1e5f779f4ec648e730 SHA256 215e92f58bc7ed6098f076b45a20b94092599bfce6c4cd00f2895b24a6ee72fe
-DIST uhexen2-cvs-20070722.tgz 6314051 RMD160 1969b7d50fd77cbe1b3aa3b77fb2bb9ab51d3281 SHA1 c39ff8110d1d77ce9f7e8be2c38fb5217e6b28ff SHA256 de415ede510fc18c9ea498a08a2bafb3a1e5fc644d726e5e13493ca68ca0ba85
-EBUILD uhexen2-cvs-20070722.ebuild 12579 RMD160 a59057dec6b2e883a3c36d2ecd3ef2ff7bdcce5f SHA1 ee0ff29842cbe4a021920bc9425a65ddef4d6534 SHA256 e2c7758048e82561ac4b3cb73fa2efa75f102556e1f26585f21672e9b0fa40b4
-MISC ChangeLog 3317 RMD160 69ca6aa25e71fc9a22067b7336ff0d39f05f3592 SHA1 f86b44b48b260dc2d8217f4bd61d96941b0928b3 SHA256 47a1424a414b4e6b0e1977375b21a5399b0975bcc294f06e9de7bb662b890771
+DIST uhexen2-cvs-20070725.tgz 6313977 RMD160 ba92fde3575eea70529184e87dc1e5f5e6d97077 SHA1 d778bcf36606c74da9b605cda89b0c5898c78324 SHA256 bc42c167322a4da37ed248c69c90550cdddc0d9bacd1e3092f217761cd76ec94
+EBUILD uhexen2-cvs-20070725.ebuild 12792 RMD160 c55d10bbfa3cf15fa6c977c88f818339ad59205e SHA1 3ebd7e10d6ac9513f90aa7392a9b9270e0b35fc7 SHA256 8f9c97b28ba41a71fc6c941da4d3bb38877dc2d853cceae1f3a906d6dfeb732d
+MISC ChangeLog 3465 RMD160 994288c9045948bbf9a51a30ff88cc2703fb290c SHA1 d4dd16d60b1574ad90e9127499b88bca1ea76723 SHA256 55f0286b5e29574a1520e1faa8aba856d512bd91a79c5bb7234b302e4c80f1e0
 MISC metadata.xml 322 RMD160 f4bfe5b65994822f6e2c353556232c8eac25c50c SHA1 5e06f5726217482155d7eadde86107b1def891fe SHA256 8bbf84c0f56f602764f6041d84a1376dce6300548b116abde0dbd9d241218977
diff --git a/games-fps/uhexen2-cvs/uhexen2-cvs-20070722.ebuild b/games-fps/uhexen2-cvs/uhexen2-cvs-20070725.ebuild
index d90820ecc..7ba88c5f9 100644
--- a/games-fps/uhexen2-cvs/uhexen2-cvs-20070722.ebuild
+++ b/games-fps/uhexen2-cvs/uhexen2-cvs-20070725.ebuild
@@ -4,7 +4,7 @@
 
 inherit eutils flag-o-matic toolchain-funcs versionator games
 
-DATA_PV="1.19-rc1"
+DATA_PV="1.19-rc2"
 HW_PV="0.15"
 MY_PN="hexen2"
 DEMO_PV="1.4.1"
@@ -49,7 +49,7 @@ RDEPEND="!games-fps/uhexen2
 	>=dev-util/xdelta-1.1.3-r1"
 DEPEND="${UIDEPEND}
 	${LNCHDEPEND}
-	x86? ( >=dev-lang/nasm-0.98.38 )"
+	asm? ( >=dev-lang/nasm-0.98.38 )"
 
 S="${WORKDIR}/uhexen2-cvs-${PV}"
 dir="${GAMES_DATADIR}/${MY_PN}"
@@ -104,6 +104,14 @@ src_unpack() {
 		-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 \
@@ -125,7 +133,7 @@ src_unpack() {
 		fi
 	fi
 
-	rm -rf docs/{activision,COMPILE,COPYING,LICENSE,README.win32}
+	rm -rf docs/{COMPILE,COPYING,README.win32}
 }
 
 src_compile() {
@@ -165,7 +173,7 @@ src_compile() {
 	if use gtk ; then
 	# Build launcher
 		cd "${S}/launcher"
-		einfo "Compiling graphical launcher"
+		einfo "Building graphical launcher"
 		emake \
 			AUTOTOOLS=1 \
 			${opts} \
@@ -177,7 +185,7 @@ src_compile() {
 	if use tools ; then
 		# Build Hexen2 utils
 		cd "${S}/utils"
-		einfo "Compiling 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
@@ -192,7 +200,7 @@ src_compile() {
 	if use dedicated ; then
 		# Dedicated Server
 		cd "${S}/${MY_PN}"
-		einfo "Compiling Dedicated Server"
+		einfo "Building Dedicated Server"
 		emake \
 			${opts} \
 			OPT_EXTRA=${OPT_EXTRA} \
@@ -206,7 +214,7 @@ src_compile() {
 		if use tools; then
 			# Hexenworld utils
 			local hw_utils="hwmquery hwrcon"
-			einfo "Compiling Hexenworld utils"
+			einfo "Building Hexenworld utils"
 			cd "${S}/hw_utils"
 			for x in ${hw_utils} ; do
 				emake \
@@ -219,7 +227,7 @@ src_compile() {
 		fi
 
 		# Hexenworld
-		einfo "Compiling Hexenworld servers"
+		einfo "Building Hexenworld servers"
 		cd "${S}"/hexenworld
 		# Hexenworld servers
 		emake \
@@ -236,7 +244,7 @@ src_compile() {
 			|| die "emake HexenWorld Master failed"
 
 		# Hexenworld client
-		einfo "Compiling Hexenworld client(s)"
+		einfo "Building Hexenworld client(s)"
 		for m in ${hwbin} ; do
 			emake -C Client clean
 			emake \
@@ -262,7 +270,7 @@ src_compile() {
 	# Hexen 2 game executable
 	cd "${S}/${MY_PN}"
 
-	einfo "Compiling UHexen2 game executable(s)"
+	einfo "Building UHexen2 game executable(s)"
 	for m in ${h2bin} ; do
 		emake clean
 		emake \