remove old (keep 4.1.1 since some servers still use it)

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

5 files changed, 7 insertions, 404 deletions

diff --git a/games-fps/urbanterror/ChangeLog b/games-fps/urbanterror/ChangeLog
index a2826474ba7b..0304154e2134 100644
--- a/games-fps/urbanterror/ChangeLog
+++ b/games-fps/urbanterror/ChangeLog
@@ -1,6 +1,12 @@
 # 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.34 2013/09/01 21:16:44 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/urbanterror/ChangeLog,v 1.35 2013/09/27 23:54:41 hasufell Exp $
+
+  27 Sep 2013; Julian Ospald <hasufell@gentoo.org>
+  -files/urbanterror-4.2.012-build.patch,
+  -files/urbanterror-4.2.013-build.patch, -urbanterror-4.2.012.ebuild,
+  -urbanterror-4.2.013-r1.ebuild:
+  remove old (keep 4.1.1 since some servers still use it)
 
   01 Sep 2013; Julian Ospald <hasufell@gentoo.org> urbanterror-4.1.1.ebuild:
   update license information
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.012-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.012-build.patch
deleted file mode 100644
index 820bd0872544..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.012-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)
-@@ -1157,13 +1153,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.013-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch
deleted file mode 100644
index 868c3ccad82c..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.2.013-build.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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.012.ebuild b/games-fps/urbanterror/urbanterror-4.2.012.ebuild
deleted file mode 100644
index ce93d4bffc85..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.012.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.012.ebuild,v 1.4 2013/09/01 20:27:35 hasufell Exp $
-
-EAPI=5
-
-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://cdn.urbanterror.info/urt/42/zips/UrbanTerror42_full${PV:4:3}.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-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,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}
-	app-arch/unzip
-	dedicated? ( curl? ( net-misc/curl ) )"
-
-S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${PV}
-S_DATA=${WORKDIR}/UrbanTerror42
-
-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")
-
-	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.013-r1.ebuild b/games-fps/urbanterror/urbanterror-4.2.013-r1.ebuild
deleted file mode 100644
index 5d7bbf98890e..000000000000
--- a/games-fps/urbanterror/urbanterror-4.2.013-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.013-r1.ebuild,v 1.2 2013/09/01 20:27:35 hasufell Exp $
-
-EAPI=5
-
-inherit check-reqs eutils gnome2-utils games
-
-PREV_PV="4.2.012"
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://www.urbanterror.info/home/"
-SRC_URI="http://cdn.urbanterror.info/urt/42/zips/UrbanTerror42_full${PREV_PV:4:3}.zip
-	http://cdn.urbanterror.info/urt/42/zips/UrbanTerror-${PREV_PV}-to-${PV}.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-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,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}
-	app-arch/unzip
-	dedicated? ( curl? ( net-misc/curl ) )"
-
-S=${WORKDIR}/ioq3-for-UrbanTerror-4-release-${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() {
-	default
-	cp -dRp "${WORKDIR}"/UrbanTerror-${PREV_PV}-to-${PV}/* "${S_DATA}"/ || die
-}
-
-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")
-
-	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
-}