version bump, rm old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

5 files changed, 19 insertions, 236 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index 7d8b178a63a4..01447e219515 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-fps/urbanterror
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.49 2014/10/10 15:23:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.50 2014/11/20 20:13:51 hasufell Exp $
+
+*urbanterror-4.2.021 (20 Nov 2014)
+
+  20 Nov 2014; Julian Ospald <hasufell@gentoo.org> -urbanterror-4.2.018.ebuild,
+  -urbanterror-4.2.019.ebuild, +urbanterror-4.2.021.ebuild,
+  -files/urbanterror-4.2.017-build.patch,
+  -files/urbanterror-4.2.019-build.patch,
+  +files/urbanterror-4.2.021-build.patch:
+  version bump, rm old
 
   10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> urbanterror-4.2.018-r1.ebuild:
   Stable for amd64, wrt bug #518236
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.019-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.019-build.patch
deleted file mode 100644
index daa7e324a677..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.019-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.017-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch
index daa7e324a677..daa7e324a677 100644
--- a/games-fps/urbanterror/files/urbanterror-4.2.017-build.patch
+++ b/games-fps/urbanterror/files/urbanterror-4.2.021-build.patch
diff --git a/games-fps/urbanterror/urbanterror-4.2.018.ebuild b/games-fps/urbanterror/urbanterror-4.2.018.ebuild
deleted file mode 100644
index b706d4395726..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.018.ebuild
+++ /dev/null
@@ -1,151 +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.ebuild,v 1.4 2014/05/15 16:46:58 ulm Exp $
-
-EAPI=5
-
-inherit check-reqs eutils gnome2-utils games
-
-ENGINE_PV=4.2.017
-FULL_P=UrbanTerror42_full017
-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=${ENGINE_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=${ENGINE_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.019.ebuild b/games-fps/urbanterror/urbanterror-4.2.021.ebuild
index fe68fb078298..335ce84f55a6 100644
--- a/games-fps/urbanterror/urbanterror-4.2.019.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.2.021.ebuild
@@ -1,6 +1,6 @@
 # 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.019.ebuild,v 1.1 2014/09/19 13:43:50 hasufell Exp $
+# $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
 
@@ -11,15 +11,15 @@ 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
+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: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"
+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
@@ -71,10 +71,10 @@ src_unpack() {
 	default
 	# apply updates
 	if [[ ${FULL_P#*full} != ${PV##*.} ]] ; then
-		UPDATE_I=${UPDATE_PV:6:1}
-		while [[ ${UPDATE_I} -lt ${PV:6:1} ]] ; do
+		UPDATE_I=${UPDATE_PV:5:2}
+		while [[ ${UPDATE_I} -lt ${PV:5:2} ]] ; do
 			cp -dRpf \
-				"${WORKDIR}"/UrbanTerror-${PV:0:6}${UPDATE_I}-to-${PV:0:6}$((${UPDATE_I} + 1))/* \
+				"${WORKDIR}"/UrbanTerror-${PV:0:5}${UPDATE_I}-to-${PV:0:5}$((${UPDATE_I} + 1))/* \
 				"${S_DATA}"/ || die
 			UPDATE_I=$(( ${UPDATE_I} + 1))
 		done