version bump

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 106 insertions, 84 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index 1517dd378514..90127bf31950 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/urbanterror
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.28 2013/07/09 23:32:16 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.29 2013/07/15 23:52:59 hasufell Exp $
+
+*urbanterror-4.2.014 (15 Jul 2013)
+
+  15 Jul 2013; Julian Ospald <hasufell@gentoo.org> -urbanterror-4.2.009.ebuild,
+  -files/urbanterror-4.2.009-build.patch, +urbanterror-4.2.014.ebuild,
+  +files/urbanterror-4.2.014-build.patch:
+  version bump
 
 *urbanterror-4.2.013-r1 (09 Jul 2013)
 
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.009-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.009-build.patch
deleted file mode 100644
index 9221b671cbed..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.009-build.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -213,7 +213,7 @@
-   endif
-   endif
- 
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe
-+  BASE_CFLAGS = -Wall -fno-strict-aliasing -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 = -ffast-math -funroll-loops
- 
-   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 = -ffast-math -funroll-loops
-     # 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 = -ffast-math -funroll-loops
-     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)
-@@ -1153,13 +1149,13 @@
- 
- $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN)
- 	$(echo_cmd) "LD $@"
--	$(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \
--		$(LDFLAGS) $(LIBSDLMAIN)
-+	$(Q)$(CC) -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) -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.014-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.014-build.patch
new file mode 100644
index 000000000000..868c3ccad82c
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.2.014-build.patch
@@ -0,0 +1,78 @@
+commit dc89402ef3305202a2ec51e6c2c073bb1f65fb54
+Author: hasufell <hasufell@gentoo.org>
+Date:   Wed Jul 10 01:25:27 2013 +0200
+
+    respect CFLAGS/LDFLAGS
+
+diff --git a/Makefile b/Makefile
+index 3c134d5..54989f3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -213,7 +213,7 @@ ifeq ($(PLATFORM),linux)
+   endif
+   endif
+ 
+-  BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -pipe
++  BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes
+ 
+   ifeq ($(USE_OPENAL),1)
+     BASE_CFLAGS += -DUSE_OPENAL=1
+@@ -238,18 +238,17 @@ ifeq ($(PLATFORM),linux)
+   else
+     BASE_CFLAGS += -I/usr/X11R6/include
+   endif
+- #Anything more then -O2 and *mmx *msse/2/ causes hitching with urbanterror\
+-#also -march is illrelavent unless you know your target cpu
+-  OPTIMIZE = -O2 -mmmx -msse -msse2 -msse3
++ # what an idiotic comment
++  OPTIMIZE =
+ #having x86_x64 implys having full SSE support up to SSE3 so we will use it,\
+ #for old cpus we don't care because anything pre Pentium 4/Althlon 1600+ won't run UrbanTerror 
+   ifeq ($(ARCH),x86_64) 
+-    OPTIMIZE = -O2 -msse -msse2 -msse3
++    OPTIMIZE =
+     # experimental x86_64 jit compiler! you need GNU as
+     HAVE_VM_COMPILED = true
+   else
+   ifeq ($(ARCH),i386)
+-    OPTIMIZE = -O2 -mmmx 
++    OPTIMIZE =
+ 
+     HAVE_VM_COMPILED=true
+   else
+@@ -264,7 +263,7 @@ ifeq ($(PLATFORM),linux)
+     BASE_CFLAGS += -DNO_VM_COMPILED
+   endif
+ 
+-  DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -wall
++  DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE)
+ 
+   RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE)
+ 
+@@ -273,7 +272,7 @@ ifeq ($(PLATFORM),linux)
+   SHLIBLDFLAGS=-shared $(LDFLAGS)
+ 
+   THREAD_LDFLAGS=-lpthread
+-  LDFLAGS=-ldl -lm
++  LDFLAGS+=-ldl -lm
+ 
+   ifeq ($(USE_SDL),1)
+     CLIENT_LDFLAGS=$(shell sdl-config --libs)
+@@ -1157,13 +1156,13 @@ endif
+ 
+ $(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.009.ebuild b/games-fps/urbanterror/urbanterror-4.2.014.ebuild
index 716b0f598c4c..c27a3b9d9116 100644
--- a/games-fps/urbanterror/urbanterror-4.2.009.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.2.014.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.009.ebuild,v 1.3 2013/02/14 12:10:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.014.ebuild,v 1.1 2013/07/15 23:52:59 hasufell Exp $
 
 EAPI=5
 
@@ -8,14 +8,15 @@ inherit check-reqs eutils gnome2-utils games
 
 DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
 HOMEPAGE="http://www.urbanterror.info/home/"
-SRC_URI="http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_${PV:4:3}.zip
-	http://www.ftwgl.com/files/mirror/UrbanTerror42_full_${PV:4:3}.zip
-	https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.007.tar.gz
+SRC_URI="http://cdn.urbanterror.info/urt/42/zips/UrbanTerror42_full012.zip
+	http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-4.2.012-to-4.2.013.zip
+	http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-4.2.013-to-4.2.014.zip
+	https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${PV}.tar.gz -> ${P}.tar.gz
 	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
 
 LICENSE="GPL-2 Q3AEULA"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+curl debug dedicated openal +sdl server smp vorbis"
 RESTRICT="mirror"
 
@@ -36,11 +37,11 @@ DEPEND="${RDEPEND}
 	app-arch/unzip
 	dedicated? ( curl? ( net-misc/curl ) )"
 
-S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-4.2.007
+S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${PV}
 S_DATA=${WORKDIR}/UrbanTerror42
 
-CHECKREQS_DISK_BUILD="2700M"
-CHECKREQS_DISK_USR="1300M"
+CHECKREQS_DISK_BUILD="3300M"
+CHECKREQS_DISK_USR="1550M"
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
@@ -54,6 +55,12 @@ pkg_pretend() {
 	fi
 }
 
+src_unpack() {
+	default
+	cp -dRpf "${WORKDIR}"/UrbanTerror-4.2.012-to-4.2.013/* "${S_DATA}"/ || die
+	cp -dRpf "${WORKDIR}"/UrbanTerror-4.2.013-to-4.2.014/* "${S_DATA}"/ || die
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-build.patch
 }
@@ -82,7 +89,6 @@ src_compile() {
 src_install() {
 	local my_arch=$(usex amd64 "x86_64" "i386")
 
-	doicon -s scalable "${DISTDIR}"/${PN}.svg
 	dodoc ChangeLog README md4-readme.txt
 	dodoc "${S_DATA}"/q3ut4/readme42.txt
 	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
@@ -90,13 +96,14 @@ src_install() {
 
 	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.cfg,mapcycle.txt}
+		dodoc "${S_DATA}"/q3ut4/{server_example.cfg,mapcycle_example.txt}
 	fi
 
 	prepgamesdirs
@@ -104,12 +111,12 @@ src_install() {
 
 pkg_preinst() {
 	games_pkg_preinst
-	gnome2_icon_savelist
+	use dedicated || gnome2_icon_savelist
 }
 
 pkg_postinst() {
 	games_pkg_postinst
-	gnome2_icon_cache_update
+	use dedicated || gnome2_icon_cache_update
 
 	if use openal && ! use dedicated ; then
 		einfo
@@ -121,5 +128,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	use dedicated || gnome2_icon_cache_update
 }