version bump, remove old

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

7 files changed, 18 insertions, 355 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index 57cdee5cbc59..aaa4cffce78e 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-fps/urbanterror
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.12 2012/11/05 22:44:15 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.13 2012/11/10 12:05:30 hasufell Exp $
+
+*urbanterror-4.2.006 (10 Nov 2012)
+
+  10 Nov 2012; Julian Ospald <hasufell@gentoo.org> -urbanterror-4.2.003.ebuild,
+  -files/urbanterror-4.2.003-build.patch, -urbanterror-4.2.004.ebuild,
+  -files/urbanterror-4.2.004-build.patch, -urbanterror-4.2.005.ebuild,
+  -files/urbanterror-4.2.005-build.patch, +urbanterror-4.2.006.ebuild,
+  +files/urbanterror-4.2.006-build.patch:
+  version bump, remove old
 
   05 Nov 2012; Julian Ospald <hasufell@gentoo.org> urbanterror-4.2.005.ebuild:
   don't use dlopen if we can switch it off
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.003-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.003-build.patch
deleted file mode 100644
index 7cc4623f9bd4..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.003-build.patch
+++ /dev/null
@@ -1,52 +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)
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.004-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.004-build.patch
deleted file mode 100644
index 7cc4623f9bd4..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.004-build.patch
+++ /dev/null
@@ -1,52 +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)
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.005-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.006-build.patch
index 9221b671cbed..9221b671cbed 100644
--- a/games-fps/urbanterror/files/urbanterror-4.2.005-build.patch
+++ b/games-fps/urbanterror/files/urbanterror-4.2.006-build.patch
diff --git a/games-fps/urbanterror/urbanterror-4.2.004.ebuild b/games-fps/urbanterror/urbanterror-4.2.004.ebuild
deleted file mode 100644
index d2eb635998cf..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.004.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.004.ebuild,v 1.1 2012/11/01 21:43:39 hasufell Exp $
-
-EAPI=4
-
-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://178.63.102.135/svens_stuff/UrbanTerror42.tar.xz -> ${PN}-4.2.003.tar.xz
-	http://dev.gentoo.org/~hasufell/distfiles/ioq3-for-UrbanTerror-4.2.002.tar.xz
-	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg
-	mirror://gentoo/urbanterror-4.2.003-to-4.2.004-update.tar"
-
-LICENSE="GPL-2 Q3AEULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl debug dedicated openal +sdl server smp vorbis"
-
-RDEPEND="
-	!dedicated? (
-		virtual/opengl
-		curl? ( net-misc/curl )
-		openal? ( media-libs/openal )
-		sdl? ( media-libs/libsdl[X,audio,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}
-	dedicated? ( curl? ( net-misc/curl ) )"
-
-S=${WORKDIR}/ioq3-for-UrbanTerror-4.2.002
-S_DATA=${WORKDIR}/UrbanTerror42
-S_UPDATE=${WORKDIR}/urbanterror-4.2.003-to-4.2.004-update
-
-CHECKREQS_DISK_BUILD="2700M"
-CHECKREQS_DISK_USR="1300M"
-
-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_prepare() {
-	epatch "${FILESDIR}"/${P}-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_CURL=$(buildit curl) \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_LOCAL_HEADERS=0 \
-		Q="" \
-		$(usex debug "debug" "release")
-}
-
-src_install() {
-	local my_arch=$(usex amd64 "x86_64" "i386")
-
-	doicon -s scalable "${DISTDIR}"/${PN}.svg
-	dodoc ChangeLog README md4-readme.txt "${S_DATA}"/q3ut4/readme42.txt
-	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
-	doins "${S_DATA}"/q3ut4/*.pk3
-	doins "${S_UPDATE}"/*.pk3
-
-	if use !dedicated ; then
-		newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
-		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}
-	fi
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	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() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.2.005.ebuild b/games-fps/urbanterror/urbanterror-4.2.005.ebuild
deleted file mode 100644
index 4cb5c2664c10..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.005.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.005.ebuild,v 1.2 2012/11/05 22:44:15 hasufell Exp $
-
-EAPI=4
-
-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://178.63.102.135/svens_stuff/UrbanTerror42.tar.xz -> ${PN}-4.2.003.tar.xz
-	http://dev.gentoo.org/~hasufell/distfiles/ioq3-for-UrbanTerror-4.2.002.tar.xz
-	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg
-	mirror://gentoo/urbanterror-4.2.003-to-4.2.005-update.tar"
-
-LICENSE="GPL-2 Q3AEULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl debug dedicated openal +sdl server smp vorbis"
-
-RDEPEND="
-	!dedicated? (
-		virtual/opengl
-		curl? ( net-misc/curl )
-		openal? ( media-libs/openal )
-		sdl? ( media-libs/libsdl[X,audio,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}
-	dedicated? ( curl? ( net-misc/curl ) )"
-
-S=${WORKDIR}/ioq3-for-UrbanTerror-4.2.002
-S_DATA=${WORKDIR}/UrbanTerror42
-S_UPDATE=${WORKDIR}/urbanterror-4.2.003-to-4.2.005-update
-
-CHECKREQS_DISK_BUILD="2700M"
-CHECKREQS_DISK_USR="1300M"
-
-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_prepare() {
-	epatch "${FILESDIR}"/${P}-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")
-
-	doicon -s scalable "${DISTDIR}"/${PN}.svg
-	dodoc ChangeLog README md4-readme.txt "${S_DATA}"/q3ut4/readme42.txt
-	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
-	doins "${S_DATA}"/q3ut4/*.pk3
-	doins "${S_UPDATE}"/*.pk3
-
-	if use !dedicated ; then
-		newgamesbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT$(usex smp "-smp" "").${my_arch} ${PN}
-		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}
-	fi
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	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() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.2.003.ebuild b/games-fps/urbanterror/urbanterror-4.2.006.ebuild
index d9617b5e3d09..c0f65d095ce2 100644
--- a/games-fps/urbanterror/urbanterror-4.2.003.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.2.006.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.003.ebuild,v 1.1 2012/10/26 20:45:41 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/urbanterror-4.2.006.ebuild,v 1.1 2012/11/10 12:05:30 hasufell Exp $
 
 EAPI=4
 
@@ -8,7 +8,7 @@ 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://178.63.102.135/svens_stuff/UrbanTerror42.tar.xz -> ${P}.tar.xz
+SRC_URI="http://www.ftwgl.com/files/mirror/UrbanTerror42_full_${PV:4:3}.zip
 	http://dev.gentoo.org/~hasufell/distfiles/ioq3-for-UrbanTerror-4.2.002.tar.xz
 	http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg"
 
@@ -16,6 +16,7 @@ LICENSE="GPL-2 Q3AEULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+curl debug dedicated openal +sdl server smp vorbis"
+RESTRICT="mirror"
 
 RDEPEND="
 	!dedicated? (
@@ -31,6 +32,7 @@ RDEPEND="
 			media-libs/libvorbis )
 	)"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	dedicated? ( curl? ( net-misc/curl ) )"
 
 S=${WORKDIR}/ioq3-for-UrbanTerror-4.2.002
@@ -67,7 +69,9 @@ src_compile() {
 		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="" \
@@ -78,9 +82,9 @@ src_install() {
 	local my_arch=$(usex amd64 "x86_64" "i386")
 
 	doicon -s scalable "${DISTDIR}"/${PN}.svg
-	dodoc ChangeLog README md4-readme.txt "${S_DATA}"/q3ut4/readme42.txt
+	dodoc ChangeLog README md4-readme.txt "${S_DATA}"/readme42.txt
 	insinto "${GAMES_DATADIR}"/${PN}/q3ut4
-	doins -r "${S_DATA}"/q3ut4/*.pk3
+	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}