[games-fps/urbanterror] fixed src_uri, new versions

4 files changed, 227 insertions, 4 deletions

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 81eed13..c888a67 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,10 +1,17 @@
 AUX curl_fix.patch 774 RMD160 9fa75c669b170d150e1d697c095316e9edb92bbd SHA1 7df67f4ec0612d4ae5eb88dda00bd611df0d7247 SHA256 23c4e4fbe43847bfc22dac63585874cf98340a7d12473c702524030193435e48
+AUX urbanterror-4.1.1788.210710-server-name.patch 2897 RMD160 a5e0c3702e060fe280407b05a158dcc6af7a667e SHA1 33acba44ed16aef61b8d0c17a85d3794bc82f4ae SHA256 bc8840941997e461c224c654d892d7a5222e9767b92307769876ddce7a6500ec
+AUX urbanterror-4.1.1807.251210-server-name.patch 2897 RMD160 a5e0c3702e060fe280407b05a158dcc6af7a667e SHA1 33acba44ed16aef61b8d0c17a85d3794bc82f4ae SHA256 bc8840941997e461c224c654d892d7a5222e9767b92307769876ddce7a6500ec
 AUX urbanterror-makefile.patch 633 RMD160 3e1073dd08aed3964477767b2c7efb6e2c9afc48 SHA1 de974ef4e7b43e17a0a3ef5a18da9cdfa344b7a0 SHA256 3e7e006581d63e6ef506b23df79396b8e30aaa0ee3f00e013f5d1fc8043ed02f
 DIST UrbanTerror_41_FULL.zip 754307397 RMD160 e7b46b8b70364f1556f057ab9adb35a54bd2b9a2 SHA1 bbe4262bc46f3ef43525ef338bdda05debf3e2c4 SHA256 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f
 DIST Urbanterror.svg 1592 RMD160 dd7cbf6216cc623fa9a14e0c384d662aa45657fb SHA1 6819d4d3d772fc4c7fe5004d17c8fc0a1cb46cab SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9
 DIST ioUrbanTerrorSource_2007_12_20.zip 17284593 RMD160 70aaea368729913a402b844cf598aa745cc79c06 SHA1 90f813fb991b762fb289a88e3fceb37ace2fd28c SHA256 96d58662852d31fa6ab03431120328dab7f36bf60010a2cfdc1b427d6ac23ce8
 DIST ioq3-1783-urt-git-240410.tar.7z 3244297 RMD160 a5622b1bf6cacd975c92881a5582cd4de86ffef6 SHA1 85ba6733a7f200bc470f50c510defa1a87ae9beb SHA256 b6f147ed0ef5b248d10ef7419121009248a32817accc769cc7964c8f8a7dab4d
+DIST ioq3-1788-urt-git-210710.tar.lzma 3663835 RMD160 4ae69c6b8423dfe529f9501494074df582c966d4 SHA1 5c2c606a67c1cefdd59572bf363f2389b5880865 SHA256 eee27de112bbdd4a39d12dd598ac1615954fe9de795419554b55dd40eb954cee
+DIST ioq3-1807-urt-251210-git-nobumpy.tar.lzma 276959 RMD160 142415861cda4f198f956870b36f2d4bf6a69b69 SHA1 fbff555ba4b4a1150e30c140548f733420d30e7b SHA256 cfbe56698083bd37cf367c216a54497267fe8789c71172ba56dc5d455420fc79
+DIST ioquake3-1807.tar.bz2 7054317 RMD160 6623385aa294907452816febdecfa5658eac8b17 SHA1 8470d58ac60da14b1e86d5944f1cd32198ab2baf SHA256 10d3fcee3cf41a063e686048740417c8d58496f3dff5745f897a8803318850c2
 DIST urbanterror.svg 1592 RMD160 dd7cbf6216cc623fa9a14e0c384d662aa45657fb SHA1 6819d4d3d772fc4c7fe5004d17c8fc0a1cb46cab SHA256 0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9
-EBUILD urbanterror-4.1.1783.240410.ebuild 3308 RMD160 1faf1b340640e0819fd4e4a922f876970c70cc16 SHA1 c00c604e168275efc78f54f1581770e158e29355 SHA256 14b2f6a8eb5cba7ce3e5ee27fc0f15a1f965ffd9f249497f825a8c63e496c90f
+EBUILD urbanterror-4.1.1783.240410.ebuild 3233 RMD160 f1682d3952417a20fb960dea5c573acc02db3596 SHA1 4157125cfcdd017cdee292291304a7bc04753b81 SHA256 5ff560d14f2978844f0c0875b3a159e802497f1e7a7d4278c1f524e673b7cef3
+EBUILD urbanterror-4.1.1788.210710.ebuild 3101 RMD160 b9a86026d25447e613765dae9e8a46ee510c98ac SHA1 06a15116bbcdf3ba25beb65cc60122b0aa552b81 SHA256 a1b4b6d43c43c3d4b98c794001149f0de4fa000a98d0e333701898b2e51d4563
+EBUILD urbanterror-4.1.1807.251210.ebuild 3369 RMD160 9c3540b705ad13d35aa984fcfd1936b785748bfc SHA1 2f7c9daab8cefb451fa1625b2288e6287c672090 SHA256 319413ff4c780d4fea2a5b1cbe1203181c1eec7457c12495d34e0f606e18de0a
 EBUILD urbanterror-4.1.ebuild 2650 RMD160 079b5077acc2d8370c4dd01ea2b037e6632197c4 SHA1 8fe53d2ffcf3a9de01655a9ca382c89530cd5251 SHA256 a792445d0b704fd632a85de692efe96b4baf71635267a934d0efacb6146678f9
 MISC metadata.xml 161 RMD160 734c72757bdba2e93d5c7cfa946fd9eb69e01681 SHA1 e721608e30cdca8dd809c1024687fe4887c49293 SHA256 5102a957a119374da719ca711f473e89fd4183d4e91e86f59e2fc4dce7e607dc
diff --git a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild b/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
index 02ea052..5e93352 100644
--- a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -11,8 +11,7 @@ HOMEPAGE="http://www.urbanterror.net/
 	  http://www.www0.org/w/Optimized_executable;_builds_of_ioq3_engine_for_urt"
 MY_VER=$(get_version_component_range 1)$(get_version_component_range 2)
 SRC_URI="http://www0.org/urt/ioq3-$(get_version_component_range 3)-urt-git-$(get_version_component_range 4).tar.7z
-	http://urt.hsogaming.com/mirror/currentversion/UrbanTerror_${MY_VER}_FULL.zip
-	ftp://ftp.snt.utwente.nl/pub/games/${PN}/UrbanTerror_${MY_VER}_FULL.zip
+	ftp://ftp.snt.utwente.nl/pub/games/${PN}/old/UrbanTerror_${MY_VER}_FULL.zip
 	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
 
 LICENSE="GPL-2"
diff --git a/games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild b/games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild
new file mode 100644
index 0000000..56a2033
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils games toolchain-funcs versionator
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://www.urbanterror.net/
+	  http://www.www0.org/w/Optimized_executable;_builds_of_ioq3_engine_for_urt"
+MY_VER=$(get_version_component_range 1)$(get_version_component_range 2)
+SRC_URI="http://www0.org/urt/ioq3-$(get_version_component_range 3)-urt-git-$(get_version_component_range 4).tar.lzma
+	ftp://ftp.snt.utwente.nl/pub/games/${PN}/old/UrbanTerror_${MY_VER}_FULL.zip
+	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client +curl openal server speex vanilla vorbis"
+
+COMMON_DEPEND="
+	client? (
+		media-libs/libsdl[X,opengl]
+		openal? ( media-libs/openal )
+		vorbis? ( media-libs/libogg media-libs/libvorbis )
+	)
+	curl? ( net-misc/curl )
+	speex? ( media-libs/speex ) "
+DEPEND="${COMMON_DEPEND}
+	app-arch/p7zip
+	app-arch/unzip
+	dev-util/pkgconfig
+	media-libs/netpbm"
+RDEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/ioq3-urt-git/ioq3-urt
+
+src_prepare() {
+	use vanilla || epatch "${FILESDIR}"/${P}-server-name.patch
+
+	rm -rf code/{SDL12,libs/win{32,64}} || die
+
+	sed -i -e 's:include <SDL_opengl.h>:include <SDL/SDL_opengl.h>:' code/renderer/qgl.h || die
+
+	# fix case sensitivity and remove shipped binaries
+	local my_utdir=${WORKDIR}/UrbanTerror
+	mv "${my_utdir}/q3ut4/demos/tutorial.dm_68" "${my_utdir}/q3ut4/demos/TUTORIAL.dm_68" || die
+	rm -f "${my_utdir}"/io{UrbanTerror,UrTded,}.{exe,i386,x86_64} || die
+}
+
+src_compile() {
+	buildit() { use $1 && echo 1 || echo 0 ; }
+
+	emake \
+		$(use amd64 && echo ARCH=x86_64 || echo ARCH=i386) \
+		BUILD_SERVER=$(buildit server) \
+		BUILD_CLIENT=$(buildit client) \
+		BUILD_CLIENT_SMP=$(buildit client) \
+		CC="$(tc-getCC)" \
+		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
+		USE_CODEC_VORBIS=$(buildit vorbis) \
+		USE_OPENAL=$(buildit openal) \
+		USE_CURL=$(buildit curl) \
+		USE_VOIP=$(buildit speex) \
+		USE_INTERNAL_SPEEX=0 \
+		USE_INTERNAL_ZLIB=0 \
+		USE_LOCAL_HEADERS=0 \
+		release || die
+	#BASE_CFLAGS="${CFLAGS} -DUSE_ICON -DPRODUCT_VERSION=\\\"$(VERSION)\\\"" \
+}
+
+src_install() {
+	local my_arch=x86
+	use amd64 && my_arch=x86_64
+
+	if use client || use server ; then # just kidding
+		insinto /usr/share/pixmaps
+		doins "${DISTDIR}"/${PN}.svg || die
+	fi
+
+	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
+	doins -r q3ut4/{glsl,textures} || die
+
+	if use client ; then
+		newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${PN} || die
+		make_desktop_entry ${PN} "UrbanTerror" ${PN}
+	fi
+
+	if use server ; then
+		newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${PN}-dedicated || die
+		make_desktop_entry ${PN}-dedicated "UrbanTerror dedicated" ${PN}
+		doins dedicated.cfg || die
+	fi
+
+	dodoc ChangeLog NOTTODO README TODO {md4,voip}-readme.txt || die
+
+	cd "${WORKDIR}"/UrbanTerror/q3ut4 || die
+
+	doins -r *.pk3 autoexec.cfg demos/ description.txt mapcycle.txt screenshots/ || die
+
+	prepgamesdirs
+}
diff --git a/games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild b/games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild
new file mode 100644
index 0000000..3456fe6
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils flag-o-matic games toolchain-funcs versionator
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://www.urbanterror.net/
+	  http://www.www0.org/w/Optimized_executable;_builds_of_ioq3_engine_for_urt"
+MY_VER=$(get_version_component_range 1)$(get_version_component_range 2)
+MY_PATCH=$(get_version_component_range 3)-urt-$(get_version_component_range 4)-git-nobumpy
+SRC_URI="http://xmw.de/mirror/urbanterror/ioquake3-1807.tar.bz2
+	http://www0.org/urt/ioq3-${MY_PATCH}.tar.lzma
+	ftp://ftp.snt.utwente.nl/pub/games/${PN}/old/UrbanTerror_${MY_VER}_FULL.zip
+	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client +curl openal server speex vorbis"
+
+COMMON_DEPEND="
+	client? (
+		media-libs/ftgl
+		media-libs/freetype:1
+		media-libs/libsdl[X,opengl]
+		openal? ( media-libs/openal )
+		vorbis? ( media-libs/libogg media-libs/libvorbis )
+	)
+	curl? ( net-misc/curl )
+	speex? ( media-libs/speex ) "
+DEPEND="${COMMON_DEPEND}
+	app-arch/p7zip
+	app-arch/unzip
+	dev-util/pkgconfig
+	media-libs/netpbm"
+RDEPEND="${COMMON_DEPEND}"
+
+S=${WORKDIR}/ioquake3
+
+src_prepare() {
+	epatch "${WORKDIR}"/ioq3-${MY_PATCH}.patch
+	use vanilla || epatch "${FILESDIR}"/${P}-server-name.patch
+
+	rm -rf code/{FTGL,FT2,SDL12,libs/win{32,64}} || die
+
+	sed -e '/SDL_CFLAGS=/s:--cflags sdl:--cflags freetype2 sdl:' \
+		-i Makefile || die
+
+	sed -e 's:include <SDL_opengl.h>:include <SDL/SDL_opengl.h>:' \
+		-i code/renderer/qgl.h || die
+
+	# fix case sensitivity and remove shipped binaries
+	local my_utdir=${WORKDIR}/UrbanTerror
+	mv "${my_utdir}/q3ut4/demos/tutorial.dm_68" \
+		"${my_utdir}/q3ut4/demos/TUTORIAL.dm_68" || die
+	rm -f "${my_utdir}"/io{UrbanTerror,UrTded,}.{exe,i386,x86_64} || die
+}
+
+src_compile() {
+	buildit() { use $1 && echo 1 || echo 0 ; }
+
+	emake \
+		$(use amd64 && echo ARCH=x86_64 || echo ARCH=i386) \
+		BUILD_SERVER=$(buildit server) \
+		BUILD_CLIENT=$(buildit client) \
+		BUILD_CLIENT_SMP=$(buildit client) \
+		CC="$(tc-getCC)" \
+		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
+		USE_CODEC_VORBIS=$(buildit vorbis) \
+		USE_OPENAL=$(buildit openal) \
+		USE_CURL=$(buildit curl) \
+		USE_VOIP=$(buildit speex) \
+		USE_INTERNAL_SPEEX=0 \
+		USE_INTERNAL_ZLIB=0 \
+		USE_LOCAL_HEADERS=0 \
+		release || die
+	#BASE_CFLAGS="${CFLAGS} -DUSE_ICON -DPRODUCT_VERSION=\\\"$(VERSION)\\\"" \
+}
+
+src_install() {
+	local my_arch=x86
+	use amd64 && my_arch=x86_64
+
+	if use client || use server ; then # just kidding
+		insinto /usr/share/pixmaps
+		doins "${DISTDIR}"/${PN}.svg || die
+	fi
+
+	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
+	#doins -r q3ut4/{glsl,textures} || die
+
+	if use client ; then
+		newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${PN} || die
+		make_desktop_entry ${PN} "UrbanTerror" ${PN}
+	fi
+
+	if use server ; then
+		newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${PN}-dedicated || die
+		make_desktop_entry ${PN}-dedicated "UrbanTerror dedicated" ${PN}
+		doins dedicated.cfg || die
+	fi
+
+	dodoc ChangeLog NOTTODO README TODO {md4,voip}-readme.txt || die
+
+	cd "${WORKDIR}"/UrbanTerror/q3ut4 || die
+
+	doins -r *.pk3 autoexec.cfg demos/ description.txt mapcycle.txt screenshots/ || die
+
+	prepgamesdirs
+}
+