summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/urbanterror/ChangeLog8
-rw-r--r--games-fps/urbanterror/files/urbanterror-4.2.018-build.patch75
-rw-r--r--games-fps/urbanterror/files/urbanterror-4.2.021-build.patch75
-rw-r--r--games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild152
-rw-r--r--games-fps/urbanterror/urbanterror-4.2.021.ebuild153
5 files changed, 7 insertions, 456 deletions
diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index 8e211f77e880..c98cba784f43 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for games-fps/urbanterror
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.58 2015/04/19 10:07:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.59 2015/04/20 20:03:24 mr_bones_ Exp $
+
+ 20 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ -files/urbanterror-4.2.018-build.patch,
+ -files/urbanterror-4.2.021-build.patch, -urbanterror-4.2.018-r1.ebuild,
+ -urbanterror-4.2.021.ebuild:
+ old
19 Apr 2015; Agostino Sarubbo <ago@gentoo.org> urbanterror-4.2.023.ebuild:
Stable for x86, wrt bug #545742
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.018-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.018-build.patch
deleted file mode 100644
index daa7e324a677..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.018-build.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date: Wed Jul 10 01:25:27 2013 +0200
-
- respect CFLAGS/LDFLAGS
-
---- a/Makefile
-+++ b/Makefile
-@@ -213,7 +213,7 @@
- endif
- endif
-
-- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
-
- ifeq ($(USE_OPENAL),1)
- BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -239,19 +239,15 @@
- BASE_CFLAGS += -I/usr/X11R6/include
- endif
-
-- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
-+ OPTIMIZE =
-
- ifeq ($(ARCH),x86_64)
-- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
-- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-- -fstrength-reduce
-+ OPTIMIZE =
- # experimental x86_64 jit compiler! you need GNU as
- HAVE_VM_COMPILED = true
- else
- ifeq ($(ARCH),i386)
-- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
-- -funroll-loops -falign-loops=2 -falign-jumps=2 \
-- -falign-functions=2 -fstrength-reduce
-+ OPTIMIZE =
- HAVE_VM_COMPILED=true
- else
- ifeq ($(ARCH),ppc)
-@@ -265,7 +261,7 @@
- BASE_CFLAGS += -DNO_VM_COMPILED
- endif
-
-- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
-+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
-
- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
-
-@@ -274,7 +270,7 @@
- SHLIBLDFLAGS=-shared $(LDFLAGS)
-
- THREAD_LDFLAGS=-lpthread
-- LDFLAGS=-ldl -lm
-+ LDFLAGS+=-ldl -lm
-
- ifeq ($(USE_SDL),1)
- CLIENT_LDFLAGS=$(shell sdl-config --libs)
-@@ -1158,13 +1154,13 @@
-
- $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
-- $(LDFLAGS) $(LIBSDLMAIN)
-+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \
-+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
-
- $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
-- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
-+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
-+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
-
- ifneq ($(strip $(LIBSDLMAIN)),)
- ifneq ($(strip $(LIBSDLMAINSRC)),)
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch
deleted file mode 100644
index daa7e324a677..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date: Wed Jul 10 01:25:27 2013 +0200
-
- respect CFLAGS/LDFLAGS
-
---- a/Makefile
-+++ b/Makefile
-@@ -213,7 +213,7 @@
- endif
- endif
-
-- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
-
- ifeq ($(USE_OPENAL),1)
- BASE_CFLAGS += -DUSE_OPENAL=1
-@@ -239,19 +239,15 @@
- BASE_CFLAGS += -I/usr/X11R6/include
- endif
-
-- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer
-+ OPTIMIZE =
-
- ifeq ($(ARCH),x86_64)
-- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \
-- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
-- -fstrength-reduce
-+ OPTIMIZE =
- # experimental x86_64 jit compiler! you need GNU as
- HAVE_VM_COMPILED = true
- else
- ifeq ($(ARCH),i386)
-- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \
-- -funroll-loops -falign-loops=2 -falign-jumps=2 \
-- -falign-functions=2 -fstrength-reduce
-+ OPTIMIZE =
- HAVE_VM_COMPILED=true
- else
- ifeq ($(ARCH),ppc)
-@@ -265,7 +261,7 @@
- BASE_CFLAGS += -DNO_VM_COMPILED
- endif
-
-- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0
-+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
-
- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
-
-@@ -274,7 +270,7 @@
- SHLIBLDFLAGS=-shared $(LDFLAGS)
-
- THREAD_LDFLAGS=-lpthread
-- LDFLAGS=-ldl -lm
-+ LDFLAGS+=-ldl -lm
-
- ifeq ($(USE_SDL),1)
- CLIENT_LDFLAGS=$(shell sdl-config --libs)
-@@ -1158,13 +1154,13 @@
-
- $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
-- $(LDFLAGS) $(LIBSDLMAIN)
-+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \
-+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
-
- $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
- $(echo_cmd) "LD $@"
-- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \
-- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN)
-+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \
-+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN)
-
- ifneq ($(strip $(LIBSDLMAIN)),)
- ifneq ($(strip $(LIBSDLMAINSRC)),)
diff --git a/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild b/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild
deleted file mode 100644
index f36de536f164..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.018-r1.ebuild,v 1.4 2014/10/10 15:23:50 ago Exp $
-
-EAPI=5
-
-inherit check-reqs eutils gnome2-utils games
-
-ENGINE_PV=${PV}
-FULL_P=UrbanTerror42_full017
-UPDATE_PV=${PV:0:3}.${FULL_P#*full}
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.info/home/"
-SRC_URI="http://cdn.urbanterror.info/urt/42/zips/${FULL_P}.zip
- https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${ENGINE_PV}.tar.gz -> ${PN}-${ENGINE_PV}.tar.gz
- http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
-
-# fetch updates
-if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
- UPDATE_I=${UPDATE_PV:6:1}
- while [[ ${UPDATE_I} -lt ${PV:6:1} ]] ; do
- SRC_URI="${SRC_URI} http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-${PV:0:6}${UPDATE_I}-to-${PV:0:6}$(( ${UPDATE_I} + 1)).zip"
- UPDATE_I=$(( ${UPDATE_I} + 1))
- done
-fi
-unset UPDATE_I
-
-LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+curl debug dedicated openal +sdl server smp vorbis"
-RESTRICT="mirror"
-
-RDEPEND="
- !dedicated? (
- virtual/opengl
- curl? ( net-misc/curl )
- openal? ( media-libs/openal )
- sdl? ( media-libs/libsdl[X,sound,joystick,opengl,video] )
- !sdl? ( x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm )
- vorbis? ( media-libs/libogg
- media-libs/libvorbis )
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dedicated? ( curl? ( net-misc/curl ) )"
-
-S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${ENGINE_PV}
-S_DATA=${WORKDIR}/UrbanTerror42
-
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1550M"
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-
- if ! use dedicated ; then
- if ! use sdl && ! use openal ; then
- ewarn
- ewarn "Sound support disabled. Enable 'sdl' or 'openal' useflag."
- ewarn
- fi
- fi
-}
-
-src_unpack() {
- local UPDATE_I
- default
- # apply updates
- if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
- UPDATE_I=${UPDATE_PV:6:1}
- while [[ ${UPDATE_I} -lt ${PV:6:1} ]] ; do
- cp -dRpf \
- "${WORKDIR}"/UrbanTerror-${PV:0:6}${UPDATE_I}-to-${PV:0:6}$((${UPDATE_I} + 1))/* \
- "${S_DATA}"/ || die
- UPDATE_I=$(( ${UPDATE_I} + 1))
- done
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch
-}
-
-src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
- nobuildit() { use $1 && echo 0 || echo 1 ; }
-
- emake \
- ARCH=$(usex amd64 "x86_64" "i386") \
- DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
- BUILD_CLIENT=$(nobuildit dedicated) \
- BUILD_CLIENT_SMP=$(usex smp "$(nobuildit dedicated)" "0") \
- BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
- USE_SDL=$(buildit sdl) \
- USE_OPENAL=$(buildit openal) \
- USE_OPENAL_DLOPEN=0 \
- USE_CURL=$(buildit curl) \
- USE_CURL_DLOPEN=0 \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_LOCAL_HEADERS=0 \
- Q="" \
- $(usex debug "debug" "release")
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- dodoc ChangeLog README md4-readme.txt
- dodoc "${S_DATA}"/q3ut4/readme42.txt
- insinto "${GAMES_DATADIR}"/${PN}/q3ut4
- doins "${S_DATA}"/q3ut4/*.pk3
-
- if use !dedicated ; then
- newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
- doicon -s scalable "${DISTDIR}"/${PN}.svg
- make_desktop_entry ${PN} "UrbanTerror"
- fi
-
- if use dedicated || use server ; then
- newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-dedicated
- docinto examples
- dodoc "${S_DATA}"/q3ut4/{server_example.cfg,mapcycle_example.txt}
- fi
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- use dedicated || gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- use dedicated || gnome2_icon_cache_update
-
- if use openal && ! use dedicated ; then
- einfo
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- einfo
- fi
-}
-
-pkg_postrm() {
- use dedicated || gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.2.021.ebuild b/games-fps/urbanterror/urbanterror-4.2.021.ebuild
deleted file mode 100644
index 335ce84f55a6..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.021.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.021.ebuild,v 1.1 2014/11/20 20:13:51 hasufell Exp $
-
-EAPI=5
-
-inherit check-reqs eutils gnome2-utils games
-
-ENGINE_PV=${PV}
-FULL_P=UrbanTerror42_full017
-UPDATE_PV=${PV:0:3}.${FULL_P#*full}
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.info/home/"
-SRC_URI="http://up.barbatos.fr/urt/${FULL_P}.zip
- https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${ENGINE_PV}.tar.gz -> ${PN}-${ENGINE_PV}.tar.gz
- http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
-
-# fetch updates
-if [[ ${FULL_P#*full} != ${PV#*.} ]] ; then
- UPDATE_I=${UPDATE_PV:5:2}
- while [[ ${UPDATE_I} -lt ${PV:5:2} ]] ; do
- SRC_URI="${SRC_URI} http://up.barbatos.fr/urt/UrbanTerror-${PV:0:5}${UPDATE_I}-to-${PV:0:5}$(( ${UPDATE_I} + 1)).zip"
- UPDATE_I=$(( ${UPDATE_I} + 1))
- done
-fi
-unset UPDATE_I
-
-LICENSE="GPL-2 Q3AEULA-20000111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+altgamma +curl debug dedicated openal +sdl server smp vorbis"
-RESTRICT="mirror"
-
-RDEPEND="
- !dedicated? (
- virtual/opengl
- curl? ( net-misc/curl )
- openal? ( media-libs/openal )
- sdl? ( media-libs/libsdl[X,sound,joystick,opengl,video] )
- !sdl? ( x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm )
- vorbis? ( media-libs/libogg
- media-libs/libvorbis )
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dedicated? ( curl? ( net-misc/curl ) )"
-
-S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${ENGINE_PV}
-S_DATA=${WORKDIR}/UrbanTerror42
-
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1550M"
-
-pkg_pretend() {
- check-reqs_pkg_pretend
-
- if ! use dedicated ; then
- if ! use sdl && ! use openal ; then
- ewarn
- ewarn "Sound support disabled. Enable 'sdl' or 'openal' useflag."
- ewarn
- fi
- fi
-}
-
-src_unpack() {
- local UPDATE_I
- default
- # apply updates
- if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
- UPDATE_I=${UPDATE_PV:5:2}
- while [[ ${UPDATE_I} -lt ${PV:5:2} ]] ; do
- cp -dRpf \
- "${WORKDIR}"/UrbanTerror-${PV:0:5}${UPDATE_I}-to-${PV:0:5}$((${UPDATE_I} + 1))/* \
- "${S_DATA}"/ || die
- UPDATE_I=$(( ${UPDATE_I} + 1))
- done
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch
-}
-
-src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
- nobuildit() { use $1 && echo 0 || echo 1 ; }
-
- emake \
- ARCH=$(usex amd64 "x86_64" "i386") \
- DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
- BUILD_CLIENT=$(nobuildit dedicated) \
- BUILD_CLIENT_SMP=$(usex smp "$(nobuildit dedicated)" "0") \
- BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
- USE_SDL=$(buildit sdl) \
- USE_OPENAL=$(buildit openal) \
- USE_OPENAL_DLOPEN=0 \
- USE_CURL=$(buildit curl) \
- USE_CURL_DLOPEN=0 \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_ALTGAMMA=$(buildit altgamma) \
- USE_LOCAL_HEADERS=0 \
- Q="" \
- $(usex debug "debug" "release")
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- dodoc ChangeLog README md4-readme.txt
- dodoc "${S_DATA}"/q3ut4/readme42.txt
- insinto "${GAMES_DATADIR}"/${PN}/q3ut4
- doins "${S_DATA}"/q3ut4/*.pk3
-
- if use !dedicated ; then
- newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
- doicon -s scalable "${DISTDIR}"/${PN}.svg
- make_desktop_entry ${PN} "UrbanTerror"
- fi
-
- if use dedicated || use server ; then
- newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-dedicated
- docinto examples
- dodoc "${S_DATA}"/q3ut4/{server_example.cfg,mapcycle_example.txt}
- fi
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- use dedicated || gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- use dedicated || gnome2_icon_cache_update
-
- if use openal && ! use dedicated ; then
- einfo
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- einfo
- fi
-}
-
-pkg_postrm() {
- use dedicated || gnome2_icon_cache_update
-}