From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QILc3-0004vE-2M for garchives@archives.gentoo.org; Fri, 06 May 2011 14:02:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B4931C014; Fri, 6 May 2011 14:02:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B81AB1C014 for ; Fri, 6 May 2011 14:02:26 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10EDE1B403D for ; Fri, 6 May 2011 14:02:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1806480505 for ; Fri, 6 May 2011 14:02:25 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <9c10453e479816a0fd962e4c8930cd6dfad81eea.xmw@gentoo> Subject: [gentoo-commits] proj/gamerlay:master commit in: profiles/, games-fps/urbanterror/ X-VCS-Repository: proj/gamerlay X-VCS-Files: games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild profiles/package.mask X-VCS-Directories: profiles/ games-fps/urbanterror/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 9c10453e479816a0fd962e4c8930cd6dfad81eea Date: Fri, 6 May 2011 14:02:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8de7d2f6fc4ca643983f9e7de12cbb94 commit: 9c10453e479816a0fd962e4c8930cd6dfad81eea Author: Michael Weber xmw de> AuthorDate: Fri May 6 11:43:45 2011 +0000 Commit: Michael Weber gentoo org> CommitDate: Fri May 6 11:43:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gamerlay.git;= a=3Dcommit;h=3D9c10453e [games-fps/urbanterror] fixed src_uri, new versions --- .../urbanterror/urbanterror-4.1.1783.240410.ebuild | 5 +- ...0.ebuild =3D> urbanterror-4.1.1788.210710.ebuild} | 29 +++++------- ...0.ebuild =3D> urbanterror-4.1.1807.251210.ebuild} | 48 +++++++++++-= -------- profiles/package.mask | 4 ++ 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild b/g= ames-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: $ =20 @@ -11,8 +11,7 @@ HOMEPAGE=3D"http://www.urbanterror.net/ http://www.www0.org/w/Optimized_executable;_builds_of_ioq3_engine_for= _urt" MY_VER=3D$(get_version_component_range 1)$(get_version_component_range 2= ) SRC_URI=3D"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}_FU= LL.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" =20 LICENSE=3D"GPL-2" diff --git a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild b/g= ames-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild similarity index 79% copy from games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild copy to games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild index 02ea052..56a2033 100644 --- a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild +++ b/games-fps/urbanterror/urbanterror-4.1.1788.210710.ebuild @@ -10,15 +10,14 @@ DESCRIPTION=3D"Hollywood tactical shooter based on th= e ioquake3 engine" HOMEPAGE=3D"http://www.urbanterror.net/ http://www.www0.org/w/Optimized_executable;_builds_of_ioq3_engine_for= _urt" MY_VER=3D$(get_version_component_range 1)$(get_version_component_range 2= ) -SRC_URI=3D"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}_FU= LL.zip - ftp://ftp.snt.utwente.nl/pub/games/${PN}/UrbanTerror_${MY_VER}_FULL.zip +SRC_URI=3D"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" =20 LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"+client +curl openal server speex vorbis" +IUSE=3D"+client +curl openal server speex vanilla vorbis" =20 COMMON_DEPEND=3D" client? ( @@ -37,17 +36,11 @@ RDEPEND=3D"${COMMON_DEPEND}" =20 S=3D${WORKDIR}/ioq3-urt-git/ioq3-urt =20 -src_unpack() { - unpack ${A} - unpack ./ioq3-urt-git.tar -} - src_prepare() { - einfo "remove bundled include files" + use vanilla || epatch "${FILESDIR}"/${P}-server-name.patch + rm -rf code/{SDL12,libs/win{32,64}} || die - #rm -rf code/{AL,SDL12,jpeg-6b,libcurl,libs/win{32,64},zlib} || die =20 - #oq3-urt-git/ioq3-urt/Makefile sed -i -e 's:include :include :' code/r= enderer/qgl.h || die =20 # fix case sensitivity and remove shipped binaries @@ -86,24 +79,24 @@ src_install() { doins "${DISTDIR}"/${PN}.svg || die fi =20 + 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} ${P= N} || die make_desktop_entry ${PN} "UrbanTerror" ${PN} fi =20 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} - - insinto "${GAMES_DATADIR}"/${PN}/q3ut4 - doins dedicated.cfg || die + newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${P= N}-dedicated || die + make_desktop_entry ${PN}-dedicated "UrbanTerror dedicated" ${PN} + doins dedicated.cfg || die fi =20 dodoc ChangeLog NOTTODO README TODO {md4,voip}-readme.txt || die =20 cd "${WORKDIR}"/UrbanTerror/q3ut4 || die =20 - insinto "${GAMES_DATADIR}"/${PN}/q3ut4 doins -r *.pk3 autoexec.cfg demos/ description.txt mapcycle.txt screens= hots/ || die =20 prepgamesdirs diff --git a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild b/g= ames-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild similarity index 68% copy from games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild copy to games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild index 02ea052..3456fe6 100644 --- a/games-fps/urbanterror/urbanterror-4.1.1783.240410.ebuild +++ b/games-fps/urbanterror/urbanterror-4.1.1807.251210.ebuild @@ -4,15 +4,16 @@ =20 EAPI=3D2 =20 -inherit eutils games toolchain-funcs versionator +inherit eutils flag-o-matic games toolchain-funcs versionator =20 DESCRIPTION=3D"Hollywood tactical shooter based on the ioquake3 engine" HOMEPAGE=3D"http://www.urbanterror.net/ http://www.www0.org/w/Optimized_executable;_builds_of_ioq3_engine_for= _urt" MY_VER=3D$(get_version_component_range 1)$(get_version_component_range 2= ) -SRC_URI=3D"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}_FU= LL.zip - ftp://ftp.snt.utwente.nl/pub/games/${PN}/UrbanTerror_${MY_VER}_FULL.zip +MY_PATCH=3D$(get_version_component_range 3)-urt-$(get_version_component_= range 4)-git-nobumpy +SRC_URI=3D"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" =20 LICENSE=3D"GPL-2" @@ -22,6 +23,8 @@ IUSE=3D"+client +curl openal server speex vorbis" =20 COMMON_DEPEND=3D" client? ( + media-libs/ftgl + media-libs/freetype:1 media-libs/libsdl[X,opengl] openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) @@ -35,24 +38,24 @@ DEPEND=3D"${COMMON_DEPEND} media-libs/netpbm" RDEPEND=3D"${COMMON_DEPEND}" =20 -S=3D${WORKDIR}/ioq3-urt-git/ioq3-urt - -src_unpack() { - unpack ${A} - unpack ./ioq3-urt-git.tar -} +S=3D${WORKDIR}/ioquake3 =20 src_prepare() { - einfo "remove bundled include files" - rm -rf code/{SDL12,libs/win{32,64}} || die - #rm -rf code/{AL,SDL12,jpeg-6b,libcurl,libs/win{32,64},zlib} || die + 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 =20 - #oq3-urt-git/ioq3-urt/Makefile - sed -i -e 's:include :include :' code/r= enderer/qgl.h || die + sed -e '/SDL_CFLAGS=3D/s:--cflags sdl:--cflags freetype2 sdl:' \ + -i Makefile || die + + sed -e 's:include :include :' \ + -i code/renderer/qgl.h || die =20 # fix case sensitivity and remove shipped binaries local my_utdir=3D${WORKDIR}/UrbanTerror - mv "${my_utdir}/q3ut4/demos/tutorial.dm_68" "${my_utdir}/q3ut4/demos/TU= TORIAL.dm_68" || die + 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 } =20 @@ -86,25 +89,26 @@ src_install() { doins "${DISTDIR}"/${PN}.svg || die fi =20 + 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} ${P= N} || die make_desktop_entry ${PN} "UrbanTerror" ${PN} fi =20 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} - - insinto "${GAMES_DATADIR}"/${PN}/q3ut4 - doins dedicated.cfg || die + newgamesbin build/release-linux-${my_arch}/ioquake3-smp.${my_arch} ${P= N}-dedicated || die + make_desktop_entry ${PN}-dedicated "UrbanTerror dedicated" ${PN} + doins dedicated.cfg || die fi =20 dodoc ChangeLog NOTTODO README TODO {md4,voip}-readme.txt || die =20 cd "${WORKDIR}"/UrbanTerror/q3ut4 || die =20 - insinto "${GAMES_DATADIR}"/${PN}/q3ut4 doins -r *.pk3 autoexec.cfg demos/ description.txt mapcycle.txt screens= hots/ || die =20 prepgamesdirs } + diff --git a/profiles/package.mask b/profiles/package.mask index 81e1014..cb845c2 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -3,3 +3,7 @@ dev-games/gigi games-strategy/freeorion =20 +# Michael Weber (06 May 2011) +# crashes on escape inside game +=3Dgames-fps/urbanterror-4.1.1807.251210 +