Version bump, bug #178778

(Portage version: 2.1.2.7)

7 files changed, 152 insertions, 151 deletions

diff --git a/games-fps/warsow/ChangeLog b/games-fps/warsow/ChangeLog
index afdbb2007276..56009596c4bc 100644
--- a/games-fps/warsow/ChangeLog
+++ b/games-fps/warsow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/warsow
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.3 2007/02/02 00:26:13 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/ChangeLog,v 1.4 2007/05/20 19:57:41 nyhm Exp $
+
+*warsow-0.3 (20 May 2007)
+
+  20 May 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/warsow-0.3-build.patch, +warsow-0.3.ebuild:
+  Version bump, bug #178778
 
 *warsow-0.21-r1 (02 Feb 2007)
 
diff --git a/games-fps/warsow/files/digest-warsow-0.21-r1 b/games-fps/warsow/files/digest-warsow-0.21-r1
deleted file mode 100644
index 99a42184c662..000000000000
--- a/games-fps/warsow/files/digest-warsow-0.21-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0ee0835a1fe9092c9562113253d0f79a warsow_0.21_linux.tar.gz 80219586
-RMD160 1d4e5672a79bb38c594e9bcfcad09b6a1a59c47d warsow_0.21_linux.tar.gz 80219586
-SHA256 fa927e2559620bea8926eed141106815c28099c8fff227f21463ebb1be9748d4 warsow_0.21_linux.tar.gz 80219586
-MD5 ce66288c5d345c8cf3985cbb1e51e199 warsow_0.21_sdk.zip 7469755
-RMD160 416e646463fd4a4bc51bf84eebceed725dab1744 warsow_0.21_sdk.zip 7469755
-SHA256 81b9fd550d826cb0b466b05106bff1729270ceb7682debb4c0a333b8b8dfa3f7 warsow_0.21_sdk.zip 7469755
diff --git a/games-fps/warsow/files/digest-warsow-0.3 b/games-fps/warsow/files/digest-warsow-0.3
new file mode 100644
index 000000000000..710e607993c3
--- /dev/null
+++ b/games-fps/warsow/files/digest-warsow-0.3
@@ -0,0 +1,9 @@
+MD5 d5eac4a33b3543dbc40d984b84e657f8 warsow.png 1692
+RMD160 098a1505a74a20eb4bdfeda4cf2c537a9524ce23 warsow.png 1692
+SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 warsow.png 1692
+MD5 dc0832250b08ae10c69d9e89994ef437 warsow_0.3_linux.tar.gz 82709062
+RMD160 001e715c0d338525b14d9f87fd205652f8491e9d warsow_0.3_linux.tar.gz 82709062
+SHA256 170ebe80dba2065bd18047146aa98ef4bc7194b3d94a4064f6f66f7c95a1b671 warsow_0.3_linux.tar.gz 82709062
+MD5 e73da99e2f61218c53c9d07cbb3ba87f warsow_0.3_sdk.zip 11273935
+RMD160 17e7f244170c0daf8f9c2797a3ceb8a168adac7c warsow_0.3_sdk.zip 11273935
+SHA256 8ee39f81894df0db00d70801f675b7ab906857bda9a58fcb3841e8f3b604347f warsow_0.3_sdk.zip 11273935
diff --git a/games-fps/warsow/files/warsow-0.21-inverted-mouse.patch b/games-fps/warsow/files/warsow-0.21-inverted-mouse.patch
deleted file mode 100644
index 5d39e2ef01b7..000000000000
--- a/games-fps/warsow/files/warsow-0.21-inverted-mouse.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- source/linux/in_x11.c
-+++ source/linux/in_x11.c
-@@ -589,10 +589,8 @@
- 					}

- 					else

- 					{

--						mx = -((int)event.xmotion.x - mwx);

--						my = -((int)event.xmotion.y - mwy);

--						mwx = event.xmotion.x;

--						mwy = event.xmotion.y;

-+						mx += ((int)event.xmotion.x - mwx);

-+						my += ((int)event.xmotion.y - mwy);

- 

- 						if (mx || my)

- 							dowarp = qtrue;

diff --git a/games-fps/warsow/files/warsow-0.3-build.patch b/games-fps/warsow/files/warsow-0.3-build.patch
new file mode 100644
index 000000000000..86510a42de7a
--- /dev/null
+++ b/games-fps/warsow/files/warsow-0.3-build.patch
@@ -0,0 +1,37 @@
+--- source/Makefile
++++ source/Makefile
+@@ -100,9 +100,9 @@
+ LOCALBASE?=/usr/local
+ X11BASE?=/usr/X11R6
+ 
+-CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -Wall
+-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
+-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
++CFLAGS_COMMON=$(CFLAGS) -I. -fno-strict-aliasing -Wall
++CFLAGS_RELEASE=-DNDEBUG
++CFLAGS_DEBUG=-D_DEBUG
+ ifeq ($(DEBUG_BUILD),YES)
+ CFLAGS_COMMON+=$(CFLAGS_DEBUG)
+ else
+@@ -116,7 +116,7 @@
+ ifeq ($(OS),FreeBSD)
+ LDFLAGS_COMMON=-L/usr/local/lib -lm
+ else
+-LDFLAGS_COMMON=-L/usr/local/lib -ldl -lm
++LDFLAGS_COMMON=$(LDFLAGS) -ldl -lm
+ endif
+ 
+ ifeq ($(ARCH),x86_64)
+@@ -287,10 +287,10 @@
+ 
+ all: client openal qf ded cgame game ui irc
+ 
+-client: $(BUILDDIRS) message-client compile-client link-client start-script-client
++client: $(BUILDDIRS) message-client compile-client link-client
+ openal: $(BUILDDIRS) message-openal compile-openal link-openal
+ qf: $(BUILDDIRS) message-qf compile-qf link-qf
+-ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
++ded: $(BUILDDIRS) message-ded compile-ded link-ded
+ cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
+ game: $(BUILDDIRS) message-game compile-game link-game
+ ui: $(BUILDDIRS) message-ui compile-ui link-ui
diff --git a/games-fps/warsow/warsow-0.21-r1.ebuild b/games-fps/warsow/warsow-0.21-r1.ebuild
deleted file mode 100644
index eab7c5c692c9..000000000000
--- a/games-fps/warsow/warsow-0.21-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.21-r1.ebuild,v 1.2 2007/04/06 05:34:06 nyhm Exp $
-
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
-HOMEPAGE="http://www.warsow.net/"
-SRC_URI="ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${PN}_${PV/_/}_linux.tar.gz
-	ftp://ftp.club-internet.fr/pub/games/nofrag/${PN}/${PN}_${PV/_/}_sdk.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated irc openal sdl"
-
-UIRDEPEND="media-libs/jpeg
-	media-libs/libogg
-	media-libs/libvorbis
-	net-misc/curl
-	virtual/opengl
-	>=media-libs/libsdl-1.2.8-r1
-	>=media-libs/sdl-sound-1.0.1-r1
-	openal? ( media-libs/openal )
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext"
-UIDEPEND="x11-proto/xf86dgaproto
-	x11-proto/xf86vidmodeproto"
-RDEPEND="sdl? ( ${UIRDEPEND} )
-	!sdl? ( !dedicated? ( ${UIRDEPEND} ) )"
-DEPEND="${RDEPEND}
-	sdl? ( ${UIDEPEND} )
-	!sdl? ( !dedicated? ( ${UIDEPEND} ) )
-	app-arch/unzip"
-
-S=${WORKDIR}/source
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Make fs_usehomedir default to 1, so the game will write to ~/.warsow/
-	# Make fs_basepath default to correct path.
-	# Add libdir as game directory.
-	sed -i qcommon/files.c \
-		-e 's:"fs_usehomedir", "0":"fs_usehomedir", "1":' \
-		-e "s:\"fs_basepath\", \"\.\":\"fs_basepath\", \"${GAMES_DATADIR}/${PN}\":" \
-		|| die "sed files.c failed"
-
-	# Remove pre-compiled binaries, because they are compiled in src_compile()
-	# Also remove the startup scripts.
-	rm -f "${WORKDIR}"/${PN}/{${PN}*,wsw_server*}
-	rm -rf "${WORKDIR}"/${PN}/libs/*.so
-
-	# Move docs to a convenient directory, away from the files to be installed.
-	rm -f "${WORKDIR}"/${PN}/docs/gnu.txt
-	mv "${WORKDIR}"/${PN}/docs "${S}"
-
-	sed -i Makefile \
-		-e '/^CFLAGS_RELEASE/s/=.* \(-fno.* \).* .* /=\1/' \
-		-e '/^CFLAGS_DEBUG/s/-O0 -ggdb/-fno-strict-aliasing/' \
-		|| die "sed Makefile failed"
-
-	epatch "${FILESDIR}"/${P}-inverted-mouse.patch
-}
-
-src_compile() {
-	yesno() { useq $1 && echo YES || echo NO ; }
-
-	local client="NO"
-
-	if use sdl || ! use dedicated ; then
-		client="YES"
-	fi
-
-	emake \
-		BUILD_CLIENT=${client} \
-		BUILD_SERVER=$(yesno dedicated) \
-		BUILD_IRC=$(yesno irc) \
-		BUILD_SND_QF=${client} \
-		BUILD_SND_OPENAL=$(yesno openal) \
-		DEBUG_BUILD=$(yesno debug) \
-		BINDIR=release \
-		SERVER_EXE=${PN}-ded \
-		CLIENT_EXE=${PN} \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		|| die "emake failed"
-
-	mv -f release/basewsw/*.so "${WORKDIR}" || die "mv *.so failed"
-	cp -rf release/basewsw "${WORKDIR}"/${PN} || die "cp basewsw failed"
-}
-
-src_install() {
-	cd "${WORKDIR}"/${PN}
-
-	if use sdl || use openal || ! use dedicated ; then
-		dogamesbin "${S}"/release/${PN} || die "dogamesbin ${PN} failed"
-		make_desktop_entry ${PN} "Warsow"
-	fi
-
-	if use dedicated ; then
-		dogamesbin "${S}"/release/${PN}-ded || die "dogamesbin ${PN}-ded failed"
-	fi
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r * || die "doins failed"
-
-	exeinto "$(games_get_libdir)"/${PN}/basewsw
-	local lib
-	for lib in $(cd "${WORKDIR}" && ls -A *.so) ; do
-		doexe "${WORKDIR}"/${lib} || die "doexe ${lib} failed"
-		dosym "$(games_get_libdir)"/${PN}/basewsw/${lib} \
-			"${GAMES_DATADIR}"/${PN}/basewsw/ || die "dosym basewsw failed"
-	done
-
-	exeinto "$(games_get_libdir)"/${PN}
-	local lib2
-	for lib2 in $(cd "${S}"/release/libs && ls -A *.so) ; do
-		doexe "${S}"/release/libs/${lib2} || die "doexe ${lib2} failed"
-		dosym "$(games_get_libdir)"/${PN}/${lib2} \
-			"${GAMES_DATADIR}"/${PN}/libs/ || die "dosym libs failed"
-	done
-
-	dodoc "${S}"/docs/*
-	prepgamesdirs
-}
diff --git a/games-fps/warsow/warsow-0.3.ebuild b/games-fps/warsow/warsow-0.3.ebuild
new file mode 100644
index 000000000000..d63bf511d216
--- /dev/null
+++ b/games-fps/warsow/warsow-0.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-0.3.ebuild,v 1.1 2007/05/20 19:57:41 nyhm Exp $
+
+inherit eutils toolchain-funcs games
+
+DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
+HOMEPAGE="http://www.warsow.net/"
+SRC_URI="http://codernet.org/${PN}/${P/-/_}_linux.tar.gz
+	http://codernet.org/${PN}/${P/-/_}_sdk.zip
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated irc openal opengl"
+
+UIRDEPEND="media-libs/jpeg
+	media-libs/libvorbis
+	media-libs/libsdl
+	net-misc/curl
+	virtual/opengl
+	x11-libs/libXinerama
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+	openal? ( media-libs/openal )"
+RDEPEND="opengl? ( ${UIRDEPEND} )
+	!opengl? ( !dedicated? ( ${UIRDEPEND} ) )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	x11-misc/makedepend"
+
+S=${WORKDIR}/source
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -f "${WORKDIR}"/${PN}/docs/gnu.txt
+
+	sed -i \
+		-e '/fs_usehomedir =/ s:0:1:' \
+		-e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
+		qcommon/files.c \
+		|| die "sed files.c failed"
+
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	yesno() { use ${1} && echo YES || echo NO ; }
+
+	if use opengl || ! use dedicated ; then
+		local client="YES"
+	else
+		local client="NO"
+	fi
+
+	emake \
+		BUILD_CLIENT=${client} \
+		BUILD_SERVER=$(yesno dedicated) \
+		BUILD_IRC=$(yesno irc) \
+		BUILD_SND_OPENAL=$(yesno openal) \
+		DEBUG_BUILD=$(yesno debug) \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		|| die "emake failed"
+}
+
+src_install() {
+	cd release
+
+	if use opengl || ! use dedicated ; then
+		newgamesbin ${PN}.* ${PN} || die "newgamesbin ${PN} failed"
+		doicon "${DISTDIR}"/${PN}.png
+		make_desktop_entry ${PN} Warsow
+	fi
+
+	if use dedicated ; then
+		newgamesbin wsw_server.* ${PN}-ded || die "newgamesbin ${PN}-ded failed"
+	fi
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe */*.so || die "doexe failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r "${WORKDIR}"/${PN}/basewsw || die "doins failed"
+
+	local so
+	for so in basewsw/*.so ; do
+		dosym "$(games_get_libdir)"/${PN}/${so##*/} \
+			"${GAMES_DATADIR}"/${PN}/${so} || die "dosym ${so} failed"
+	done
+
+	dosym "$(games_get_libdir)"/${PN} "${GAMES_DATADIR}"/${PN}/libs \
+		|| die "dosym libs failed"
+
+	dodoc "${WORKDIR}"{/${PN},}/docs/*
+	prepgamesdirs
+}