[patch] patch 0.5-r1 -> 0.61

warsow-0.61.ebuild.patch (text/plain), 2.21 KB, created by Dennis Schridde on 2011-04-27 15:52:46 UTC

--- ../../../gentoo/games-fps/warsow/warsow-0.5-r1.ebuild	2011-02-26 16:31:13.000000000 +0100
+++ warsow-0.61.ebuild	2011-04-27 17:40:22.456796335 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.5-r1.ebuild,v 1.6 2011/02/26 15:27:28 signals Exp $
+# $Header: $
 
 EAPI=2
 inherit eutils toolchain-funcs versionator games
@@ -8,8 +8,8 @@
 MY_P=${PN}_${PV}
 DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
 HOMEPAGE="http://www.warsow.net/"
-SRC_URI="http://static.warsow.net/release/${MY_P}_unified.zip
-	http://static.warsow.net/release/${MY_P}_sdk.zip
+SRC_URI="http://www.zcdn.org/dl/${MY_P}_unified.zip
+	http://www.zcdn.org/dl/${MY_P}_sdk.zip
 	mirror://gentoo/${PN}.png"
 
 LICENSE="GPL-2 warsow"
@@ -53,9 +53,10 @@
 	cd "${WORKDIR}"
 	rm -rf docs/old
 	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-openal.patch \
-		"${FILESDIR}"/${P}-pic.patch
+		"${FILESDIR}"/${PN}-0.6-build-game.patch \
+		"${FILESDIR}"/${PN}-0.6-build-no-start-scripts.patch \
+		"${FILESDIR}"/${PN}-0.6-dont-delete-angelscript.patch \
+		"${FILESDIR}"/${PN}-0.5-pic.patch
 }
 
 src_compile() {
@@ -82,6 +83,7 @@
 		arch=i386
 	fi
 
+	unset ARCH
 	emake \
 		BASE_ARCH=${arch} \
 		BINDIR=bin \
@@ -114,21 +116,21 @@
 	doexe */*.so || die "doexe failed"
 
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r "${WORKDIR}"/basewsw || die "doins failed"
+	doins -r "${WORKDIR}/${MY_P}_unified"/basewsw || die "doins failed"
+
+	if [ -e libs ] ; then
+		dodir "${GAMES_DATADIR}"/${PN}/libs || die "dodir failed"
+	fi
 
 	local so
 	for so in basewsw/*.so ; do
 		dosym "$(games_get_libdir)"/${PN}/${so##*/} \
 			"${GAMES_DATADIR}"/${PN}/${so} || die "dosym ${so} failed"
 	done
-
-	if [[ -e libs ]] ; then
-		dodir "${GAMES_DATADIR}"/${PN}/libs
-		for so in libs/*.so ; do
-			dosym "$(games_get_libdir)"/${PN}/${so##*/} \
-				"${GAMES_DATADIR}"/${PN}/${so} || die "dosym ${so} failed"
-		done
-	fi
+	for so in libs/*.so ; do
+		dosym "$(games_get_libdir)"/${PN}/${so##*/} \
+			"${GAMES_DATADIR}"/${PN}/${so} || die "dosym ${so} failed"
+	done
 
 	dodoc "${WORKDIR}"/docs/*
 	prepgamesdirs