[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2024-05-20 Thread James Le Cuirot
commit: 88277f7951e3ed07c70b58a4c1f780b0bdcf693d
Author: James Le Cuirot  gentoo  org>
AuthorDate: Mon May 20 21:41:08 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon May 20 21:41:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88277f79

games-fps/urbanterror: Export PKG_CONFIG to fix x86 build

The Makefile respects PKG_CONFIG, and poor platform detection seemingly results
in it picking a broken default when building for x86.

Closes: https://bugs.gentoo.org/926466
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
index 28b623b2193d..8379e932e377 100644
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
@@ -61,7 +61,7 @@ pkg_pretend() {
 }
 
 src_configure() {
-   tc-export CC
+   tc-export CC PKG_CONFIG
default
 }
 



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2023-09-29 Thread Sam James
commit: 9bda5dd1af00436a587b9e5f021835c219f5197c
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 29 10:29:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 29 10:32:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bda5dd1

games-fps/urbanterror: drop workaround for newer zlib

See 491bf8bd3ef621da49b168736a04f23aa4c7719c. Could do ifndef in patch
but I'd like to remove all of these eventually and there's only a handful.

Signed-off-by: Sam James  gentoo.org>

 games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
index b0041846f317..28b623b2193d 100644
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -68,7 +68,7 @@ src_configure() {
 src_compile() {
# Workaround for used zlib macro, which got renamed in Gentoo
# wrt bug #449510
-   append-cppflags "-DOF=_Z_OF"
+   has_version "

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2022-06-29 Thread Kenton Groombridge
commit: c27d1ce93353f4612b7f2e3c753d10bac524bf55
Author: Kenton Groombridge  gentoo  org>
AuthorDate: Thu Jun 30 00:37:51 2022 +
Commit: Kenton Groombridge  gentoo  org>
CommitDate: Thu Jun 30 00:37:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27d1ce9

games-fps/urbanterror: update mumble depend for pkgmove

Signed-off-by: Kenton Groombridge  gentoo.org>

 games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
index 5a8e0c3737e8..b0041846f317 100644
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
@@ -36,7 +36,7 @@ PATCHES=(
 RDEPEND="
client? (
media-libs/libsdl2[X,sound,joystick,opengl,video]
-   mumble? ( media-sound/mumble:= )
+   mumble? ( net-voip/mumble:= )
openal? ( media-libs/openal:= )
opus? ( media-libs/opusfile )
vorbis? ( media-libs/libvorbis )



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/

2022-03-29 Thread Florian Schmaus
commit: 7f3f4b56a08fd671b02ea6ffc3062d416b665ad7
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Mar 29 13:05:12 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Mar 29 13:07:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3f4b56

games-fps/urbanterror: add 4.3.4_p20211208

Closes: https://github.com/gentoo/gentoo/pull/24768
Signed-off-by: Florian Schmaus  gentoo.org>

 games-fps/urbanterror/Manifest |   1 +
 ...urbanterror-4.3.4_p20211208-respect-flags.patch |  79 ++
 .../urbanterror/urbanterror-4.3.4_p20211208.ebuild | 172 +
 3 files changed, 252 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index d0d24bf966d5..ef2a679e0116 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.4_p20210304.tar.gz 6189619 BLAKE2B 
2a92674372c1d6c988f19179b4514926b171bc7e3e027242d261971c8ed40eca159fd33584ea869562b3002f721c31efd6d3e65c4f96ce2df1b61bcba19a8cbd
 SHA512 
ccdfa55ded774f19028250e6c8fcd371a5934284d85e265879193fab8f50c5026366f68c0bb359003f67528f2e2cb896dc6f3a3da5b5ea144d6e235e864d34e2
+DIST urbanterror-4.3.4_p20211208.tar.gz 6187667 BLAKE2B 
7901ad0d23d9b80634a3e4e68973227f302bb7004bdb1f450f7ab520f1a3243821aa49712a486d1e577e5bb055504d400fa273e64a2e2b57a75661044370
 SHA512 
24c0fe6775a165ddcc6b919bc46872fdcfff7e471c6ff88b635e6926bce051cc034e7ef8a5145996d67c79632cef763e4cc6c5c988d36088de0f69bb5626ff86

diff --git 
a/games-fps/urbanterror/files/urbanterror-4.3.4_p20211208-respect-flags.patch 
b/games-fps/urbanterror/files/urbanterror-4.3.4_p20211208-respect-flags.patch
new file mode 100644
index ..d6938f3a4609
--- /dev/null
+++ 
b/games-fps/urbanterror/files/urbanterror-4.3.4_p20211208-respect-flags.patch
@@ -0,0 +1,79 @@
+--- a/Makefile
 b/Makefile
+@@ -322,30 +322,30 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" 
"gnu_kfreebsd" "kfreebsd-gnu" "gnu")
+ -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
+   CLIENT_CFLAGS += $(SDL_CFLAGS)
+ 
+-  OPTIMIZEVM = -O3
+-  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++  OPTIMIZEVM =
++  OPTIMIZE = $(OPTIMIZEVM)
+ 
+   ifeq ($(ARCH),x86_64)
+-OPTIMIZEVM = -O3
+-OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++OPTIMIZEVM =
++OPTIMIZE = $(OPTIMIZEVM)
+ HAVE_VM_COMPILED = true
+   else
+   ifeq ($(ARCH),x86)
+-OPTIMIZEVM = -O3 -march=i586
+-OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++OPTIMIZEVM =
++OPTIMIZE = $(OPTIMIZEVM)
+ HAVE_VM_COMPILED=true
+   else
+   ifeq ($(ARCH),ppc)
+-ALTIVEC_CFLAGS = -maltivec
++ALTIVEC_CFLAGS =
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),ppc64)
+-ALTIVEC_CFLAGS = -maltivec
++ALTIVEC_CFLAGS =
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),sparc)
+-OPTIMIZE += -mtune=ultrasparc3 -mv8plus
+-OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
++OPTIMIZE +=
++OPTIMIZEVM +=
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),armv7l)
+@@ -1153,7 +1153,7 @@ endif
+ 
+ define DO_CC
+ $(echo_cmd) "CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) 
$(OPTIMIZE) -o $@ -c $<
+ endef
+ 
+ define DO_CC_ALTIVEC
+@@ -1163,7 +1163,7 @@ endef
+ 
+ define DO_REF_CC
+ $(echo_cmd) "REF_CC $<"
+-$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) 
-o $@ -c $<
+ endef
+ 
+ define DO_REF_CC_ALTIVEC
+@@ -1181,7 +1181,7 @@ endef
+ 
+ define DO_BOT_CC
+ $(echo_cmd) "BOT_CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ 
-c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) 
-DBOTLIB -o $@ -c $<
+ endef
+ 
+ ifeq ($(GENERATE_DEPENDENCIES),1)
+@@ -1195,7 +1195,7 @@ endef
+ 
+ define DO_DED_CC
+ $(echo_cmd) "DED_CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) 
$(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) 
$(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
+ endef
+ 
+ define DO_WINDRES

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
new file mode 100644
index ..5a8e0c3737e8
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/

2022-03-29 Thread Florian Schmaus
commit: a37d71ce2730ce36f465d0d927cd1a7220db61bf
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Mar 29 13:06:32 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Mar 29 13:07:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a37d71ce

games-fps/urbanterror: drop 4.3.4_p20210304

Signed-off-by: Florian Schmaus  gentoo.org>

 games-fps/urbanterror/Manifest |   1 -
 ...anterror-4.3.4_p20180708-fix-build_system.patch |  94 
 .../urbanterror/urbanterror-4.3.4_p20210304.ebuild | 169 -
 3 files changed, 264 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index ef2a679e0116..c979f83b10ba 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1 @@
-DIST urbanterror-4.3.4_p20210304.tar.gz 6189619 BLAKE2B 
2a92674372c1d6c988f19179b4514926b171bc7e3e027242d261971c8ed40eca159fd33584ea869562b3002f721c31efd6d3e65c4f96ce2df1b61bcba19a8cbd
 SHA512 
ccdfa55ded774f19028250e6c8fcd371a5934284d85e265879193fab8f50c5026366f68c0bb359003f67528f2e2cb896dc6f3a3da5b5ea144d6e235e864d34e2
 DIST urbanterror-4.3.4_p20211208.tar.gz 6187667 BLAKE2B 
7901ad0d23d9b80634a3e4e68973227f302bb7004bdb1f450f7ab520f1a3243821aa49712a486d1e577e5bb055504d400fa273e64a2e2b57a75661044370
 SHA512 
24c0fe6775a165ddcc6b919bc46872fdcfff7e471c6ff88b635e6926bce051cc034e7ef8a5145996d67c79632cef763e4cc6c5c988d36088de0f69bb5626ff86

diff --git 
a/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
 
b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
deleted file mode 100644
index fddd8df5bf37..
--- 
a/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Author: Nils Freydank 
-Date:   Fri Nov 17 20:30:00 2017 +0100
-
-Respect CFLAGS, CPPFLAGS etc. This patch is inspired
-by hasufell’s patch.
-
-Edit 2018-03-19: Now with server support!
-Edit 2018-09-01: Update to take Makefile changes into account.
-
 a/Makefile 2018-07-08 11:00:00.0 +0200
-+++ b/Makefile 2018-09-01 11:00:00.1 +0200
-@@ -308,34 +308,33 @@
- CLIENT_EXTRA_FILES=
- 
- ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" 
"gnu"))
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
---pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-+  BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-   CLIENT_CFLAGS += $(SDL_CFLAGS)
- 
--  OPTIMIZEVM = -O3
--  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+  OPTIMIZEVM =
-+  OPTIMIZE = $(OPTIMIZEVM)
- 
-   ifeq ($(ARCH),x86_64)
--OPTIMIZEVM = -O3
--OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+OPTIMIZEVM =
-+OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED = true
-   else
-   ifeq ($(ARCH),x86)
--OPTIMIZEVM = -O3 -march=i586
--OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+OPTIMIZEVM =
-+OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED=true
-   else
-   ifeq ($(ARCH),ppc)
--ALTIVEC_CFLAGS = -maltivec
-+ALTIVEC_CFLAGS =
- HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),ppc64)
--ALTIVEC_CFLAGS = -maltivec
-+ALTIVEC_CFLAGS =
- HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),sparc)
--OPTIMIZE += -mtune=ultrasparc3 -mv8plus
--OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
-+OPTIMIZE +=
-+OPTIMIZEVM +=
- HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),armv7l)
-@@ -1143,7 +1142,7 @@
- 
- define DO_CC
- $(echo_cmd) "CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) 
$(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_CC_ALTIVEC
-@@ -1153,7 +1152,7 @@
- 
- define DO_REF_CC
- $(echo_cmd) "REF_CC $<"
--$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) 
-o $@ -c $<
- endef
- 
- define DO_REF_CC_ALTIVEC
-@@ -1171,7 +1170,7 @@
- 
- define DO_BOT_CC
- $(echo_cmd) "BOT_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ 
-c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) 
-DBOTLIB -o $@ -c $<
- endef
- 
- ifeq ($(GENERATE_DEPENDENCIES),1)
-@@ -1185,7 +1184,7 @@
- 
- define DO_DED_CC
- $(echo_cmd) "DED_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) 
$(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) 
$(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_WINDRES
-

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild
deleted file mode 100644
index 79cdded4b1d5..
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2021-04-18 Thread Sam James
commit: 6c81c51ba01fffd9a8190d60c1749eb98cf09a89
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 18 06:25:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 18 06:31:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c81c51b

games-fps/urbanterror-data: port to EAPI 7, fix MissingLicenseRestricts

Signed-off-by: Sam James  gentoo.org>

 .../urbanterror-data/urbanterror-data-4.3.4.ebuild | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
index a3c4a290fb5..cb042123491 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
+
+CHECKREQS_DISK_BUILD="3300M"
+CHECKREQS_DISK_USR="1400M"
 
 inherit check-reqs
 
 ENGINE_PV=${PV}
-
 MY_PN=UrbanTerror
 MY_PV=43_full
 
 DESCRIPTION="Data files for UrbanTerror"
 HOMEPAGE="https://www.urbanterror.info;
-
 # load the base image and save it as .0 file
 # use 43_full-2.zip as upstream fixed something back then
 SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}_2.zip -> ${PN}-4.3.0.zip"
+S="${WORKDIR}/${MY_PN}43"
 
 # fetch updates recursively for |4.3.x-4.3.0|
 if [[ "${PV}" != "4.3.0" ]]; then
@@ -30,13 +32,9 @@ unset MY_CTR
 LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}43"
+RESTRICT="bindist mirror"
 
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1400M"
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2021-03-09 Thread Joonas Niilola
commit: e7228bdbc4c3b42666f4ed1e84f5785a291177b4
Author: Nils Freydank  posteo  de>
AuthorDate: Thu Mar  4 20:05:56 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar  9 09:07:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7228bdb

games-fps/urbanterror: Remove old version

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Nils Freydank  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/19765
Signed-off-by: Joonas Niilola  gentoo.org>

 games-fps/urbanterror/Manifest |   1 -
 .../urbanterror/urbanterror-4.3.4_p20200519.ebuild | 169 -
 2 files changed, 170 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index fb9c414b887..d0d24bf966d 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1 @@
-DIST urbanterror-4.3.4_p20200519.tar.gz 6188257 BLAKE2B 
931bc1c1f5b29dfc57c104400a5ea35fc2741ec1e2187ddd33e77a55aeb1580ec7dd21aa9670f0c94ee033b869ce2e6be05e9342e87d1a9707b9874f59c5cf06
 SHA512 
f86cbef8c0baa70baaa0de4ef380c72c98990940cec2b1050201c6878f7ababfb2ef44c37766519f25990badcb12c89c61aa7a7b123c44cc151ac0ef8d56
 DIST urbanterror-4.3.4_p20210304.tar.gz 6189619 BLAKE2B 
2a92674372c1d6c988f19179b4514926b171bc7e3e027242d261971c8ed40eca159fd33584ea869562b3002f721c31efd6d3e65c4f96ce2df1b61bcba19a8cbd
 SHA512 
ccdfa55ded774f19028250e6c8fcd371a5934284d85e265879193fab8f50c5026366f68c0bb359003f67528f2e2cb896dc6f3a3da5b5ea144d6e235e864d34e2

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20200519.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20200519.ebuild
deleted file mode 100644
index 902878edb27..000
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20200519.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
-   EGIT_BRANCH="urt"
-else
-   COMMIT_ID="58d8e9942101e0ca28a434b92e1d45d42eb2bd9a"
-   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
-REQUIRED_USE="|| ( client server )
-   voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.3.4_p20180708-fix-build_system.patch
-)
-
-RDEPEND="
-   client? (
-   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-   mumble? ( media-sound/mumble:= )
-   openal? ( media-libs/openal:= )
-   opus? ( media-libs/opusfile:= )
-   vorbis? ( media-libs/libvorbis:= )
-   )
-   curl? ( net-misc/curl )
-   ~games-fps/urbanterror-data-4.3.4
-   sys-libs/zlib:=[minizip]
-   virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-   if use client; then
-   if ! use openal && ! use opus && ! use vorbis; then
-   ewarn
-   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
-   fi
-   fi
-}
-
-src_configure() {
-   default
-
-   tc-export CC
-}
-
-src_compile() {
-   # Workaround for used zlib macro, which got renamed in Gentoo
-   # wrt bug #449510
-   append-cppflags "-DOF=_Z_OF"
-
-   local myemakeargs=(
-   ARCH=$(usex amd64 "x86_64" "i686" )
-   DEFAULT_BASEDIR="/usr/share/urbanterror"
-   BUILD_CLIENT=$(usex "client" 1 0)
-   BUILD_SERVER=$(usex "server" 1 0)
-   BUILD_BASEGAME=1
-   BUILD_MISSIONPACK=0
-   BUILD_GAME_SO=0
-   BUILD_GAME_QVM=0
-   BUILD_STANDALONE=1
-   SERVERBIN="Quake3-UrT-Ded"
-   CLIENTBIN="Quake3-UrT"
-   USE_RENDERER_DLOPEN=0
-   USE_YACC=0
-   BASEGAME="q3ut4"
-   BASEGAME_CFLAGS="${CFLAGS}"
-   USE_OPENAL=$(usex "openal" 1 0)
-   USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
-   USE_CURL=$(usex "curl" 1 0)
-   USE_CURL_DLOPEN=$(usex "curl" 1 0)
-   USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
-   USE_CODEC_OPUS=$(usex "opus" 1 0)
-   USE_MUMBLE=$(usex "mumble" 1 0)
-   USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
-   USE_VOIP=$(usex "mumble" 1 0)
-   USE_INTERNAL_LIBS=0
-   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2021-03-09 Thread Joonas Niilola
commit: 0d423307495d96f2e646ac678ee53d12aa0d8237
Author: Nils Freydank  posteo  de>
AuthorDate: Thu Mar  4 20:05:52 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar  9 09:07:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d423307

games-fps/urbanterror: Bump to 4.3.4_p20210304

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Nils Freydank  posteo.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.4_p20210304.ebuild | 169 +
 2 files changed, 170 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 247eede6162..fb9c414b887 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.4_p20200519.tar.gz 6188257 BLAKE2B 
931bc1c1f5b29dfc57c104400a5ea35fc2741ec1e2187ddd33e77a55aeb1580ec7dd21aa9670f0c94ee033b869ce2e6be05e9342e87d1a9707b9874f59c5cf06
 SHA512 
f86cbef8c0baa70baaa0de4ef380c72c98990940cec2b1050201c6878f7ababfb2ef44c37766519f25990badcb12c89c61aa7a7b123c44cc151ac0ef8d56
+DIST urbanterror-4.3.4_p20210304.tar.gz 6189619 BLAKE2B 
2a92674372c1d6c988f19179b4514926b171bc7e3e027242d261971c8ed40eca159fd33584ea869562b3002f721c31efd6d3e65c4f96ce2df1b61bcba19a8cbd
 SHA512 
ccdfa55ded774f19028250e6c8fcd371a5934284d85e265879193fab8f50c5026366f68c0bb359003f67528f2e2cb896dc6f3a3da5b5ea144d6e235e864d34e2

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild
new file mode 100644
index 000..79cdded4b1d
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="0429c03056720523d27ca71d5a4aa3e8d00709e7"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE="|| ( client server )
+   voip? ( opus )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.3.4_p20180708-fix-build_system.patch
+)
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? ( media-libs/libvorbis:= )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.4
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local myemakeargs=(
+   ARCH=$(usex amd64 "x86_64" "i686" )
+   DEFAULT_BASEDIR="/usr/share/urbanterror"
+   BUILD_CLIENT=$(usex "client" 1 0)
+   BUILD_SERVER=$(usex "server" 1 0)
+   BUILD_BASEGAME=1
+   BUILD_MISSIONPACK=0
+   BUILD_GAME_SO=0
+   BUILD_GAME_QVM=0
+   BUILD_STANDALONE=1
+   SERVERBIN="Quake3-UrT-Ded"
+   CLIENTBIN="Quake3-UrT"
+   USE_RENDERER_DLOPEN=0
+   USE_YACC=0
+   BASEGAME="q3ut4"
+   BASEGAME_CFLAGS="${CFLAGS}"
+   USE_OPENAL=$(usex "openal" 1 0)
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
+   USE_CURL=$(usex "curl" 1 0)
+   USE_CURL_DLOPEN=$(usex "curl" 1 0)
+   USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
+   USE_CODEC_OPUS=$(usex "opus" 1 0)
+   USE_MUMBLE=$(usex "mumble" 1 0)
+   USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
+   USE_VOIP=$(usex "mumble" 1 0)
+   USE_INTERNAL_LIBS=0
+   USE_LOCAL_HEADERS=0
+   USE_ALTGAMMA=$(usex 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2020-07-19 Thread James Le Cuirot
commit: e12df5d04252fe85d72842578112203654c4d0f5
Author: Nils Freydank  posteo  de>
AuthorDate: Mon Jul  6 12:30:37 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 12:05:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12df5d0

games-fps/urbanterror: Remove old version

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Nils Freydank  posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/16608
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/urbanterror/Manifest |   1 -
 .../urbanterror/urbanterror-4.3.4_p20180708.ebuild | 169 -
 2 files changed, 170 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 83c476c5fab..247eede6162 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1 @@
-DIST urbanterror-4.3.4_p20180708.tar.gz 6177724 BLAKE2B 
36439a1facc83a6151f0f6f28351bd56c196822832abbbab885312a216593b65a359187560c962caf2923b69f5519b17fe901a88c03f61ac576b6998a51ab227
 SHA512 
97c36d9ebcb4b915d077bb944808f45e88e0f544e6d0261f1e97e5a4bb33f3fd4120cf73d9463ea8da16848e4acb18218afe4042f00d9f759e7481b3e7aecd58
 DIST urbanterror-4.3.4_p20200519.tar.gz 6188257 BLAKE2B 
931bc1c1f5b29dfc57c104400a5ea35fc2741ec1e2187ddd33e77a55aeb1580ec7dd21aa9670f0c94ee033b869ce2e6be05e9342e87d1a9707b9874f59c5cf06
 SHA512 
f86cbef8c0baa70baaa0de4ef380c72c98990940cec2b1050201c6878f7ababfb2ef44c37766519f25990badcb12c89c61aa7a7b123c44cc151ac0ef8d56

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild
deleted file mode 100644
index 2eed0405afc..000
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit desktop flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
-   EGIT_BRANCH="urt"
-else
-   COMMIT_ID="167cb6b611ad27f30787a2fe204a7c65ec1fa18e"
-   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
-REQUIRED_USE="|| ( client server )
-   voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.3.4_p20180708-fix-build_system.patch
-)
-
-RDEPEND="
-   client? (
-   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-   mumble? ( media-sound/mumble:= )
-   openal? ( media-libs/openal:= )
-   opus? ( media-libs/opusfile:= )
-   vorbis? ( media-libs/libvorbis:= )
-   )
-   curl? ( net-misc/curl )
-   ~games-fps/urbanterror-data-4.3.4
-   sys-libs/zlib:=[minizip]
-   virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-   if use client; then
-   if ! use openal && ! use opus && ! use vorbis; then
-   ewarn
-   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
-   fi
-   fi
-}
-
-src_configure() {
-   default
-
-   tc-export CC
-}
-
-src_compile() {
-   # Workaround for used zlib macro, which got renamed in Gentoo
-   # wrt bug #449510
-   append-cppflags "-DOF=_Z_OF"
-
-   local myemakeargs=(
-   ARCH=$(usex amd64 "x86_64" "i686" )
-   DEFAULT_BASEDIR="/usr/share/urbanterror"
-   BUILD_CLIENT=$(usex "client" 1 0)
-   BUILD_SERVER=$(usex "server" 1 0)
-   BUILD_BASEGAME=1
-   BUILD_MISSIONPACK=0
-   BUILD_GAME_SO=0
-   BUILD_GAME_QVM=0
-   BUILD_STANDALONE=1
-   SERVERBIN="Quake3-UrT-Ded"
-   CLIENTBIN="Quake3-UrT"
-   USE_RENDERER_DLOPEN=0
-   USE_YACC=0
-   BASEGAME="q3ut4"
-   BASEGAME_CFLAGS="${CFLAGS}"
-   USE_OPENAL=$(usex "openal" 1 0)
-   USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
-   USE_CURL=$(usex "curl" 1 0)
-   USE_CURL_DLOPEN=$(usex "curl" 1 0)
-   USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
-   USE_CODEC_OPUS=$(usex "opus" 1 0)
-   USE_MUMBLE=$(usex "mumble" 1 0)
-   USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
-   USE_VOIP=$(usex "mumble" 1 0)
-   USE_INTERNAL_LIBS=0
-   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2020-07-19 Thread James Le Cuirot
commit: bfe7d3df2efc55e56b0b83912cdc23a5a28c2723
Author: Nils Freydank  posteo  de>
AuthorDate: Mon Jul  6 12:30:34 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 19 12:05:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe7d3df

games-fps/urbanterror: 4.3.4_p20200519

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Nils Freydank  posteo.de>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.4_p20200519.ebuild | 169 +
 2 files changed, 170 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 2fe3e1ecd71..83c476c5fab 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.4_p20180708.tar.gz 6177724 BLAKE2B 
36439a1facc83a6151f0f6f28351bd56c196822832abbbab885312a216593b65a359187560c962caf2923b69f5519b17fe901a88c03f61ac576b6998a51ab227
 SHA512 
97c36d9ebcb4b915d077bb944808f45e88e0f544e6d0261f1e97e5a4bb33f3fd4120cf73d9463ea8da16848e4acb18218afe4042f00d9f759e7481b3e7aecd58
+DIST urbanterror-4.3.4_p20200519.tar.gz 6188257 BLAKE2B 
931bc1c1f5b29dfc57c104400a5ea35fc2741ec1e2187ddd33e77a55aeb1580ec7dd21aa9670f0c94ee033b869ce2e6be05e9342e87d1a9707b9874f59c5cf06
 SHA512 
f86cbef8c0baa70baaa0de4ef380c72c98990940cec2b1050201c6878f7ababfb2ef44c37766519f25990badcb12c89c61aa7a7b123c44cc151ac0ef8d56

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20200519.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20200519.ebuild
new file mode 100644
index 000..902878edb27
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20200519.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="58d8e9942101e0ca28a434b92e1d45d42eb2bd9a"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE="|| ( client server )
+   voip? ( opus )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.3.4_p20180708-fix-build_system.patch
+)
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? ( media-libs/libvorbis:= )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.4
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local myemakeargs=(
+   ARCH=$(usex amd64 "x86_64" "i686" )
+   DEFAULT_BASEDIR="/usr/share/urbanterror"
+   BUILD_CLIENT=$(usex "client" 1 0)
+   BUILD_SERVER=$(usex "server" 1 0)
+   BUILD_BASEGAME=1
+   BUILD_MISSIONPACK=0
+   BUILD_GAME_SO=0
+   BUILD_GAME_QVM=0
+   BUILD_STANDALONE=1
+   SERVERBIN="Quake3-UrT-Ded"
+   CLIENTBIN="Quake3-UrT"
+   USE_RENDERER_DLOPEN=0
+   USE_YACC=0
+   BASEGAME="q3ut4"
+   BASEGAME_CFLAGS="${CFLAGS}"
+   USE_OPENAL=$(usex "openal" 1 0)
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
+   USE_CURL=$(usex "curl" 1 0)
+   USE_CURL_DLOPEN=$(usex "curl" 1 0)
+   USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
+   USE_CODEC_OPUS=$(usex "opus" 1 0)
+   USE_MUMBLE=$(usex "mumble" 1 0)
+   USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
+   USE_VOIP=$(usex "mumble" 1 0)
+   USE_INTERNAL_LIBS=0
+   USE_LOCAL_HEADERS=0
+   USE_ALTGAMMA=$(usex "altgamma" 1 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2019-09-24 Thread Michał Górny
commit: 5af6c8320589ffda2831083ec22284e2c5d5e8c6
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Sep 24 20:36:21 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Sep 24 20:36:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af6c832

games-fps/urbanterror-data: Add RESTRICT="bindist"

Signed-off-by: Michał Górny  gentoo.org>

 games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
index 556d1a44ce4..a3c4a290fb5 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -30,6 +30,7 @@ unset MY_CTR
 LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist"
 DEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_PN}43"



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/

2018-10-11 Thread Thomas Deutschmann
commit: cf5d7766d3f092350296317c00558a035acc7246
Author: Nils Freydank  posteo  de>
AuthorDate: Mon Oct  8 10:58:03 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct 12 00:56:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5d7766

games-fps/urbanterror: Bump to 4.3.4_p20180708

Signed-off-by: Nils Freydank  posteo.de>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann  gentoo.org>

 games-fps/urbanterror/Manifest |   1 +
 ...anterror-4.3.4_p20180708-fix-build_system.patch |  94 
 .../urbanterror/urbanterror-4.3.4_p20180708.ebuild | 169 +
 3 files changed, 264 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index d52c2c83a4b..d5f6b196cf1 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 
179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218
 SHA512 
8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef
+DIST urbanterror-4.3.4_p20180708.tar.gz 6177724 BLAKE2B 
36439a1facc83a6151f0f6f28351bd56c196822832abbbab885312a216593b65a359187560c962caf2923b69f5519b17fe901a88c03f61ac576b6998a51ab227
 SHA512 
97c36d9ebcb4b915d077bb944808f45e88e0f544e6d0261f1e97e5a4bb33f3fd4120cf73d9463ea8da16848e4acb18218afe4042f00d9f759e7481b3e7aecd58

diff --git 
a/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
 
b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
new file mode 100644
index 000..fddd8df5bf3
--- /dev/null
+++ 
b/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
@@ -0,0 +1,94 @@
+Author: Nils Freydank 
+Date:   Fri Nov 17 20:30:00 2017 +0100
+
+Respect CFLAGS, CPPFLAGS etc. This patch is inspired
+by hasufell’s patch.
+
+Edit 2018-03-19: Now with server support!
+Edit 2018-09-01: Update to take Makefile changes into account.
+
+--- a/Makefile 2018-07-08 11:00:00.0 +0200
 b/Makefile 2018-09-01 11:00:00.1 +0200
+@@ -308,34 +308,33 @@
+ CLIENT_EXTRA_FILES=
+ 
+ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" 
"gnu"))
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+--pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
++  BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
+   CLIENT_CFLAGS += $(SDL_CFLAGS)
+ 
+-  OPTIMIZEVM = -O3
+-  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++  OPTIMIZEVM =
++  OPTIMIZE = $(OPTIMIZEVM)
+ 
+   ifeq ($(ARCH),x86_64)
+-OPTIMIZEVM = -O3
+-OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++OPTIMIZEVM =
++OPTIMIZE = $(OPTIMIZEVM)
+ HAVE_VM_COMPILED = true
+   else
+   ifeq ($(ARCH),x86)
+-OPTIMIZEVM = -O3 -march=i586
+-OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++OPTIMIZEVM =
++OPTIMIZE = $(OPTIMIZEVM)
+ HAVE_VM_COMPILED=true
+   else
+   ifeq ($(ARCH),ppc)
+-ALTIVEC_CFLAGS = -maltivec
++ALTIVEC_CFLAGS =
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),ppc64)
+-ALTIVEC_CFLAGS = -maltivec
++ALTIVEC_CFLAGS =
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),sparc)
+-OPTIMIZE += -mtune=ultrasparc3 -mv8plus
+-OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
++OPTIMIZE +=
++OPTIMIZEVM +=
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),armv7l)
+@@ -1143,7 +1142,7 @@
+ 
+ define DO_CC
+ $(echo_cmd) "CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) 
$(OPTIMIZE) -o $@ -c $<
+ endef
+ 
+ define DO_CC_ALTIVEC
+@@ -1153,7 +1152,7 @@
+ 
+ define DO_REF_CC
+ $(echo_cmd) "REF_CC $<"
+-$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) 
-o $@ -c $<
+ endef
+ 
+ define DO_REF_CC_ALTIVEC
+@@ -1171,7 +1170,7 @@
+ 
+ define DO_BOT_CC
+ $(echo_cmd) "BOT_CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ 
-c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) 
-DBOTLIB -o $@ -c $<
+ endef
+ 
+ ifeq ($(GENERATE_DEPENDENCIES),1)
+@@ -1185,7 +1184,7 @@
+ 
+ define DO_DED_CC
+ $(echo_cmd) "DED_CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) 
$(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) 
$(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
+ endef
+ 
+ define DO_WINDRES
+

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20180708.ebuild
new file mode 100644
index 000..2eed0405afc
--- /dev/null
+++ 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/

2018-10-11 Thread Thomas Deutschmann
commit: 90634c11e58fb05e344b8259225cea15fd6ff75f
Author: Nils Freydank  posteo  de>
AuthorDate: Mon Oct  8 11:37:22 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct 12 00:56:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90634c11

games-fps/urbanterror: Cleanup old files

Signed-off-by: Nils Freydank  posteo.de>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10103
Signed-off-by: Thomas Deutschmann  gentoo.org>

 games-fps/urbanterror/Manifest |   1 -
 .../files/urbanterror-4.3-fix-build_system.patch   |  99 
 .../urbanterror-4.3.3_p20180218-fix-loop.patch |  59 ---
 .../urbanterror/urbanterror-4.3.4_p20180627.ebuild | 170 -
 4 files changed, 329 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index d5f6b196cf1..2fe3e1ecd71 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1 @@
-DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 
179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218
 SHA512 
8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef
 DIST urbanterror-4.3.4_p20180708.tar.gz 6177724 BLAKE2B 
36439a1facc83a6151f0f6f28351bd56c196822832abbbab885312a216593b65a359187560c962caf2923b69f5519b17fe901a88c03f61ac576b6998a51ab227
 SHA512 
97c36d9ebcb4b915d077bb944808f45e88e0f544e6d0261f1e97e5a4bb33f3fd4120cf73d9463ea8da16848e4acb18218afe4042f00d9f759e7481b3e7aecd58

diff --git a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch 
b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
deleted file mode 100644
index e0c4eb27f53..000
--- a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Author: Nils Freydank 
-Date:   Fri Nov 17 20:30:00 2017 +0100
-
-Respect CFLAGS, CPPFLAGS etc. This patch is inspired
-by hasufell’s patch.
-
-Edit 2018-03-19: Now with server support!
-
 a/Makefile 2018-03-19 11:00:00.0 +0100
-+++ b/Makefile 2018-03-19 11:00:00.1 +0100
-@@ -223,7 +223,7 @@
- ifndef USE_ALTGAMMA
-   # Clearskies - X11-based gamma for Linux
-   USE_ALTGAMMA=1
--endif
-+  endif
- 
- ifndef USE_SKEETMOD
-   USE_SKEETMOD=0
-@@ -306,34 +306,33 @@
- CLIENT_EXTRA_FILES=
- 
- ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" 
"gnu"))
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
---pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-+  BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-   CLIENT_CFLAGS += $(SDL_CFLAGS)
- 
--  OPTIMIZEVM = -O3
--  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+  OPTIMIZEVM =
-+  OPTIMIZE = $(OPTIMIZEVM)
- 
-   ifeq ($(ARCH),x86_64)
--OPTIMIZEVM = -O3
--OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+OPTIMIZEVM =
-+OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED = true
-   else
-   ifeq ($(ARCH),x86)
--OPTIMIZEVM = -O3 -march=i586
--OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+OPTIMIZEVM =
-+OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED=true
-   else
-   ifeq ($(ARCH),ppc)
--BASE_CFLAGS += -maltivec
-+BASE_CFLAGS +=
- HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),ppc64)
--BASE_CFLAGS += -maltivec
-+BASE_CFLAGS +=
- HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),sparc)
--OPTIMIZE += -mtune=ultrasparc3 -mv8plus
--OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
-+OPTIMIZE +=
-+OPTIMIZEVM +=
- HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),armv7l)
-@@ -1130,12 +1129,12 @@
- 
- define DO_CC
- $(echo_cmd) "CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) 
$(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_REF_CC
- $(echo_cmd) "REF_CC $<"
--$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) 
-o $@ -c $<
- endef
- 
- define DO_REF_STR
-@@ -1148,7 +1147,7 @@
- 
- define DO_BOT_CC
- $(echo_cmd) "BOT_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ 
-c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) 
-DBOTLIB -o $@ -c $<
- endef
- 
- ifeq ($(GENERATE_DEPENDENCIES),1)
-@@ -1162,7 +1161,7 @@
- 
- define DO_DED_CC
- $(echo_cmd) "DED_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) 
$(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) 
$(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_WINDRES
-

diff --git 
a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2018-07-18 Thread Andreas Sturmlechner
commit: e4120eb32efff02995ccbad58359d9158f799895
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul 17 21:27:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 18 06:30:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4120eb3

games-fps/urbanterror-data: Drop eutils

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
index a771f69e5db..d8afd529274 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-inherit check-reqs eutils
+
+inherit check-reqs
 
 ENGINE_PV=${PV}
 



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2018-07-18 Thread Andreas Sturmlechner
commit: 5b090e3326aac943a51ad223dfac32500b87f5d0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul 17 21:28:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 18 06:30:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b090e33

games-fps/urbanterror-data: Missing || die

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
index d8afd529274..556d1a44ce4 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
@@ -47,7 +47,7 @@ src_prepare() {
MY_CTR=0
while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
cp -dfpr \
-   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
+   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}" || die
MY_CTR=$(( ${MY_CTR} + 1 ))
done
fi



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2018-07-18 Thread Andreas Sturmlechner
commit: 177c1c1e56ee9ba53a2b02171b882e3418558501
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul 17 21:26:54 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 18 06:30:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=177c1c1e

games-fps/urbanterror-data: https

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
index 0fbf3555118..a771f69e5db 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
@@ -10,7 +10,7 @@ MY_PN=UrbanTerror
 MY_PV=43_full
 
 DESCRIPTION="Data files for UrbanTerror"
-HOMEPAGE="http://www.urbanterror.info;
+HOMEPAGE="https://www.urbanterror.info;
 
 # load the base image and save it as .0 file
 # use 43_full-2.zip as upstream fixed something back then



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2018-07-06 Thread Andreas Sturmlechner
commit: 1a09f8900a68d4fae17d11d3b0dfbce9017f
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Jul  3 16:30:45 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a09f890

games-fps/urbanterror-data: Bump to 4.3.4

Bug: https://bugs.gentoo.org/658962
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9017

 games-fps/urbanterror-data/Manifest|  1 +
 .../urbanterror-data/urbanterror-data-4.3.4.ebuild | 65 ++
 2 files changed, 66 insertions(+)

diff --git a/games-fps/urbanterror-data/Manifest 
b/games-fps/urbanterror-data/Manifest
index a43a3e00145..0d0c3b281c1 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -2,3 +2,4 @@ DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 BLAKE2B 
a4562c81169274e6f7685c9
 DIST urbanterror-data-4.3.0.zip 1490106979 BLAKE2B 
2bee5e869b3929564cdba268765f6fda67ec1e4fb55209cac3f7b51b418bba287ba22112e5cd4db8ff2aae81ac836a31640760b1e4b24440054f2b2ee4d7e3c3
 SHA512 
2f54b59355f790a65b3dbd205e9e8b30d41856f5010a55e9e1436a6ec78e986ceecf78c8d84fac1060702c38a7df849f78a2832bdccb91ea46444877635b32ea
 DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B 
d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d
 SHA512 
cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
 DIST urbanterror-data-4.3.2-to-4.3.3.zip 10409736 BLAKE2B 
edc33e959cd16528ef732ae31335412c7c7741ccc5f106d2c0c6236f180cf9fd9b14a23b5e4a60d91aa9b8c4126fae5f110034216d5d2ae63ab784fc16532730
 SHA512 
f2100bf11b5dc0dac265f43fe6c8aa0a1e604728ce02b5b6ca770c9145d11bf02a7e2118ff818d1fdb2b9693ddb85eb012814f346337ef14c58c3a4f3e3abb90
+DIST urbanterror-data-4.3.3-to-4.3.4.zip 10421275 BLAKE2B 
95ad6f395fef538fcb5e0413070fda7752759244d968649b0f59d2d9060cd79645a5485c554f2afc74028b7664dc907183ab99274db96826c00169ef5235c577
 SHA512 
05e14a1411a606fc7aeec3fa6393227af87afcf1ddd5ed5210c6612a9a1c15e0c4f9e14c40d43c078ac3fdbf519e9e8cb7d7a7983b7fceb39d11222d14ed39d6

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
new file mode 100644
index 000..0fbf3555118
--- /dev/null
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit check-reqs eutils
+
+ENGINE_PV=${PV}
+
+MY_PN=UrbanTerror
+MY_PV=43_full
+
+DESCRIPTION="Data files for UrbanTerror"
+HOMEPAGE="http://www.urbanterror.info;
+
+# load the base image and save it as .0 file
+# use 43_full-2.zip as upstream fixed something back then
+SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}_2.zip -> ${PN}-4.3.0.zip"
+
+# fetch updates recursively for |4.3.x-4.3.0|
+if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   SRC_URI="${SRC_URI} 
https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 
)).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+fi
+unset MY_CTR
+
+LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}43"
+
+CHECKREQS_DISK_BUILD="3300M"
+CHECKREQS_DISK_USR="1400M"
+
+src_prepare() {
+   default
+
+   # apply updates we fetched before
+   # again recursively for |4.3.x - 4.3.0|
+   local MY_CTR
+   if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   cp -dfpr \
+   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+   fi
+}
+
+src_install() {
+   insinto /usr/share/urbanterror/q3ut4
+   doins q3ut4/*.pk3
+   # These files are *essential* for startup
+   newins q3ut4/server_example.cfg server.cfg
+   newins q3ut4/autoexec_example.cfg autoexec.cfg
+
+   dodoc q3ut4/readme43.txt
+   docinto examples
+   dodoc q3ut4/{server_example.cfg,mapcycle_example.txt}
+}



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-07-06 Thread Andreas Sturmlechner
commit: 68da6677f50156630d9d8463996da24d878fd7d1
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Jul  3 16:31:01 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68da6677

games-fps/urbanterror: Drop old version 4.3.3

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 games-fps/urbanterror/Manifest |   2 -
 .../urbanterror/urbanterror-4.3.3_p20180218.ebuild | 167 
 .../urbanterror/urbanterror-4.3.3_p20180410.ebuild | 170 -
 3 files changed, 339 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 24fb99b754a..d52c2c83a4b 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,3 +1 @@
-DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
-DIST urbanterror-4.3.3_p20180410.tar.gz 10070300 BLAKE2B 
c81b93137b7c528354b3d894d45636195947ab4f7e3e8af031e8c164114fa3db16d500046187ce5ad688a6d6c65844b1b1b1282773c2171b38f59c7093d251dd
 SHA512 
ea9021543c91ef7619f1f15febecd36c1e38a382c4959d5916022c108458a17f3649ac74784da0c06ef2ed738390bd247888ca4ba8d033b8c1121ab9540dcb31
 DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 
179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218
 SHA512 
8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef

diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild
deleted file mode 100644
index e211e749ba5..000
--- a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
-   EGIT_BRANCH="urt"
-else
-   COMMIT_ID="d93f05de38a6cae60fbf0f073aace64b3adc7aaf"
-   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
-REQUIRED_USE="|| ( client server )
-   voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.3-fix-build_system.patch
-   "${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
-)
-
-RDEPEND="
-   client? (
-   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-   mumble? ( media-sound/mumble:= )
-   openal? ( media-libs/openal:= )
-   opus? ( media-libs/opusfile:= )
-   vorbis? ( media-libs/libvorbis:= )
-   )
-   curl? ( net-misc/curl )
-   ~games-fps/urbanterror-data-4.3.3
-   sys-libs/zlib:=[minizip]
-   virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-   if use client; then
-   if ! use openal && ! use opus && ! use vorbis; then
-   ewarn
-   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
-   fi
-   fi
-}
-
-src_configure() {
-   default
-
-   tc-export CC
-}
-
-src_compile() {
-   # Workaround for used zlib macro, which got renamed in Gentoo
-   # wrt bug #449510
-   append-cppflags "-DOF=_Z_OF"
-
-   local my_arch=$(usex amd64 "x86_64" "i386")
-
-   emake \
-   ARCH=${my_arch} \
-   DEFAULT_BASEDIR="/usr/share/urbanterror" \
-   BUILD_CLIENT=$(usex "client" 1 0) \
-   BUILD_SERVER=$(usex "server" 1 0) \
-   BUILD_BASEGAME=1 \
-   BUILD_MISSIONPACK=0 \
-   BUILD_GAME_SO=0 \
-   BUILD_GAME_QVM=0 \
-   BUILD_STANDALONE=1 \
-   SERVERBIN="Quake3-UrT-Ded" \
-   CLIENTBIN="Quake3-UrT" \
-   USE_RENDERER_DLOPEN=0 \
-   USE_YACC=0 \
-   BASEGAME="q3ut4"\
-   BASEGAME_CFLAGS="${CFLAGS}" \
-   USE_OPENAL=$(usex "openal" 1 0) \
-   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
-   USE_CURL=$(usex 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2018-07-06 Thread Andreas Sturmlechner
commit: 32d63e76b6e810dd50bcf403ab9f1da30cf161f0
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Jul  3 16:30:57 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d63e76

games-fps/urbanterror-data: Drop old version

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../urbanterror-data/urbanterror-data-4.3.3.ebuild | 65 --
 1 file changed, 65 deletions(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild
deleted file mode 100644
index 0fbf3555118..000
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit check-reqs eutils
-
-ENGINE_PV=${PV}
-
-MY_PN=UrbanTerror
-MY_PV=43_full
-
-DESCRIPTION="Data files for UrbanTerror"
-HOMEPAGE="http://www.urbanterror.info;
-
-# load the base image and save it as .0 file
-# use 43_full-2.zip as upstream fixed something back then
-SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}_2.zip -> ${PN}-4.3.0.zip"
-
-# fetch updates recursively for |4.3.x-4.3.0|
-if [[ "${PV}" != "4.3.0" ]]; then
-   MY_CTR=0
-   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-   SRC_URI="${SRC_URI} 
https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 
)).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
-   MY_CTR=$(( ${MY_CTR} + 1 ))
-   done
-fi
-unset MY_CTR
-
-LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}43"
-
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1400M"
-
-src_prepare() {
-   default
-
-   # apply updates we fetched before
-   # again recursively for |4.3.x - 4.3.0|
-   local MY_CTR
-   if [[ "${PV}" != "4.3.0" ]]; then
-   MY_CTR=0
-   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-   cp -dfpr \
-   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
-   MY_CTR=$(( ${MY_CTR} + 1 ))
-   done
-   fi
-}
-
-src_install() {
-   insinto /usr/share/urbanterror/q3ut4
-   doins q3ut4/*.pk3
-   # These files are *essential* for startup
-   newins q3ut4/server_example.cfg server.cfg
-   newins q3ut4/autoexec_example.cfg autoexec.cfg
-
-   dodoc q3ut4/readme43.txt
-   docinto examples
-   dodoc q3ut4/{server_example.cfg,mapcycle_example.txt}
-}



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-07-06 Thread Andreas Sturmlechner
commit: 358fca68df1bfb0e7099e260b1d22c9d6ade0c3d
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Jul  3 16:30:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul  6 21:47:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358fca68

games-fps/urbanterror: Bump to 4.3.4_p20180627

Closes: https://bugs.gentoo.org/658962
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.4_p20180627.ebuild | 170 +
 2 files changed, 171 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 66630f2fd9b..24fb99b754a 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1,3 @@
 DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
 DIST urbanterror-4.3.3_p20180410.tar.gz 10070300 BLAKE2B 
c81b93137b7c528354b3d894d45636195947ab4f7e3e8af031e8c164114fa3db16d500046187ce5ad688a6d6c65844b1b1b1282773c2171b38f59c7093d251dd
 SHA512 
ea9021543c91ef7619f1f15febecd36c1e38a382c4959d5916022c108458a17f3649ac74784da0c06ef2ed738390bd247888ca4ba8d033b8c1121ab9540dcb31
+DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 
179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218
 SHA512 
8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef

diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
new file mode 100644
index 000..04d4459533e
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit desktop eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE="|| ( client server )
+   voip? ( opus )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.3-fix-build_system.patch
+   "${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
+)
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? ( media-libs/libvorbis:= )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.4
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local myemakeargs=(
+   ARCH=$(usex amd64 "x86_64" "i686" )
+   DEFAULT_BASEDIR="/usr/share/urbanterror"
+   BUILD_CLIENT=$(usex "client" 1 0)
+   BUILD_SERVER=$(usex "server" 1 0)
+   BUILD_BASEGAME=1
+   BUILD_MISSIONPACK=0
+   BUILD_GAME_SO=0
+   BUILD_GAME_QVM=0
+   BUILD_STANDALONE=1
+   SERVERBIN="Quake3-UrT-Ded"
+   CLIENTBIN="Quake3-UrT"
+   USE_RENDERER_DLOPEN=0
+   USE_YACC=0
+   BASEGAME="q3ut4"
+   BASEGAME_CFLAGS="${CFLAGS}"
+   USE_OPENAL=$(usex "openal" 1 0)
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
+   USE_CURL=$(usex "curl" 1 0)
+   USE_CURL_DLOPEN=$(usex "curl" 1 0)
+   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-05-09 Thread Michał Górny
commit: c50123b3148ef3727591f9f2dd1d35810ddaa90a
Author: Nils Freydank  posteo  de>
AuthorDate: Thu May  3 19:16:37 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed May  9 11:15:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50123b3

games-fps/urbanterror: Bump to 4.3.3_p20180410.

Package-Manager: Portage-2.3.33, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8204

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.3_p20180410.ebuild | 170 +
 2 files changed, 171 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index d5ee8bfb49d..66630f2fd9b 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
+DIST urbanterror-4.3.3_p20180410.tar.gz 10070300 BLAKE2B 
c81b93137b7c528354b3d894d45636195947ab4f7e3e8af031e8c164114fa3db16d500046187ce5ad688a6d6c65844b1b1b1282773c2171b38f59c7093d251dd
 SHA512 
ea9021543c91ef7619f1f15febecd36c1e38a382c4959d5916022c108458a17f3649ac74784da0c06ef2ed738390bd247888ca4ba8d033b8c1121ab9540dcb31

diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild
new file mode 100644
index 000..ebea9db38f9
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.3_p20180410.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit desktop eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="d6db4589efd1ff2b7a4fa2983e58993d06098327"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE="|| ( client server )
+   voip? ( opus )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.3-fix-build_system.patch
+   "${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
+)
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? ( media-libs/libvorbis:= )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.3
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local myemakeargs=(
+   ARCH=$(usex amd64 "x86_64" "i686" )
+   DEFAULT_BASEDIR="/usr/share/urbanterror"
+   BUILD_CLIENT=$(usex "client" 1 0)
+   BUILD_SERVER=$(usex "server" 1 0)
+   BUILD_BASEGAME=1
+   BUILD_MISSIONPACK=0
+   BUILD_GAME_SO=0
+   BUILD_GAME_QVM=0
+   BUILD_STANDALONE=1
+   SERVERBIN="Quake3-UrT-Ded"
+   CLIENTBIN="Quake3-UrT"
+   USE_RENDERER_DLOPEN=0
+   USE_YACC=0
+   BASEGAME="q3ut4"
+   BASEGAME_CFLAGS="${CFLAGS}"
+   USE_OPENAL=$(usex "openal" 1 0)
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
+   USE_CURL=$(usex "curl" 1 0)
+   USE_CURL_DLOPEN=$(usex "curl" 1 0)
+   USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
+   USE_CODEC_OPUS=$(usex "opus" 1 0)
+   USE_MUMBLE=$(usex "mumble" 1 0)
+   USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
+   USE_VOIP=$(usex "mumble" 1 0)
+   USE_INTERNAL_LIBS=0
+   USE_LOCAL_HEADERS=0
+   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/

2018-03-19 Thread Michał Górny
commit: d26453b62aa943abea979a8804dbcd0cfd54b4fb
Author: Nils Freydank  posteo  de>
AuthorDate: Mon Mar 19 11:20:44 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Mar 19 16:52:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d26453b6

games-fps/urbanterror: Fix Makefile patch.

Closes: https://bugs.gentoo.org/650232
Closes: https://github.com/gentoo/gentoo/pull/7506
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/urbanterror-4.3-fix-build_system.patch   | 32 --
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch 
b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
index b7a24a1b6e9..e0c4eb27f53 100644
--- a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
+++ b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
@@ -4,8 +4,10 @@ Date:   Fri Nov 17 20:30:00 2017 +0100
 Respect CFLAGS, CPPFLAGS etc. This patch is inspired
 by hasufell’s patch.
 
 a/Makefile  2017-03-31 11:08:58.419210817 +0200
-+++ b/Makefile 2017-11-17 20:30:00.0 +0100
+Edit 2018-03-19: Now with server support!
+
+--- a/Makefile 2018-03-19 11:00:00.0 +0100
 b/Makefile 2018-03-19 11:00:00.1 +0100
 @@ -223,7 +223,7 @@
  ifndef USE_ALTGAMMA
# Clearskies - X11-based gamma for Linux
@@ -61,7 +63,7 @@ by hasufell’s patch.
  HAVE_VM_COMPILED=true
endif
ifeq ($(ARCH),armv7l)
-@@ -1124,7 +1123,7 @@
+@@ -1130,12 +1129,12 @@
  
  define DO_CC
  $(echo_cmd) "CC $<"
@@ -70,4 +72,28 @@ by hasufell’s patch.
  endef
  
  define DO_REF_CC
+ $(echo_cmd) "REF_CC $<"
+-$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) 
-o $@ -c $<
+ endef
+ 
+ define DO_REF_STR
+@@ -1148,7 +1147,7 @@
+ 
+ define DO_BOT_CC
+ $(echo_cmd) "BOT_CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ 
-c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) 
-DBOTLIB -o $@ -c $<
+ endef
+ 
+ ifeq ($(GENERATE_DEPENDENCIES),1)
+@@ -1162,7 +1161,7 @@
+ 
+ define DO_DED_CC
+ $(echo_cmd) "DED_CC $<"
+-$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) 
$(OPTIMIZE) -o $@ -c $<
++$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) 
$(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
+ endef
+ 
+ define DO_WINDRES
 



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/

2018-03-15 Thread Andreas Sturmlechner
commit: a7e603f66b80181f742b5fda476c185753ae1ce6
Author: Nils Freydank  posteo  de>
AuthorDate: Wed Mar 14 21:43:18 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 15 22:27:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e603f6

games-fps/urbanterror: Bump to 4.3.3_p20180218

Note that the engine's code is still the same.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror-4.3.3_p20180218-fix-loop.patch |  59 
 .../urbanterror/urbanterror-4.3.3_p20180218.ebuild | 167 +
 3 files changed, 227 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 2534ae6fbba..2fd75ae2d2b 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1,3 @@
 DIST urbanterror-4.3.2_p20180216.tar.gz 10070633 BLAKE2B 
38724030fc87e0800b9d6d1814efafc244584832e9fe78df060f2603040d72ee38602e300c3c765dfab4f803c9ae0e63116daf01601e571357a914509a6a8672
 SHA512 
88aa12a492f1d94e956ab4a8a1caeec259081043706b160d87fffe91b502399c0ddc34a4566463f336ae1b133cf250920ccd718647ac13d2eb48ddf9e6bb5517
 DIST urbanterror-4.3.2_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
+DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8

diff --git 
a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch 
b/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch
new file mode 100644
index 000..c34ebe84ced
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch
@@ -0,0 +1,59 @@
+Author: Nils Freydank 
+Date:   Wed Mar 14 21:00:00 2017 +0100
+
+Imported patch written by Tom Murphy via github.com:
+
+https://github.com/ioquake/ioq3/pull/356
+
+diff --git a/code/sys/con_tty.c b/code/sys/con_tty.c
+index 2c2b595cf..58f178ade 100644
+--- a/code/sys/con_tty.c
 b/code/sys/con_tty.c
+@@ -73,20 +73,6 @@ static int hist_current = -1, hist_count = 0;
+ #define TTY_CONSOLE_PROMPT "]"
+ #endif
+ 
+-/*
+-==
+-CON_FlushIn
+-
+-Flush stdin, I suspect some terminals are sending a LOT of shit
+-FIXME relevant?
+-==
+-*/
+-static void CON_FlushIn( void )
+-{
+-  char key;
+-  while (read(STDIN_FILENO, , 1)!=-1);
+-}
+-
+ /*
+ ==
+ CON_Back
+@@ -441,7 +427,7 @@ char *CON_Input( void )
+   
TTY_con = *history;
+   
CON_Show();
+   }
+-  
CON_FlushIn();
++  
tcflush(STDIN_FILENO, TCIFLUSH);
+   return 
NULL;
+   break;
+   case 'B':
+@@ -455,7 +441,7 @@ char *CON_Input( void )
+   
Field_Clear(_con);
+   }
+   
CON_Show();
+-  
CON_FlushIn();
++  
tcflush(STDIN_FILENO, TCIFLUSH);
+   return 
NULL;
+   break;
+   case 'C':
+@@ -467,7 +453,7 @@ char *CON_Input( void )
+   }
+   }
+   Com_DPrintf("droping ISCTL sequence: %d, 
TTY_erase: %d\n", key, TTY_erase);
+-  CON_FlushIn();
++  tcflush(STDIN_FILENO, TCIFLUSH);
+   return NULL;
+   }
+   if (TTY_con.cursor >= sizeof(text) - 1)

diff --git a/games-fps/urbanterror/urbanterror-4.3.3_p20180218.ebuild 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2018-03-15 Thread Andreas Sturmlechner
commit: 9fad0fd6d31e554c83eccdca2d0a9d8b77ec698e
Author: Nils Freydank  posteo  de>
AuthorDate: Wed Mar 14 21:40:05 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 15 22:27:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fad0fd6

games-fps/urbanterror-data: Bump to 4.3.3

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7465

 games-fps/urbanterror-data/Manifest|  2 +
 .../urbanterror-data/urbanterror-data-4.3.3.ebuild | 65 ++
 2 files changed, 67 insertions(+)

diff --git a/games-fps/urbanterror-data/Manifest 
b/games-fps/urbanterror-data/Manifest
index 75f0a116fba..659b3d0b1b4 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -1,3 +1,5 @@
 DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 BLAKE2B 
a4562c81169274e6f7685c9ca771c0e004ec40aa123d0757794e89c019bbd6e280f22e0929dc6917b0a43d9fe6e6ea90a4f190ce01ff2e6be087299a9bb64cab
 SHA512 
f05564babadff73793778926411bc7914bfef4a5f7dfc1003c36e8a549c568ab520adcff8a38e7dd905238738d242aa865e7c6d7db36ed6d592b144e497ed823
+DIST urbanterror-data-4.3.0.zip 1490106979 BLAKE2B 
2bee5e869b3929564cdba268765f6fda67ec1e4fb55209cac3f7b51b418bba287ba22112e5cd4db8ff2aae81ac836a31640760b1e4b24440054f2b2ee4d7e3c3
 SHA512 
2f54b59355f790a65b3dbd205e9e8b30d41856f5010a55e9e1436a6ec78e986ceecf78c8d84fac1060702c38a7df849f78a2832bdccb91ea46444877635b32ea
 DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B 
d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d
 SHA512 
cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
+DIST urbanterror-data-4.3.2-to-4.3.3.zip 10409736 BLAKE2B 
edc33e959cd16528ef732ae31335412c7c7741ccc5f106d2c0c6236f180cf9fd9b14a23b5e4a60d91aa9b8c4126fae5f110034216d5d2ae63ab784fc16532730
 SHA512 
f2100bf11b5dc0dac265f43fe6c8aa0a1e604728ce02b5b6ca770c9145d11bf02a7e2118ff818d1fdb2b9693ddb85eb012814f346337ef14c58c3a4f3e3abb90
 DIST urbanterror-data-4.3.2.zip 1491207564 BLAKE2B 
3a292079d92895fa28567e8773d504a9f4b179de6d49607e9d589674374690a1fa673b0b8b08790b126140c8e8583ca3ee6f8439ea28e0f868fab6f4bc1a6268
 SHA512 
397aa5ba7f869049844d52a9dec234d020b856e16ba3ff295d97775e4e1d48730aecfba3992baf7d55c643c0073ceda32ada18d1473dadd55f561f27a8b9c4ed

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild
new file mode 100644
index 000..0fbf3555118
--- /dev/null
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit check-reqs eutils
+
+ENGINE_PV=${PV}
+
+MY_PN=UrbanTerror
+MY_PV=43_full
+
+DESCRIPTION="Data files for UrbanTerror"
+HOMEPAGE="http://www.urbanterror.info;
+
+# load the base image and save it as .0 file
+# use 43_full-2.zip as upstream fixed something back then
+SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}_2.zip -> ${PN}-4.3.0.zip"
+
+# fetch updates recursively for |4.3.x-4.3.0|
+if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   SRC_URI="${SRC_URI} 
https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 
)).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+fi
+unset MY_CTR
+
+LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}43"
+
+CHECKREQS_DISK_BUILD="3300M"
+CHECKREQS_DISK_USR="1400M"
+
+src_prepare() {
+   default
+
+   # apply updates we fetched before
+   # again recursively for |4.3.x - 4.3.0|
+   local MY_CTR
+   if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   cp -dfpr \
+   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+   fi
+}
+
+src_install() {
+   insinto /usr/share/urbanterror/q3ut4
+   doins q3ut4/*.pk3
+   # These files are *essential* for startup
+   newins q3ut4/server_example.cfg server.cfg
+   newins q3ut4/autoexec_example.cfg autoexec.cfg
+
+   dodoc q3ut4/readme43.txt
+   docinto examples
+   dodoc q3ut4/{server_example.cfg,mapcycle_example.txt}
+}



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2018-03-15 Thread Andreas Sturmlechner
commit: 0d4076278ce9123027bfcdab581e942473c71486
Author: Nils Freydank  posteo  de>
AuthorDate: Wed Mar 14 21:45:05 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 15 22:27:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d407627

games-fps/urbanterror-data: Drop old version (4.3.2-r1)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-fps/urbanterror-data/Manifest|  1 -
 .../urbanterror-data-4.3.2-r1.ebuild   | 66 --
 2 files changed, 67 deletions(-)

diff --git a/games-fps/urbanterror-data/Manifest 
b/games-fps/urbanterror-data/Manifest
index 659b3d0b1b4..a43a3e00145 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -2,4 +2,3 @@ DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 BLAKE2B 
a4562c81169274e6f7685c9
 DIST urbanterror-data-4.3.0.zip 1490106979 BLAKE2B 
2bee5e869b3929564cdba268765f6fda67ec1e4fb55209cac3f7b51b418bba287ba22112e5cd4db8ff2aae81ac836a31640760b1e4b24440054f2b2ee4d7e3c3
 SHA512 
2f54b59355f790a65b3dbd205e9e8b30d41856f5010a55e9e1436a6ec78e986ceecf78c8d84fac1060702c38a7df849f78a2832bdccb91ea46444877635b32ea
 DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B 
d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d
 SHA512 
cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
 DIST urbanterror-data-4.3.2-to-4.3.3.zip 10409736 BLAKE2B 
edc33e959cd16528ef732ae31335412c7c7741ccc5f106d2c0c6236f180cf9fd9b14a23b5e4a60d91aa9b8c4126fae5f110034216d5d2ae63ab784fc16532730
 SHA512 
f2100bf11b5dc0dac265f43fe6c8aa0a1e604728ce02b5b6ca770c9145d11bf02a7e2118ff818d1fdb2b9693ddb85eb012814f346337ef14c58c3a4f3e3abb90
-DIST urbanterror-data-4.3.2.zip 1491207564 BLAKE2B 
3a292079d92895fa28567e8773d504a9f4b179de6d49607e9d589674374690a1fa673b0b8b08790b126140c8e8583ca3ee6f8439ea28e0f868fab6f4bc1a6268
 SHA512 
397aa5ba7f869049844d52a9dec234d020b856e16ba3ff295d97775e4e1d48730aecfba3992baf7d55c643c0073ceda32ada18d1473dadd55f561f27a8b9c4ed

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
deleted file mode 100644
index 7eebf9e788f..000
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit check-reqs eutils
-
-ENGINE_PV=${PV}
-
-MY_PN=UrbanTerror
-MY_PV=43_full
-
-DESCRIPTION="Data files for UrbanTerror"
-HOMEPAGE="http://www.urbanterror.info;
-
-# Todo in the next release: save into ${PN}-4.3.0.zip
-# I just made a mistake, but loading some GiB just for
-# a mostly cosmetical fix isn’t worth the bandwith.
-SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}.zip -> ${P}.zip"
-
-# fetch updates recursively for |4.3.x-4.3.0|
-if [[ "${PV}" != "4.3.0" ]]; then
-   MY_CTR=0
-   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-   SRC_URI="${SRC_URI} 
https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 
)).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
-   MY_CTR=$(( ${MY_CTR} + 1 ))
-   done
-fi
-unset MY_CTR
-
-LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}43"
-
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1400M"
-
-src_prepare() {
-   default
-
-   # apply updates we fetched before
-   # again recursively for |4.3.x - 4.3.0|
-   local MY_CTR
-   if [[ "${PV}" != "4.3.0" ]]; then
-   MY_CTR=0
-   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-   cp -dfpr \
-   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
-   MY_CTR=$(( ${MY_CTR} + 1 ))
-   done
-   fi
-}
-
-src_install() {
-   insinto /usr/share/urbanterror/q3ut4
-   doins q3ut4/*.pk3
-   # These files are *essential* for startup
-   newins q3ut4/server_example.cfg server.cfg
-   newins q3ut4/autoexec_example.cfg autoexec.cfg
-
-   dodoc q3ut4/readme43.txt
-   docinto examples
-   dodoc q3ut4/{server_example.cfg,mapcycle_example.txt}
-}



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-03-15 Thread Andreas Sturmlechner
commit: ed2fcc0d0f6d238d0862b33bbd8f9e46c8894516
Author: Nils Freydank  posteo  de>
AuthorDate: Wed Mar 14 21:44:41 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 15 22:27:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2fcc0d

games-fps/urbanterror: Drop old versions (4.3.2)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-fps/urbanterror/Manifest |   2 -
 .../urbanterror/urbanterror-4.3.2_p20180216.ebuild | 165 -
 .../urbanterror/urbanterror-4.3.2_p20180218.ebuild | 165 -
 3 files changed, 332 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 2fd75ae2d2b..d5ee8bfb49d 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,3 +1 @@
-DIST urbanterror-4.3.2_p20180216.tar.gz 10070633 BLAKE2B 
38724030fc87e0800b9d6d1814efafc244584832e9fe78df060f2603040d72ee38602e300c3c765dfab4f803c9ae0e63116daf01601e571357a914509a6a8672
 SHA512 
88aa12a492f1d94e956ab4a8a1caeec259081043706b160d87fffe91b502399c0ddc34a4566463f336ae1b133cf250920ccd718647ac13d2eb48ddf9e6bb5517
-DIST urbanterror-4.3.2_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8
 DIST urbanterror-4.3.3_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180216.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20180216.ebuild
deleted file mode 100644
index a82be5ecbcb..000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20180216.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
-   EGIT_BRANCH="urt"
-else
-   COMMIT_ID="1042e6b80f6fe50c46c8242b1e0bf3de80c676ef"
-   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
-
-RDEPEND="
-   client? (
-   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-   mumble? ( media-sound/mumble:= )
-   openal? ( media-libs/openal:= )
-   opus? ( media-libs/opusfile:= )
-   vorbis? (
-   media-libs/libogg:=
-   media-libs/libvorbis:=
-   )
-   )
-   curl? ( net-misc/curl )
-   ~games-fps/urbanterror-data-4.3.2
-   sys-libs/zlib:=[minizip]
-   virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-   if use client; then
-   if ! use openal && ! use opus && ! use vorbis; then
-   ewarn
-   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
-   fi
-   fi
-}
-
-src_configure() {
-   default
-
-   tc-export CC
-}
-
-src_compile() {
-   # Workaround for used zlib macro, which got renamed in Gentoo
-   # wrt bug #449510
-   append-cppflags "-DOF=_Z_OF"
-
-   local my_arch=$(usex amd64 "x86_64" "i386")
-
-   emake \
-   ARCH=${my_arch} \
-   DEFAULT_BASEDIR="/usr/share/urbanterror" \
-   BUILD_CLIENT=$(usex "client" 1 0) \
-   BUILD_SERVER=$(usex "server" 1 0) \
-   BUILD_BASEGAME=1 \
-   BUILD_MISSIONPACK=0 \
-   BUILD_GAME_SO=0 \
-   BUILD_GAME_QVM=0 \
-   BUILD_STANDALONE=1 \
-   SERVERBIN="Quake3-UrT-Ded" \
-   CLIENTBIN="Quake3-UrT" \
-   USE_RENDERER_DLOPEN=0 \
-   USE_YACC=0 \
-   BASEGAME="q3ut4"\
-   BASEGAME_CFLAGS="${CFLAGS}" \
-   USE_OPENAL=$(usex "openal" 1 0) \
-   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
-   USE_CURL=$(usex "curl" 1 0) 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-03-03 Thread Michał Górny
commit: e0c419fc77fa8041bb7710085dcd80dc50c4cd29
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Feb 27 13:11:15 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar  3 12:08:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0c419fc

games-fps/urbanterror: Bump to 4.3.2_p20180218.

Closes: https://github.com/gentoo/gentoo/pull/7298
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.2_p20180218.ebuild | 165 +
 2 files changed, 166 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 013eb5fad05..2534ae6fbba 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.2_p20180216.tar.gz 10070633 BLAKE2B 
38724030fc87e0800b9d6d1814efafc244584832e9fe78df060f2603040d72ee38602e300c3c765dfab4f803c9ae0e63116daf01601e571357a914509a6a8672
 SHA512 
88aa12a492f1d94e956ab4a8a1caeec259081043706b160d87fffe91b502399c0ddc34a4566463f336ae1b133cf250920ccd718647ac13d2eb48ddf9e6bb5517
+DIST urbanterror-4.3.2_p20180218.tar.gz 10069644 BLAKE2B 
ef711eee61f18cf2bc15974806d1b0b74c2a2094fbca5a07d70307289ae9eca53d2704b1cabc754c70984133761ff6daa55e00613668c0f0cc2b9a3ad5dac624
 SHA512 
e7f433b9971f5992efedee96123fe7c7665b6c7fa4a516df281e1f3635a9d56a653310e38f326a8e53640ed0a7d8e3bf6b44c08d70b8378d1ccdd75c05b31dc8

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180218.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20180218.ebuild
new file mode 100644
index 000..dddefea6111
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20180218.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="d93f05de38a6cae60fbf0f073aace64b3adc7aaf"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? (
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.2
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local my_arch=$(usex amd64 "x86_64" "i386")
+
+   emake \
+   ARCH=${my_arch} \
+   DEFAULT_BASEDIR="/usr/share/urbanterror" \
+   BUILD_CLIENT=$(usex "client" 1 0) \
+   BUILD_SERVER=$(usex "server" 1 0) \
+   BUILD_BASEGAME=1 \
+   BUILD_MISSIONPACK=0 \
+   BUILD_GAME_SO=0 \
+   BUILD_GAME_QVM=0 \
+   BUILD_STANDALONE=1 \
+   SERVERBIN="Quake3-UrT-Ded" \
+   CLIENTBIN="Quake3-UrT" \
+   USE_RENDERER_DLOPEN=0 \
+   USE_YACC=0 \
+   BASEGAME="q3ut4"\
+   BASEGAME_CFLAGS="${CFLAGS}" \
+   USE_OPENAL=$(usex "openal" 1 0) \
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
+   USE_CURL=$(usex "curl" 1 0) \
+   USE_CURL_DLOPEN=$(usex "curl" 1 0) \
+   USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
+   USE_CODEC_OPUS=$(usex "opus" 1 0) \
+   USE_MUMBLE=$(usex "mumble" 1 0) \
+   USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
+   USE_VOIP=$(usex "mumble" 1 0) \
+   USE_INTERNAL_LIBS=0 \
+

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-02-17 Thread Patrice Clement
commit: 359caae7b7b8ddff2c386a3ca3feb47981c021d6
Author: Nils Freydank  posteo  de>
AuthorDate: Sat Feb 17 22:34:37 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Feb 18 00:05:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=359caae7

games-fps/urbanterror: version bump to 4.3.2_p20180216.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7205

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.2_p20180216.ebuild | 165 +
 2 files changed, 166 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index f59343886fe..6fe19af9b11 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.2_p20180211.tar.gz 10071334 BLAKE2B 
43bdbb59c7f4d7a02e87035d446d4e9dc91a2b8d2299afb97b09aa91f4062b732a71e9d624058d947dc5005f911b60f5ad7242b75b96d7e6fe750a01bc4a5494
 SHA512 
f55052f3fe5984af7d75aad95dc0673398839f8f79ed9d2a74865072f700712c9968c51e13e8e12d5b4c6b508a0a51b830d8c0afa159b88dba8200f7854f3da6
+DIST urbanterror-4.3.2_p20180216.tar.gz 10070633 BLAKE2B 
38724030fc87e0800b9d6d1814efafc244584832e9fe78df060f2603040d72ee38602e300c3c765dfab4f803c9ae0e63116daf01601e571357a914509a6a8672
 SHA512 
88aa12a492f1d94e956ab4a8a1caeec259081043706b160d87fffe91b502399c0ddc34a4566463f336ae1b133cf250920ccd718647ac13d2eb48ddf9e6bb5517

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180216.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20180216.ebuild
new file mode 100644
index 000..a82be5ecbcb
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20180216.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="1042e6b80f6fe50c46c8242b1e0bf3de80c676ef"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
+PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? (
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.2
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local my_arch=$(usex amd64 "x86_64" "i386")
+
+   emake \
+   ARCH=${my_arch} \
+   DEFAULT_BASEDIR="/usr/share/urbanterror" \
+   BUILD_CLIENT=$(usex "client" 1 0) \
+   BUILD_SERVER=$(usex "server" 1 0) \
+   BUILD_BASEGAME=1 \
+   BUILD_MISSIONPACK=0 \
+   BUILD_GAME_SO=0 \
+   BUILD_GAME_QVM=0 \
+   BUILD_STANDALONE=1 \
+   SERVERBIN="Quake3-UrT-Ded" \
+   CLIENTBIN="Quake3-UrT" \
+   USE_RENDERER_DLOPEN=0 \
+   USE_YACC=0 \
+   BASEGAME="q3ut4"\
+   BASEGAME_CFLAGS="${CFLAGS}" \
+   USE_OPENAL=$(usex "openal" 1 0) \
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
+   USE_CURL=$(usex "curl" 1 0) \
+   USE_CURL_DLOPEN=$(usex "curl" 1 0) \
+   USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
+   USE_CODEC_OPUS=$(usex "opus" 1 0) \
+   USE_MUMBLE=$(usex "mumble" 1 0) \
+   USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
+   USE_VOIP=$(usex "mumble" 1 0) \
+   USE_INTERNAL_LIBS=0 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-02-17 Thread Patrice Clement
commit: a28279157558433e61a0e35b2630b74b618e5e43
Author: Nils Freydank  posteo  de>
AuthorDate: Sat Feb 17 22:36:53 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Feb 18 00:05:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2827915

games-fps/urbanterror: security cleanup.

See upstream git commit 3225866b7dad402358b9e1713789032e065302ac for more
details.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-fps/urbanterror/Manifest |   1 -
 .../urbanterror/urbanterror-4.3.2_p20180211.ebuild | 166 -
 2 files changed, 167 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 6fe19af9b11..013eb5fad05 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1 @@
-DIST urbanterror-4.3.2_p20180211.tar.gz 10071334 BLAKE2B 
43bdbb59c7f4d7a02e87035d446d4e9dc91a2b8d2299afb97b09aa91f4062b732a71e9d624058d947dc5005f911b60f5ad7242b75b96d7e6fe750a01bc4a5494
 SHA512 
f55052f3fe5984af7d75aad95dc0673398839f8f79ed9d2a74865072f700712c9968c51e13e8e12d5b4c6b508a0a51b830d8c0afa159b88dba8200f7854f3da6
 DIST urbanterror-4.3.2_p20180216.tar.gz 10070633 BLAKE2B 
38724030fc87e0800b9d6d1814efafc244584832e9fe78df060f2603040d72ee38602e300c3c765dfab4f803c9ae0e63116daf01601e571357a914509a6a8672
 SHA512 
88aa12a492f1d94e956ab4a8a1caeec259081043706b160d87fffe91b502399c0ddc34a4566463f336ae1b133cf250920ccd718647ac13d2eb48ddf9e6bb5517

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180211.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20180211.ebuild
deleted file mode 100644
index d96a973d082..000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20180211.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
-   EGIT_BRANCH="urt"
-else
-   COMMIT_ID="41425855eba78b31dde895116c4db2e8ce77a2b8"
-   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
-RDEPEND="
-   client? (
-   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-   mumble? ( media-sound/mumble:= )
-   openal? ( media-libs/openal:= )
-   opus? ( media-libs/opusfile:= )
-   vorbis? (
-   media-libs/libogg:=
-   media-libs/libvorbis:=
-   )
-   )
-   curl? ( net-misc/curl )
-   ~games-fps/urbanterror-data-4.3.2
-   sys-libs/zlib:=[minizip]
-   virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-   if use client; then
-   if ! use openal && ! use opus && ! use vorbis; then
-   ewarn
-   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
-   fi
-   fi
-}
-
-src_configure() {
-   default
-
-   tc-export CC
-}
-
-src_compile() {
-   # Workaround for used zlib macro, which got renamed in Gentoo
-   # wrt bug #449510
-   append-cppflags "-DOF=_Z_OF"
-
-   local my_arch=$(usex amd64 "x86_64" "i386")
-
-   emake \
-   ARCH=${my_arch} \
-   DEFAULT_BASEDIR="/usr/share/urbanterror" \
-   BUILD_CLIENT=$(usex "client" 1 0) \
-   BUILD_SERVER=$(usex "server" 1 0) \
-   BUILD_BASEGAME=1 \
-   BUILD_MISSIONPACK=0 \
-   BUILD_GAME_SO=0 \
-   BUILD_GAME_QVM=0 \
-   BUILD_STANDALONE=1 \
-   SERVERBIN="Quake3-UrT-Ded" \
-   CLIENTBIN="Quake3-UrT" \
-   USE_RENDERER_DLOPEN=0 \
-   USE_YACC=0 \
-   BASEGAME="q3ut4"\
-   BASEGAME_CFLAGS="${CFLAGS}" \
-   USE_OPENAL=$(usex "openal" 1 0) \
-   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
-   USE_CURL=$(usex "curl" 1 0) \
-   USE_CURL_DLOPEN=$(usex "curl" 1 0) \
-   USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
-   USE_CODEC_OPUS=$(usex "opus" 1 0) \
-   USE_MUMBLE=$(usex "mumble" 1 0) \
-   USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
-   USE_VOIP=$(usex "mumble" 1 0) \
-   USE_INTERNAL_LIBS=0 \
-   USE_LOCAL_HEADERS=0 \

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-02-13 Thread Michał Górny
commit: 88fc306fb88e417d4bf0e8828df233a368c4abea
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Feb 13 15:34:52 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Feb 13 16:00:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fc306f

games-fps/urbanterror: Version bump to 4.3.2_p20180211.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.2_p20180211.ebuild | 166 +
 2 files changed, 167 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index e00fb4d8e24..624b5bf0267 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.2_p20180206.tar.gz 10071986 BLAKE2B 
b809793f8bc1d878a97d882f60eef80124cff63ca5754f9178cdf9067acc2c6b52478362b8799c7b3718484d1a680ca932df8d97ebb34e35fc90eb2ae17582d6
 SHA512 
e4fcc53f9a7b8db1f5bc069acce5265db7009acc0588b29fff2a2b19b05d09f42cdb2c3f1811920221c75b6d3fc5f2e67fbb0f8476ee50644d8db9dd4f0b7c63
+DIST urbanterror-4.3.2_p20180211.tar.gz 10071334 BLAKE2B 
43bdbb59c7f4d7a02e87035d446d4e9dc91a2b8d2299afb97b09aa91f4062b732a71e9d624058d947dc5005f911b60f5ad7242b75b96d7e6fe750a01bc4a5494
 SHA512 
f55052f3fe5984af7d75aad95dc0673398839f8f79ed9d2a74865072f700712c9968c51e13e8e12d5b4c6b508a0a51b830d8c0afa159b88dba8200f7854f3da6

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180211.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20180211.ebuild
new file mode 100644
index 000..d96a973d082
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20180211.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="41425855eba78b31dde895116c4db2e8ce77a2b8"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? (
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.2
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local my_arch=$(usex amd64 "x86_64" "i386")
+
+   emake \
+   ARCH=${my_arch} \
+   DEFAULT_BASEDIR="/usr/share/urbanterror" \
+   BUILD_CLIENT=$(usex "client" 1 0) \
+   BUILD_SERVER=$(usex "server" 1 0) \
+   BUILD_BASEGAME=1 \
+   BUILD_MISSIONPACK=0 \
+   BUILD_GAME_SO=0 \
+   BUILD_GAME_QVM=0 \
+   BUILD_STANDALONE=1 \
+   SERVERBIN="Quake3-UrT-Ded" \
+   CLIENTBIN="Quake3-UrT" \
+   USE_RENDERER_DLOPEN=0 \
+   USE_YACC=0 \
+   BASEGAME="q3ut4"\
+   BASEGAME_CFLAGS="${CFLAGS}" \
+   USE_OPENAL=$(usex "openal" 1 0) \
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
+   USE_CURL=$(usex "curl" 1 0) \
+   USE_CURL_DLOPEN=$(usex "curl" 1 0) \
+   USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
+   USE_CODEC_OPUS=$(usex "opus" 1 0) \
+   USE_MUMBLE=$(usex "mumble" 1 0) \
+   USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
+   USE_VOIP=$(usex "mumble" 1 0) \
+   USE_INTERNAL_LIBS=0 \
+   USE_LOCAL_HEADERS=0 \
+   USE_ALTGAMMA=$(usex "altgamma" 1 0)
+}
+
+src_install() {
+ 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-02-13 Thread Michał Górny
commit: f796c4b04dfb770b7829d839d1a57df050a2f682
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Feb 13 15:39:11 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Feb 13 16:00:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f796c4b0

games-fps/urbanterror: Cleanup old version.

There was a potential security issue. For details see
upstream git commit 41425855eba78b31dde895116c4db2e8ce77a2b8.

Closes: https://github.com/gentoo/gentoo/pull/7173
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-fps/urbanterror/Manifest |   1 -
 .../urbanterror/urbanterror-4.3.2_p20180206.ebuild | 166 -
 2 files changed, 167 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 624b5bf0267..f59343886fe 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1 @@
-DIST urbanterror-4.3.2_p20180206.tar.gz 10071986 BLAKE2B 
b809793f8bc1d878a97d882f60eef80124cff63ca5754f9178cdf9067acc2c6b52478362b8799c7b3718484d1a680ca932df8d97ebb34e35fc90eb2ae17582d6
 SHA512 
e4fcc53f9a7b8db1f5bc069acce5265db7009acc0588b29fff2a2b19b05d09f42cdb2c3f1811920221c75b6d3fc5f2e67fbb0f8476ee50644d8db9dd4f0b7c63
 DIST urbanterror-4.3.2_p20180211.tar.gz 10071334 BLAKE2B 
43bdbb59c7f4d7a02e87035d446d4e9dc91a2b8d2299afb97b09aa91f4062b732a71e9d624058d947dc5005f911b60f5ad7242b75b96d7e6fe750a01bc4a5494
 SHA512 
f55052f3fe5984af7d75aad95dc0673398839f8f79ed9d2a74865072f700712c9968c51e13e8e12d5b4c6b508a0a51b830d8c0afa159b88dba8200f7854f3da6

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180206.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20180206.ebuild
deleted file mode 100644
index 93dc5736a99..000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20180206.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
-   EGIT_BRANCH="urt"
-else
-   COMMIT_ID="11a2b7462574a913e8960014cfc504f37903a3d6"
-   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
-RDEPEND="
-   client? (
-   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-   mumble? ( media-sound/mumble:= )
-   openal? ( media-libs/openal:= )
-   opus? ( media-libs/opusfile:= )
-   vorbis? (
-   media-libs/libogg:=
-   media-libs/libvorbis:=
-   )
-   )
-   curl? ( net-misc/curl )
-   ~games-fps/urbanterror-data-4.3.2
-   sys-libs/zlib:=[minizip]
-   virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-   if use client; then
-   if ! use openal && ! use opus && ! use vorbis; then
-   ewarn
-   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
-   fi
-   fi
-}
-
-src_configure() {
-   default
-
-   tc-export CC
-}
-
-src_compile() {
-   # Workaround for used zlib macro, which got renamed in Gentoo
-   # wrt bug #449510
-   append-cppflags "-DOF=_Z_OF"
-
-   local my_arch=$(usex amd64 "x86_64" "i386")
-
-   emake \
-   ARCH=${my_arch} \
-   DEFAULT_BASEDIR="/usr/share/urbanterror" \
-   BUILD_CLIENT=$(usex "client" 1 0) \
-   BUILD_SERVER=$(usex "server" 1 0) \
-   BUILD_BASEGAME=1 \
-   BUILD_MISSIONPACK=0 \
-   BUILD_GAME_SO=0 \
-   BUILD_GAME_QVM=0 \
-   BUILD_STANDALONE=1 \
-   SERVERBIN="Quake3-UrT-Ded" \
-   CLIENTBIN="Quake3-UrT" \
-   USE_RENDERER_DLOPEN=0 \
-   USE_YACC=0 \
-   BASEGAME="q3ut4"\
-   BASEGAME_CFLAGS="${CFLAGS}" \
-   USE_OPENAL=$(usex "openal" 1 0) \
-   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
-   USE_CURL=$(usex "curl" 1 0) \
-   USE_CURL_DLOPEN=$(usex "curl" 1 0) \
-   USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
-   USE_CODEC_OPUS=$(usex "opus" 1 0) \
-   USE_MUMBLE=$(usex "mumble" 1 0) \
-   USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
-   USE_VOIP=$(usex "mumble" 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-02-07 Thread Michał Górny
commit: 9aaf63eca70fc87752ec662808be80fecb4889f1
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Feb  6 14:24:04 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Feb  7 19:19:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aaf63ec

games-fps/urbanterror: Bump to 4.3.2_p20180206.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.2_p20180206.ebuild | 166 +
 2 files changed, 167 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 216481232d9..29ec1dc5609 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1,3 @@
 DIST urbanterror-4.3.2_p20171208.tar.gz 10072373 BLAKE2B 
9934317fb649e652628639f9ea35cdaa0466363b52ea73251986360e07e41ec590342cd35fa1bb352ff35ba5994e9152caaf308aa0e0d8c3c2d94ea36a91
 SHA512 
1dd3affa8fe23f8cca4ee3c90a8d6fc86f5df2122e0121d57263be745d0af13f52cb47802636a22cb09b1bae8a100b491dc8cc0c81c413dd9cbb2ad29a69039a
 DIST urbanterror-4.3.2_p20180103.tar.gz 10071977 BLAKE2B 
c204b0f3eee19d4c426df60827a6e9651e93e71445cad73a5b0133e1ec794c752668df9c3412d7a9b1f1599f33923873afe6cb9b2472a14fea6adc52cb599bed
 SHA512 
8bfba46580b16f89e6cea5ffbb1f81ad91ece63e1058928d84778e4ea2cee621d3fae7131801f5bb35e9267763e824521dfc0191f512d334d7f07a3b970be768
+DIST urbanterror-4.3.2_p20180206.tar.gz 10071986 BLAKE2B 
b809793f8bc1d878a97d882f60eef80124cff63ca5754f9178cdf9067acc2c6b52478362b8799c7b3718484d1a680ca932df8d97ebb34e35fc90eb2ae17582d6
 SHA512 
e4fcc53f9a7b8db1f5bc069acce5265db7009acc0588b29fff2a2b19b05d09f42cdb2c3f1811920221c75b6d3fc5f2e67fbb0f8476ee50644d8db9dd4f0b7c63

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180206.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20180206.ebuild
new file mode 100644
index 000..93dc5736a99
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20180206.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="11a2b7462574a913e8960014cfc504f37903a3d6"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? (
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.2
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local my_arch=$(usex amd64 "x86_64" "i386")
+
+   emake \
+   ARCH=${my_arch} \
+   DEFAULT_BASEDIR="/usr/share/urbanterror" \
+   BUILD_CLIENT=$(usex "client" 1 0) \
+   BUILD_SERVER=$(usex "server" 1 0) \
+   BUILD_BASEGAME=1 \
+   BUILD_MISSIONPACK=0 \
+   BUILD_GAME_SO=0 \
+   BUILD_GAME_QVM=0 \
+   BUILD_STANDALONE=1 \
+   SERVERBIN="Quake3-UrT-Ded" \
+   CLIENTBIN="Quake3-UrT" \
+   USE_RENDERER_DLOPEN=0 \
+   USE_YACC=0 \
+   BASEGAME="q3ut4"\
+   BASEGAME_CFLAGS="${CFLAGS}" \
+   USE_OPENAL=$(usex "openal" 1 0) \
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
+   USE_CURL=$(usex "curl" 1 0) \
+   USE_CURL_DLOPEN=$(usex "curl" 1 0) \
+   USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
+   USE_CODEC_OPUS=$(usex 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-02-07 Thread Michał Górny
commit: 9fd71f237569e488673b9416bb8cb95e8a5ed398
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Feb  6 14:25:25 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Feb  7 19:19:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd71f23

games-fps/urbanterror: Cleanup old ebuilds.

Closes: https://github.com/gentoo/gentoo/pull/7091
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 games-fps/urbanterror/Manifest |   2 -
 .../urbanterror/urbanterror-4.3.2_p20171208.ebuild | 163 -
 .../urbanterror/urbanterror-4.3.2_p20180103.ebuild | 163 -
 3 files changed, 328 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 29ec1dc5609..e00fb4d8e24 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,3 +1 @@
-DIST urbanterror-4.3.2_p20171208.tar.gz 10072373 BLAKE2B 
9934317fb649e652628639f9ea35cdaa0466363b52ea73251986360e07e41ec590342cd35fa1bb352ff35ba5994e9152caaf308aa0e0d8c3c2d94ea36a91
 SHA512 
1dd3affa8fe23f8cca4ee3c90a8d6fc86f5df2122e0121d57263be745d0af13f52cb47802636a22cb09b1bae8a100b491dc8cc0c81c413dd9cbb2ad29a69039a
-DIST urbanterror-4.3.2_p20180103.tar.gz 10071977 BLAKE2B 
c204b0f3eee19d4c426df60827a6e9651e93e71445cad73a5b0133e1ec794c752668df9c3412d7a9b1f1599f33923873afe6cb9b2472a14fea6adc52cb599bed
 SHA512 
8bfba46580b16f89e6cea5ffbb1f81ad91ece63e1058928d84778e4ea2cee621d3fae7131801f5bb35e9267763e824521dfc0191f512d334d7f07a3b970be768
 DIST urbanterror-4.3.2_p20180206.tar.gz 10071986 BLAKE2B 
b809793f8bc1d878a97d882f60eef80124cff63ca5754f9178cdf9067acc2c6b52478362b8799c7b3718484d1a680ca932df8d97ebb34e35fc90eb2ae17582d6
 SHA512 
e4fcc53f9a7b8db1f5bc069acce5265db7009acc0588b29fff2a2b19b05d09f42cdb2c3f1811920221c75b6d3fc5f2e67fbb0f8476ee50644d8db9dd4f0b7c63

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171208.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20171208.ebuild
deleted file mode 100644
index 32cf683aeac..000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20171208.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
-   EGIT_BRANCH="urt"
-else
-   COMMIT_ID="e3bc50248c9d6c319d4822ca23caa5d46fc118ab"
-   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
-   S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
-RDEPEND="
-   client? (
-   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-   mumble? ( media-sound/mumble:= )
-   openal? ( media-libs/openal:= )
-   opus? ( media-libs/opusfile:= )
-   vorbis? (
-   media-libs/libogg:=
-   media-libs/libvorbis:=
-   )
-   )
-   curl? ( net-misc/curl )
-   ~games-fps/urbanterror-data-4.3.2
-   sys-libs/zlib:=[minizip]
-   virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-   if use client; then
-   if ! use openal && ! use opus && ! use vorbis; then
-   ewarn
-   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
-   fi
-   fi
-}
-
-src_configure() {
-   default
-
-   tc-export CC
-}
-
-src_compile() {
-   # Workaround for used zlib macro, which got renamed in Gentoo
-   # wrt bug #449510
-   append-cppflags "-DOF=_Z_OF"
-
-   local my_arch=$(usex amd64 "x86_64" "i386")
-
-   emake \
-   ARCH=${my_arch} \
-   DEFAULT_BASEDIR="/usr/share/urbanterror" \
-   BUILD_CLIENT=$(usex "client" 1 0) \
-   BUILD_SERVER=$(usex "server" 1 0) \
-   BUILD_BASEGAME=1 \
-   BUILD_MISSIONPACK=0 \
-   BUILD_GAME_SO=0 \
-   BUILD_GAME_QVM=0 \
-   BUILD_STANDALONE=1 \
-   SERVERBIN="Quake3-UrT-Ded" \
-   CLIENTBIN="Quake3-UrT" \
-   USE_RENDERER_DLOPEN=0 \
-   USE_YACC=0 \
-   BASEGAME="q3ut4"\
-   BASEGAME_CFLAGS="${CFLAGS}" \
-   USE_OPENAL=$(usex "openal" 1 0) \
-   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
-   USE_CURL=$(usex "curl" 1 0) \
-   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2018-01-09 Thread Patrice Clement
commit: da5e3ec430ce69532d88d0bc87df07f34d111e78
Author: Nils Freydank  posteo  de>
AuthorDate: Mon Jan  8 20:11:29 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jan  9 10:47:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5e3ec4

games-fps/urbanterror: version bump to 4.3.2_p20180103.

Package-Manager: Portage-2.3.19, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6800

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.2_p20180103.ebuild | 163 +
 2 files changed, 164 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index f49cff1d924..216481232d9 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.2_p20171208.tar.gz 10072373 BLAKE2B 
9934317fb649e652628639f9ea35cdaa0466363b52ea73251986360e07e41ec590342cd35fa1bb352ff35ba5994e9152caaf308aa0e0d8c3c2d94ea36a91
 SHA512 
1dd3affa8fe23f8cca4ee3c90a8d6fc86f5df2122e0121d57263be745d0af13f52cb47802636a22cb09b1bae8a100b491dc8cc0c81c413dd9cbb2ad29a69039a
+DIST urbanterror-4.3.2_p20180103.tar.gz 10071977 BLAKE2B 
c204b0f3eee19d4c426df60827a6e9651e93e71445cad73a5b0133e1ec794c752668df9c3412d7a9b1f1599f33923873afe6cb9b2472a14fea6adc52cb599bed
 SHA512 
8bfba46580b16f89e6cea5ffbb1f81ad91ece63e1058928d84778e4ea2cee621d3fae7131801f5bb35e9267763e824521dfc0191f512d334d7f07a3b970be768

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20180103.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20180103.ebuild
new file mode 100644
index 000..27cb31a404f
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20180103.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="36ac852bc7ecfb3b847b021305b14a363f7c7f9c"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? (
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.2
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local my_arch=$(usex amd64 "x86_64" "i386")
+
+   emake \
+   ARCH=${my_arch} \
+   DEFAULT_BASEDIR="/usr/share/urbanterror" \
+   BUILD_CLIENT=$(usex "client" 1 0) \
+   BUILD_SERVER=$(usex "server" 1 0) \
+   BUILD_BASEGAME=1 \
+   BUILD_MISSIONPACK=0 \
+   BUILD_GAME_SO=0 \
+   BUILD_GAME_QVM=0 \
+   BUILD_STANDALONE=1 \
+   SERVERBIN="Quake3-UrT-Ded" \
+   CLIENTBIN="Quake3-UrT" \
+   USE_RENDERER_DLOPEN=0 \
+   USE_YACC=0 \
+   BASEGAME="q3ut4"\
+   BASEGAME_CFLAGS="${CFLAGS}" \
+   USE_OPENAL=$(usex "openal" 1 0) \
+   USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
+   USE_CURL=$(usex "curl" 1 0) \
+   USE_CURL_DLOPEN=$(usex "curl" 1 0) \
+   USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
+   USE_CODEC_OPUS=$(usex "opus" 1 0) \
+   USE_MUMBLE=$(usex "mumble" 1 0) \
+   USE_SKEETMOD=$(usex "skeetshootmod" 1 0) \
+   USE_VOIP=$(usex "mumble" 1 0) \
+   USE_INTERNAL_LIBS=0 \
+   USE_LOCAL_HEADERS=0 \
+   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2017-12-10 Thread James Le Cuirot
commit: 20c474cb753d67483152c3606e657cb5ca81d679
Author: Nils Freydank  posteo  de>
AuthorDate: Sat Dec  9 10:55:58 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec 10 20:41:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20c474cb

games-fps/urbanterror-data: Cleanup old files

Package-Manager: Portage-2.3.17, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6488

 games-fps/urbanterror-data/Manifest|  1 -
 .../urbanterror-data-4.3.2-r1.ebuild   |  4 ++
 .../urbanterror-data/urbanterror-data-4.3.2.ebuild | 64 --
 3 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/games-fps/urbanterror-data/Manifest 
b/games-fps/urbanterror-data/Manifest
index c5a1425fb95..75f0a116fba 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -1,4 +1,3 @@
 DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 BLAKE2B 
a4562c81169274e6f7685c9ca771c0e004ec40aa123d0757794e89c019bbd6e280f22e0929dc6917b0a43d9fe6e6ea90a4f190ce01ff2e6be087299a9bb64cab
 SHA512 
f05564babadff73793778926411bc7914bfef4a5f7dfc1003c36e8a549c568ab520adcff8a38e7dd905238738d242aa865e7c6d7db36ed6d592b144e497ed823
 DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B 
d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d
 SHA512 
cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
 DIST urbanterror-data-4.3.2.zip 1491207564 BLAKE2B 
3a292079d92895fa28567e8773d504a9f4b179de6d49607e9d589674374690a1fa673b0b8b08790b126140c8e8583ca3ee6f8439ea28e0f868fab6f4bc1a6268
 SHA512 
397aa5ba7f869049844d52a9dec234d020b856e16ba3ff295d97775e4e1d48730aecfba3992baf7d55c643c0073ceda32ada18d1473dadd55f561f27a8b9c4ed
-DIST urbanterror-data.svg 1592 BLAKE2B 
03b84da826882cb73e0cf589626b6e6959f08b6435c18481fce9fa2f1583b4fdb80032bb7638258558f5429ff5ae16f369aa53305260b4f370ed92860d86865c
 SHA512 
ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
index 95dea99a4f6..7eebf9e788f 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
@@ -11,6 +11,10 @@ MY_PV=43_full
 
 DESCRIPTION="Data files for UrbanTerror"
 HOMEPAGE="http://www.urbanterror.info;
+
+# Todo in the next release: save into ${PN}-4.3.0.zip
+# I just made a mistake, but loading some GiB just for
+# a mostly cosmetical fix isn’t worth the bandwith.
 SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}.zip -> ${P}.zip"
 
 # fetch updates recursively for |4.3.x-4.3.0|

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
deleted file mode 100644
index 5b0059e6f3c..000
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit check-reqs eutils
-
-ENGINE_PV=${PV}
-
-MY_PN=UrbanTerror
-MY_PV=43_full
-
-DESCRIPTION="Data files for UrbanTerror"
-HOMEPAGE="http://www.urbanterror.info;
-SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}.zip -> ${P}.zip
-   https://upload.wikimedia.org/wikipedia/commons/5/56/Urbanterror.svg -> 
${PN}.svg"
-
-# fetch updates recursively for |4.3.x-4.3.0|
-if [[ "${PV}" != "4.3.0" ]]; then
-   MY_CTR=0
-   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-   SRC_URI="${SRC_URI} 
https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 
)).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
-   MY_CTR=$(( ${MY_CTR} + 1 ))
-   done
-fi
-unset MY_CTR
-
-LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}43"
-
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1400M"
-
-src_prepare() {
-   default
-
-   # apply updates we fetched before
-   # again recursively for |4.3.x - 4.3.0|
-   local MY_CTR
-   if [[ "${PV}" != "4.3.0" ]]; then
-   MY_CTR=0
-   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-   cp -dfpr \
-   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
-   MY_CTR=$(( ${MY_CTR} + 1 ))
-   done
-   fi
-}
-
-src_install() {
-   newicon -s scalable "${DISTDIR}"/${PN}.svg urbanterror.svg
-   insinto /usr/share/urbanterror/q3ut4
-   doins q3ut4/*.pk3
-   # These files are *essential* for startup
-   newins q3ut4/server_example.cfg 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2017-12-10 Thread James Le Cuirot
commit: 9bf87bcd475d577af388c9a60389c12714bd2f39
Author: Nils Freydank  posteo  de>
AuthorDate: Sat Dec  9 10:48:42 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec 10 20:39:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf87bcd

games-fps/urbanterror: Version bump to 4.3.2_p20171208.

Package-Manager: Portage-2.3.17, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6488

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.2_p20171208.ebuild | 163 +
 2 files changed, 164 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index f9031204037..e6931427297 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -3,3 +3,4 @@ DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 BLAKE2B 
4771e5ecf997334d33ae4b20
 DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 BLAKE2B 
9e42de663b1ae0ae9e16a279233c88eb419f424c3db0b4d14276cbb9ab59fba3f32b43593f5901e0a6299ef8c2e4fe1d39a789d107a7bd9c15422a3acf553cea
 SHA512 
d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e
 DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 BLAKE2B 
12cc4cd40f85c8d15c93fbafa5cc0c5fe2b8c2d35962aa6a24e8878525b262bab47a5f8cfef6e7a4e4d506c47a5d56fb22db99e341efac06cd1b16e1d845027b
 SHA512 
b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea
 DIST urbanterror-4.3.2_p20171105.tar.gz 10067127 BLAKE2B 
e843623976ad1d2379121bb834eabac634d57185c0b15ee298cf900474a7879ba0d2f45e1e6eb002d963fa83d895f8962110dc7f5dc5a209cde1aee3a9a8234a
 SHA512 
7a9ac15a0508706c17a390a5105badbaaba3b3c0e7e23b3ab9dd16751b1d946c108febba5c2f6af3046d5431fd1c5978a2abc267a740eca1d89d77d7172b41ad
+DIST urbanterror-4.3.2_p20171208.tar.gz 10072373 BLAKE2B 
9934317fb649e652628639f9ea35cdaa0466363b52ea73251986360e07e41ec590342cd35fa1bb352ff35ba5994e9152caaf308aa0e0d8c3c2d94ea36a91
 SHA512 
1dd3affa8fe23f8cca4ee3c90a8d6fc86f5df2122e0121d57263be745d0af13f52cb47802636a22cb09b1bae8a100b491dc8cc0c81c413dd9cbb2ad29a69039a

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171208.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20171208.ebuild
new file mode 100644
index 000..32cf683aeac
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20171208.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="e3bc50248c9d6c319d4822ca23caa5d46fc118ab"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod 
voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-fix-build_system.patch )
+RDEPEND="
+   client? (
+   media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble:= )
+   openal? ( media-libs/openal:= )
+   opus? ( media-libs/opusfile:= )
+   vorbis? (
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.2
+   sys-libs/zlib:=[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_configure() {
+   default
+
+   tc-export CC
+}
+
+src_compile() {
+   # Workaround for used zlib macro, which got renamed in Gentoo
+   # wrt bug #449510
+   append-cppflags "-DOF=_Z_OF"
+
+   local my_arch=$(usex amd64 "x86_64" "i386")
+
+   emake \
+   ARCH=${my_arch} \
+   DEFAULT_BASEDIR="/usr/share/urbanterror" \
+   BUILD_CLIENT=$(usex "client" 1 0) \
+   BUILD_SERVER=$(usex "server" 1 0) \
+   BUILD_BASEGAME=1 \
+   BUILD_MISSIONPACK=0 \
+   BUILD_GAME_SO=0 \
+   BUILD_GAME_QVM=0 \
+   BUILD_STANDALONE=1 \
+   SERVERBIN="Quake3-UrT-Ded" \
+   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/

2017-12-10 Thread James Le Cuirot
commit: 621814eb0f86ad1cecd86f730b48f8db23089a63
Author: Nils Freydank  posteo  de>
AuthorDate: Sat Dec  9 10:54:14 2017 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Dec 10 20:40:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621814eb

games-fps/urbanterror: Cleanup old versions.

Package-Manager: Portage-2.3.17, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6488

 games-fps/urbanterror/Manifest |   5 -
 .../files/urbanterror-4.3-respect_CFLAGS.patch |  53 ---
 .../urbanterror/urbanterror-4.3.2_p20170426.ebuild | 152 ---
 .../urbanterror/urbanterror-4.3.2_p20170713.ebuild | 152 ---
 .../urbanterror/urbanterror-4.3.2_p20170915.ebuild | 152 ---
 .../urbanterror/urbanterror-4.3.2_p20171016.ebuild | 148 ---
 .../urbanterror/urbanterror-4.3.2_p20171105.ebuild | 163 -
 7 files changed, 825 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index e6931427297..f49cff1d924 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,6 +1 @@
-DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 BLAKE2B 
7ce3f2abd00a71194160fcde4185733f1232a232237fb50d8d59ee188b2c40d117cdb3b3a03e0f0f6a9456ccf7e7dea030a96de438fcaa408ea6ff52cd23892c
 SHA512 
e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3
-DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 BLAKE2B 
4771e5ecf997334d33ae4b2040e6a2c9e7e2e85990152efef14f071db656e2712fed078dd117c9701ffd1be2e36360cee3d1c7126e10706a12013f5cc8a9625d
 SHA512 
09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4
-DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 BLAKE2B 
9e42de663b1ae0ae9e16a279233c88eb419f424c3db0b4d14276cbb9ab59fba3f32b43593f5901e0a6299ef8c2e4fe1d39a789d107a7bd9c15422a3acf553cea
 SHA512 
d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e
-DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 BLAKE2B 
12cc4cd40f85c8d15c93fbafa5cc0c5fe2b8c2d35962aa6a24e8878525b262bab47a5f8cfef6e7a4e4d506c47a5d56fb22db99e341efac06cd1b16e1d845027b
 SHA512 
b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea
-DIST urbanterror-4.3.2_p20171105.tar.gz 10067127 BLAKE2B 
e843623976ad1d2379121bb834eabac634d57185c0b15ee298cf900474a7879ba0d2f45e1e6eb002d963fa83d895f8962110dc7f5dc5a209cde1aee3a9a8234a
 SHA512 
7a9ac15a0508706c17a390a5105badbaaba3b3c0e7e23b3ab9dd16751b1d946c108febba5c2f6af3046d5431fd1c5978a2abc267a740eca1d89d77d7172b41ad
 DIST urbanterror-4.3.2_p20171208.tar.gz 10072373 BLAKE2B 
9934317fb649e652628639f9ea35cdaa0466363b52ea73251986360e07e41ec590342cd35fa1bb352ff35ba5994e9152caaf308aa0e0d8c3c2d94ea36a91
 SHA512 
1dd3affa8fe23f8cca4ee3c90a8d6fc86f5df2122e0121d57263be745d0af13f52cb47802636a22cb09b1bae8a100b491dc8cc0c81c413dd9cbb2ad29a69039a

diff --git a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch 
b/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
deleted file mode 100644
index 5ce13342ab5..000
--- a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Author: holgersson 
-Date:   Fri Mar 31 12:13:00 2017 +0200
-
-Respect CFLAGS - inspired by hasufell’s patch
-
 a/Makefile 2017-03-31 11:08:58.419210817 +0200
-+++ b/Makefile 2017-03-31 12:06:52.559412054 +0200
-@@ -290,34 +290,33 @@
- CLIENT_EXTRA_FILES=
-
- ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" 
"gnu"))
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
---pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-+  BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-   CLIENT_CFLAGS += $(SDL_CFLAGS)
-
--  OPTIMIZEVM = -O3
--  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+  OPTIMIZEVM =
-+  OPTIMIZE = $(OPTIMIZEVM)
-
-   ifeq ($(ARCH),x86_64)
--OPTIMIZEVM = -O3
--OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+OPTIMIZEVM =
-+OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED = true
-   else
-   ifeq ($(ARCH),x86)
--OPTIMIZEVM = -O3 -march=i586
--OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+OPTIMIZEVM =
-+OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED=true
-   else
-   ifeq ($(ARCH),ppc)
--BASE_CFLAGS += -maltivec
-+BASE_CFLAGS +=
- HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),ppc64)
--BASE_CFLAGS += -maltivec
-+BASE_CFLAGS +=
- HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),sparc)
--OPTIMIZE += -mtune=ultrasparc3 -mv8plus
--OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
-+OPTIMIZE +=
-+OPTIMIZEVM +=
- HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),armv7l)

diff --git 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/

2017-11-19 Thread David Seifert
commit: f32bcdeee1d31d80e0a62facb25a6839f7f60b51
Author: Nils Freydank  posteo  de>
AuthorDate: Fri Nov 17 20:39:33 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 19 18:32:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32bcdee

games-fps/urbanterror: Bump to 4.3.2_p20171105.

This bump adds support for skeetshoot mod. For more details, see:
https://github.com/mickael9/ioq3/pull/13 and
upstream commit 31e6b45a323f8ded92a1b4b78530ea0bc5382b85.

According to the effort to reorganise X related calls[1], and as the icon
isn't shipped anymore, only xdg_desktop_database_update is called.

This bump also fixes a wrong compiler call (cc instead of correct gcc-call).

[1] https://wiki.gentoo.org/wiki/Notes_on_ebuilds_with_GUI

Package-Manager: Portage-2.3.14, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/6156

 games-fps/urbanterror/Manifest |   1 +
 .../files/urbanterror-4.3-fix-build_system.patch   |  73 +
 games-fps/urbanterror/metadata.xml |   5 +-
 .../urbanterror/urbanterror-4.3.2_p20171105.ebuild | 163 +
 4 files changed, 240 insertions(+), 2 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index f6cf1e0db7a..680a143fd69 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -2,3 +2,4 @@ DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 
8009516332e1f77eae3681b4
 DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 SHA256 
cf1784a3bd00451fe1bda3267235ea3eee93da65880f15fd13c07681952b4859 SHA512 
09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4
 WHIRLPOOL 
2bed79adc1dc338d74212263105c03bad51391f8c9e9e543ad54f6d6006cea4a8ebfc0e601400338b941d799dc0f642f71478dc68ad84a50718043f06f042290
 DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 SHA256 
fe37df609d763247a0bfaa7dedb33ca45a8aa523467b16f1a585ca8a08b03078 SHA512 
d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e
 WHIRLPOOL 
912201a55822dcf8423f77023f01882339739984dc9e9bdb5dca55763271c56158b47fd137da83d6e56c7625e49df8b5fc5299af646e91104e1f53cad9a50fcb
 DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 SHA256 
a345cae14ce1f445ef1ed9d883f4f06e0365fdfa05c50d2f34bfcdb89744e405 SHA512 
b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea
 WHIRLPOOL 
d4a519b1c9a7e63a98e9901c815e73f1c467412f6ad6757dafd6c4afb013bd9c3d4da3155cdc91c728113078e466d39fa68c1bb404e8019ad75984bf683370ff
+DIST urbanterror-4.3.2_p20171105.tar.gz 10067127 SHA256 
5b577d3c5ac62cbece532c54a3e30b2c89b9accb60657475a7cd2fb768f0bb02 SHA512 
7a9ac15a0508706c17a390a5105badbaaba3b3c0e7e23b3ab9dd16751b1d946c108febba5c2f6af3046d5431fd1c5978a2abc267a740eca1d89d77d7172b41ad
 WHIRLPOOL 
680a170e50d2d398129e1c0788ffa622fb4795d810e01db216232a16e6d8024813d648bf2276a7cb1bf14187d8c32794b0bb48c83d854d5c9989be1bc716560b

diff --git a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch 
b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
new file mode 100644
index 000..b7a24a1b6e9
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
@@ -0,0 +1,73 @@
+Author: Nils Freydank 
+Date:   Fri Nov 17 20:30:00 2017 +0100
+
+Respect CFLAGS, CPPFLAGS etc. This patch is inspired
+by hasufell’s patch.
+
+--- a/Makefile  2017-03-31 11:08:58.419210817 +0200
 b/Makefile 2017-11-17 20:30:00.0 +0100
+@@ -223,7 +223,7 @@
+ ifndef USE_ALTGAMMA
+   # Clearskies - X11-based gamma for Linux
+   USE_ALTGAMMA=1
+-endif
++  endif
+ 
+ ifndef USE_SKEETMOD
+   USE_SKEETMOD=0
+@@ -306,34 +306,33 @@
+ CLIENT_EXTRA_FILES=
+ 
+ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" 
"gnu"))
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+--pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
++  BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
+   CLIENT_CFLAGS += $(SDL_CFLAGS)
+ 
+-  OPTIMIZEVM = -O3
+-  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++  OPTIMIZEVM =
++  OPTIMIZE = $(OPTIMIZEVM)
+ 
+   ifeq ($(ARCH),x86_64)
+-OPTIMIZEVM = -O3
+-OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++OPTIMIZEVM =
++OPTIMIZE = $(OPTIMIZEVM)
+ HAVE_VM_COMPILED = true
+   else
+   ifeq ($(ARCH),x86)
+-OPTIMIZEVM = -O3 -march=i586
+-OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++OPTIMIZEVM =
++OPTIMIZE = $(OPTIMIZEVM)
+ HAVE_VM_COMPILED=true
+   else
+   ifeq ($(ARCH),ppc)
+-BASE_CFLAGS += -maltivec
++BASE_CFLAGS +=
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),ppc64)
+-BASE_CFLAGS += -maltivec
++BASE_CFLAGS +=
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),sparc)
+-OPTIMIZE += -mtune=ultrasparc3 -mv8plus
+-

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2017-10-25 Thread Craig Andrews
commit: a5aba94830934c4703d8526f32078c5f6bbda122
Author: Nils Freydank  posteo  de>
AuthorDate: Wed Oct 25 17:34:50 2017 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Oct 25 17:43:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5aba948

games-fps/urbanterror: Bump to 4.3.2_p20171016.

Package-Manager: Portage-2.3.12, Repoman-2.3.3

Closes: https://github.com/gentoo/gentoo/pull/6050

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.2_p20171016.ebuild | 148 +
 2 files changed, 149 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index fee14dee34b..f6cf1e0db7a 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,3 +1,4 @@
 DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 
8009516332e1f77eae3681b436e099fdd42ffa55d2691694eedc0ca94b194878 SHA512 
e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3
 WHIRLPOOL 
6aac15e44b0695501195ae172133f4b6788b9dffa5442af20d11626ad27ffd597c7f070c0fb95b0e0e8b8b3d6cf0e1bfc40b0a16abaa27c8f932ee90f19a1824
 DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 SHA256 
cf1784a3bd00451fe1bda3267235ea3eee93da65880f15fd13c07681952b4859 SHA512 
09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4
 WHIRLPOOL 
2bed79adc1dc338d74212263105c03bad51391f8c9e9e543ad54f6d6006cea4a8ebfc0e601400338b941d799dc0f642f71478dc68ad84a50718043f06f042290
 DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 SHA256 
fe37df609d763247a0bfaa7dedb33ca45a8aa523467b16f1a585ca8a08b03078 SHA512 
d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e
 WHIRLPOOL 
912201a55822dcf8423f77023f01882339739984dc9e9bdb5dca55763271c56158b47fd137da83d6e56c7625e49df8b5fc5299af646e91104e1f53cad9a50fcb
+DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 SHA256 
a345cae14ce1f445ef1ed9d883f4f06e0365fdfa05c50d2f34bfcdb89744e405 SHA512 
b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea
 WHIRLPOOL 
d4a519b1c9a7e63a98e9901c815e73f1c467412f6ad6757dafd6c4afb013bd9c3d4da3155cdc91c728113078e466d39fa68c1bb404e8019ad75984bf683370ff

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
new file mode 100644
index 000..468e8992705
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit flag-o-matic gnome2-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="3e555ab1405c38556cbfcdd42eac23a4af49e633"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble )
+   openal? ( media-libs/openal )
+   opus? ( media-libs/opusfile )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.2
+   sys-libs/zlib[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_compile() {
+   # Workaround for used zlib macro, wrt bug #449510
+   append-flags "-DOF=_Z_OF"
+   local my_arch=$(usex amd64 "x86_64" "i386")
+
+   emake \
+   ARCH=${my_arch} \
+   DEFAULT_BASEDIR="/usr/share/urbanterror" \
+   BUILD_CLIENT=$(usex "client" 1 0) \
+   BUILD_SERVER=$(usex "server" 1 0) \
+   BUILD_BASEGAME=1 \
+   BUILD_MISSIONPACK=0 \
+   BUILD_GAME_SO=0 \
+   BUILD_GAME_QVM=0 \
+   BUILD_STANDALONE=1 \
+   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2017-10-02 Thread Patrice Clement
commit: 8f73dfd5fa475072fd6843d4f3d232d54aa7968f
Author: Nils Freydank  posteo  de>
AuthorDate: Thu Sep 21 18:38:00 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Oct  2 22:25:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f73dfd5

games-fps/urbanterror: version bump to 4.3.2_p20170915.

Package-Manager: Portage-2.3.10, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5759

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.2_p20170915.ebuild | 152 +
 2 files changed, 153 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 89c3757cd59..fee14dee34b 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,2 +1,3 @@
 DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 
8009516332e1f77eae3681b436e099fdd42ffa55d2691694eedc0ca94b194878 SHA512 
e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3
 WHIRLPOOL 
6aac15e44b0695501195ae172133f4b6788b9dffa5442af20d11626ad27ffd597c7f070c0fb95b0e0e8b8b3d6cf0e1bfc40b0a16abaa27c8f932ee90f19a1824
 DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 SHA256 
cf1784a3bd00451fe1bda3267235ea3eee93da65880f15fd13c07681952b4859 SHA512 
09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4
 WHIRLPOOL 
2bed79adc1dc338d74212263105c03bad51391f8c9e9e543ad54f6d6006cea4a8ebfc0e601400338b941d799dc0f642f71478dc68ad84a50718043f06f042290
+DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 SHA256 
fe37df609d763247a0bfaa7dedb33ca45a8aa523467b16f1a585ca8a08b03078 SHA512 
d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e
 WHIRLPOOL 
912201a55822dcf8423f77023f01882339739984dc9e9bdb5dca55763271c56158b47fd137da83d6e56c7625e49df8b5fc5299af646e91104e1f53cad9a50fcb

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild
new file mode 100644
index 000..6265e8c10cd
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit flag-o-matic gnome2-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="0b3e62a00bd05d337f2ab6dad2cdb311a5d76464"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble )
+   openal? ( media-libs/openal )
+   opus? ( media-libs/opusfile )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.2
+   sys-libs/zlib[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_compile() {
+   buildit() { use $1 && echo 1 || echo 0 ; }
+   nobuildit() { use $1 && echo 0 || echo 1 ; }
+
+   # Workaround for used zlib macro, wrt bug #44951
+   append-flags "-DOF=_Z_OF"
+
+   emake \
+   ARCH=$(usex amd64 "x86_64" "i386") \
+   DEFAULT_BASEDIR="/usr/share/urbanterror" \
+   BUILD_CLIENT=$(buildit client) \
+   BUILD_SERVER=$(buildit server) \
+   BUILD_BASEGAME=1 \
+   BUILD_MISSIONPACK=0 \
+   BUILD_GAME_SO=0 \
+   BUILD_GAME_QVM=0 \
+   BUILD_STANDALONE=1 \
+   SERVERBIN="Quake3-UrT-Ded" \
+   CLIENTBIN="Quake3-UrT" \
+   USE_RENDERER_DLOPEN=0 \
+   USE_YACC=0 \
+   BASEGAME="q3ut4"\
+   BASEGAME_CFLAGS="${CFLAGS}" \
+   USE_OPENAL=$(buildit openal) \
+   USE_OPENAL_DLOPEN=$(buildit openal) \
+ 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2017-08-30 Thread David Seifert
commit: 8e0507c4843f7ac90c552dedb750ef369e85bb98
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Aug 22 15:13:41 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Aug 30 06:26:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0507c4

ygames-fps/urbanterror-data: Drop SVG image as license is unclear

Free license of the image source came from wikicommons, and only
one explicitly under GPL is in .ico format. Drop it to avoid
legal issues.

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5381

 .../urbanterror-data-4.3.2-r1.ebuild   | 62 ++
 1 file changed, 62 insertions(+)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
new file mode 100644
index 000..95dea99a4f6
--- /dev/null
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit check-reqs eutils
+
+ENGINE_PV=${PV}
+
+MY_PN=UrbanTerror
+MY_PV=43_full
+
+DESCRIPTION="Data files for UrbanTerror"
+HOMEPAGE="http://www.urbanterror.info;
+SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}.zip -> ${P}.zip"
+
+# fetch updates recursively for |4.3.x-4.3.0|
+if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   SRC_URI="${SRC_URI} 
https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 
)).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+fi
+unset MY_CTR
+
+LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}43"
+
+CHECKREQS_DISK_BUILD="3300M"
+CHECKREQS_DISK_USR="1400M"
+
+src_prepare() {
+   default
+
+   # apply updates we fetched before
+   # again recursively for |4.3.x - 4.3.0|
+   local MY_CTR
+   if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   cp -dfpr \
+   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+   fi
+}
+
+src_install() {
+   insinto /usr/share/urbanterror/q3ut4
+   doins q3ut4/*.pk3
+   # These files are *essential* for startup
+   newins q3ut4/server_example.cfg server.cfg
+   newins q3ut4/autoexec_example.cfg autoexec.cfg
+
+   dodoc q3ut4/readme43.txt
+   docinto examples
+   dodoc q3ut4/{server_example.cfg,mapcycle_example.txt}
+}



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2017-08-30 Thread David Seifert
commit: 9c505e9cfd97cf8af3af9f099b1864b51ed22bac
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Aug 22 15:13:41 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Aug 30 06:26:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c505e9c

games-fps/urbanterror: Add HOMEPAGE for engine source

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5381

 games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
index d608be174ef..ba228d05417 100644
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 inherit flag-o-matic gnome2-utils
 
 DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info;
+HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3;
 
 if [[ ${PV} == "" ]]; then
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2017-08-30 Thread David Seifert
commit: 4d18dbbad5ac8ced86cdfe1ef7c45aa70710c552
Author: Nils Freydank  posteo  de>
AuthorDate: Tue Aug 22 15:13:41 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Aug 30 06:26:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d18dbba

games-fps/urbanterror-data: Fix HOMEPAGE (no rev bump)

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/5381

 games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
index 164756643a3..f59bac91531 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
@@ -10,7 +10,7 @@ MY_PN=UrbanTerror
 MY_PV=43_full
 
 DESCRIPTION="Data files for UrbanTerror"
-HOMEPAGE="http://www.urbanterror.info/home/;
+HOMEPAGE="http://www.urbanterror.info;
 SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}.zip -> ${P}.zip
https://upload.wikimedia.org/wikipedia/commons/5/56/Urbanterror.svg -> 
${PN}.svg"
 



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/

2017-07-16 Thread Thomas Deutschmann
commit: fb783bc49c404ec6cc0405f872126b6bc2e78e31
Author: Nils Freydank  posteo  de>
AuthorDate: Sun Jul 16 20:58:37 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jul 16 21:02:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb783bc4

games-fps/urbanterror: Cleanup old unused patches

Signed-off-by: Thomas Deutschmann  gentoo.org>
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../files/urbanterror-4.2.023-build.patch  | 75 --
 .../files/urbanterror-4.2.023-nocurl.patch | 16 -
 2 files changed, 91 deletions(-)

diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch 
b/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch
deleted file mode 100644
index daa7e324a67..000
--- a/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Author: hasufell 
-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.023-nocurl.patch 
b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch
deleted file mode 100644
index b7d1f310642..000
--- a/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-fix building when USE=-curl is specified (bug #572074)
-
 ./code/client/cl_main.c.orig
-+++ ./code/client/cl_main.c
-@@ -1872,7 +1872,11 @@
- }
- 
- qboolean CL_IsDownloading(void) {
-+#if USE_CURL
-   return clc.cURLUsed;
-+#else
-+  return qfalse;
-+#endif
- }
- 
- /*



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2017-07-16 Thread Thomas Deutschmann
commit: 323ec64aab4a3850580e569403e75c5c932f3830
Author: Nils Freydank  posteo  de>
AuthorDate: Sun Jul 16 21:00:40 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jul 16 21:02:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323ec64a

games-fps/urbanterror: Bump to v4.3.2_p20170713

Closes: https://github.com/gentoo/gentoo/pull/5111
Signed-off-by: Thomas Deutschmann  gentoo.org>
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-fps/urbanterror/Manifest |   1 +
 .../urbanterror/urbanterror-4.3.2_p20170713.ebuild | 152 +
 2 files changed, 153 insertions(+)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 6264ada02b5..89c3757cd59 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1 +1,2 @@
 DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 
8009516332e1f77eae3681b436e099fdd42ffa55d2691694eedc0ca94b194878 SHA512 
e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3
 WHIRLPOOL 
6aac15e44b0695501195ae172133f4b6788b9dffa5442af20d11626ad27ffd597c7f070c0fb95b0e0e8b8b3d6cf0e1bfc40b0a16abaa27c8f932ee90f19a1824
+DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 SHA256 
cf1784a3bd00451fe1bda3267235ea3eee93da65880f15fd13c07681952b4859 SHA512 
09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4
 WHIRLPOOL 
2bed79adc1dc338d74212263105c03bad51391f8c9e9e543ad54f6d6006cea4a8ebfc0e601400338b941d799dc0f642f71478dc68ad84a50718043f06f042290

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
new file mode 100644
index 000..d608be174ef
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit flag-o-matic gnome2-utils
+
+DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
+HOMEPAGE="http://urbanterror.info;
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/mickael9/ioq3.git;
+   EGIT_BRANCH="urt"
+else
+   COMMIT_ID="8eb3e10163c62331b77171a71ca6102d3d63c3e7"
+   SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/ioq3-${COMMIT_ID}"
+   KEYWORDS="~amd64 ~x86"
+
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
+REQUIRED_USE=" || ( client server )"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
+
+RDEPEND="
+   client? (
+   media-libs/libsdl2[X,sound,joystick,opengl,video]
+   mumble? ( media-sound/mumble )
+   openal? ( media-libs/openal )
+   opus? ( media-libs/opusfile )
+   vorbis? (
+   media-libs/libogg
+   media-libs/libvorbis
+   )
+   )
+   curl? ( net-misc/curl )
+   ~games-fps/urbanterror-data-4.3.2
+   sys-libs/zlib[minizip]
+   virtual/jpeg:0
+"
+
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+   if use client; then
+   if ! use openal && ! use opus && ! use vorbis; then
+   ewarn
+   ewarn "No sound implementation selected. Enable 
'openal', 'opus' or 'vorbis' USE flag to get sound!"
+   fi
+   fi
+}
+
+src_compile() {
+   buildit() { use $1 && echo 1 || echo 0 ; }
+   nobuildit() { use $1 && echo 0 || echo 1 ; }
+
+   # Workaround for used zlib macro, wrt bug #44951
+   append-flags "-DOF=_Z_OF"
+
+   emake \
+   ARCH=$(usex amd64 "x86_64" "i386") \
+   DEFAULT_BASEDIR="/usr/share/urbanterror" \
+   BUILD_CLIENT=$(buildit client) \
+   BUILD_SERVER=$(buildit server) \
+   BUILD_BASEGAME=1 \
+   BUILD_MISSIONPACK=0 \
+   BUILD_GAME_SO=0 \
+   BUILD_GAME_QVM=0 \
+   BUILD_STANDALONE=1 \
+   SERVERBIN="Quake3-UrT-Ded" \
+   CLIENTBIN="Quake3-UrT" \
+   USE_RENDERER_DLOPEN=0 \
+   USE_YACC=0 \
+   BASEGAME="q3ut4"\
+   BASEGAME_CFLAGS="${CFLAGS}" \
+   USE_OPENAL=$(buildit openal) \
+   USE_OPENAL_DLOPEN=$(buildit openal) \
+   USE_CURL=$(buildit curl) \
+   USE_CURL_DLOPEN=$(buildit curl) \
+   USE_CODEC_VORBIS=$(buildit vorbis) \
+   USE_CODEC_OPUS=$(buildit opus) \
+   USE_MUMBLE=$(buildit mumble) \
+   USE_VOIP=$(buildit voip) \
+   USE_INTERNAL_LIBS=0 \
+   USE_LOCAL_HEADERS=0 \
+   USE_ALTGAMMA=$(buildit 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2017-06-09 Thread Thomas Deutschmann
commit: bee9c6050c05e972ed935abf908d595597bb0416
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Jun  9 10:33:29 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Jun  9 10:34:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee9c605

games-fps/urbanterror: Security cleanup (bug #606702)

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-fps/urbanterror/Manifest   |   4 -
 games-fps/urbanterror/metadata.xml   |   1 -
 games-fps/urbanterror/urbanterror-4.2.023.ebuild | 158 ---
 3 files changed, 163 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 5ff4b23affe..6264ada02b5 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,5 +1 @@
-DIST UrbanTerror-4.2.022-to-4.2.023.zip 15296685 SHA256 
71d34f4245c264dd729d40cf76c1471c89606891f88fda28e007ebe6a052dde9 SHA512 
2b35a34cf478939b850fd6f9b2f4a46f55259f32574799968ec4595c8e7c8930910ac6958bf03c99d63516cc4a41dbd6faaad4207326e42a19981561d25aff0e
 WHIRLPOOL 
bc13ec862ad829a5b417b114d50cc3f3dc1701b3c6fd136bafa0e2a68f0bbe44d03ea33a832e4882ab7cf63f3202b1ff6f62660bc69273542165d8e7f1e36d2f
-DIST UrbanTerror42_full022.zip 1924134151 SHA256 
e8b0a2c3a7253c24cac4e5b24028a0c9841717ae867e74ae18a18fd9c7259fd6 SHA512 
6da90696c8e0f2b5315bc2564e45e8d4ee708f5f42dc1ae26846a030798c1614ef938e0ed2028ceb69b7f5a59aa1a2310d73a20530f52be29e7c4e5819f6b290
 WHIRLPOOL 
9e428099bdfdad94cb554821dfd9128cd909c9c51c50b2009b8778aea69bb4be10be0c6a9299de76e60c9d5a22eb0dc06a1987f4851d360c718ed6f019554a36
-DIST urbanterror-4.2.023.tar.gz 12637911 SHA256 
17c79f4ed1adc0859a20f0b19ab75f04e1e7ff518c882b5cd68199b44acff90f SHA512 
c0b3fb0d53889561124ea034bd2b579c3b56489e751adf9479b86c54855b4f0917589a41caa7c1a534afee59983f77394a1c76dc92534dc84116a5566c19e8e5
 WHIRLPOOL 
68fa26a7a0ea19a1b7b3ced968515e1b326a9f7acabc30096b15880a772c4ca4faa764fb1fd4ab07d616718c550284af88cd03deeb8b11b7003b96336413d3ee
 DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 
8009516332e1f77eae3681b436e099fdd42ffa55d2691694eedc0ca94b194878 SHA512 
e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3
 WHIRLPOOL 
6aac15e44b0695501195ae172133f4b6788b9dffa5442af20d11626ad27ffd597c7f070c0fb95b0e0e8b8b3d6cf0e1bfc40b0a16abaa27c8f932ee90f19a1824
-DIST urbanterror.svg 1592 SHA256 
0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 
ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98
 WHIRLPOOL 
281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c

diff --git a/games-fps/urbanterror/metadata.xml 
b/games-fps/urbanterror/metadata.xml
index 8dcffcaca29..062f62f8466 100644
--- a/games-fps/urbanterror/metadata.xml
+++ b/games-fps/urbanterror/metadata.xml
@@ -18,7 +18,6 @@
Build binary for client (includes code for 
non-dedicated server)
Use opus as sound codec
Use Mumble for ingame VoIP 
(experimental)
-   Triggers a paxmarking of the 
binary
Use ioq3 ingame VoIP (experimental)
Build binary for dedicated server


diff --git a/games-fps/urbanterror/urbanterror-4.2.023.ebuild 
b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
deleted file mode 100644
index a8975fa1ab4..000
--- a/games-fps/urbanterror/urbanterror-4.2.023.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit check-reqs eutils gnome2-utils pax-utils games
-
-ENGINE_PV=${PV}
-FULL_P=UrbanTerror42_full022
-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
-   https://upload.wikimedia.org/wikipedia/commons/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-2111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+altgamma +curl debug dedicated openal pax_kernel +sdl server smp vorbis"
-RESTRICT="mirror"
-
-RDEPEND="
-   !dedicated? (
-   virtual/opengl
-   curl? ( net-misc/curl )
-   openal? ( media-libs/openal )
-   

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2017-06-09 Thread Agostino Sarubbo
commit: 7ba070c903686820e1dd0447632440df32f28925
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun  9 10:19:08 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun  9 10:19:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba070c9

games-fps/urbanterror-data: x86 stable wrt bug #606702

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
index a0dc9845216..164756643a3 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
@@ -26,7 +26,7 @@ unset MY_CTR
 
 LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 DEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_PN}43"



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2017-06-09 Thread Agostino Sarubbo
commit: 5e85039fd8e37d1f41a5fa90a4926f95ef0508b6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jun  9 10:19:03 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jun  9 10:19:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e85039f

games-fps/urbanterror: x86 stable wrt bug #606702

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
index c1ef0e855b8..eaf4a41e7db 100644
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
@@ -15,7 +15,7 @@ else
COMMIT_ID="60b17a27ecaa30bffc44114cb94df82af7febfdd"
SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 
 fi
 



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2017-06-08 Thread Agostino Sarubbo
commit: d4b7645ea9c3c18ae40947e9241413632a424041
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun  8 10:14:35 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun  8 10:14:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4b7645e

games-fps/urbanterror-data: amd64 stable wrt bug #606702

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
index 5f763018396..a0dc9845216 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
@@ -26,7 +26,7 @@ unset MY_CTR
 
 LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 DEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${MY_PN}43"



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2017-06-08 Thread Agostino Sarubbo
commit: 9acb2fe1dcc4e8e48e23307479c0492490706023
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun  8 10:14:30 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun  8 10:14:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acb2fe1

games-fps/urbanterror: amd64 stable wrt bug #606702

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild 
b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
index 5d79cf7096e..c1ef0e855b8 100644
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
@@ -15,7 +15,7 @@ else
COMMIT_ID="60b17a27ecaa30bffc44114cb94df82af7febfdd"
SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz 
-> ${P}.tar.gz"
S="${WORKDIR}/ioq3-${COMMIT_ID}"
-   KEYWORDS="~x86 ~amd64"
+   KEYWORDS="amd64 ~x86"
 
 fi
 



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2017-05-10 Thread Thomas Deutschmann
commit: f7889d977082170f967288f20b350f6e27a9557f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed May 10 20:13:40 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed May 10 20:14:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7889d97

games-fps/urbanterror: Restore pax_kernel USE flag in metadata.xml

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-fps/urbanterror/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-fps/urbanterror/metadata.xml 
b/games-fps/urbanterror/metadata.xml
index 062f62f8466..8dcffcaca29 100644
--- a/games-fps/urbanterror/metadata.xml
+++ b/games-fps/urbanterror/metadata.xml
@@ -18,6 +18,7 @@
Build binary for client (includes code for 
non-dedicated server)
Use opus as sound codec
Use Mumble for ingame VoIP 
(experimental)
+   Triggers a paxmarking of the 
binary
Use ioq3 ingame VoIP (experimental)
Build binary for dedicated server




[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/files/, games-fps/urbanterror/

2017-05-10 Thread Thomas Deutschmann
commit: fccde5cf308d9d08016e70873ca8ca041c94b7e7
Author: Nils Freydank  posteo  de>
AuthorDate: Wed May 10 19:55:21 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed May 10 19:55:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fccde5cf

games-fps/urbanterror: Bump to v4.3.2_p20170426 (bug #596982)

EBuild changes:
===
  - Ebuild no longer uses bundled libs (bug #457014)

  - Contains fixes for / no longer affected by CVE-2011-1412,
CVE-2011-2764, CVE-2011-3012,CVE-2012-3345 due to
updated/changed engine (bug #606702)

  - Fixed some format-security problems (bug #545966)

Closes: https://github.com/gentoo/gentoo/pull/4172

Gentoo-Bug: https://bugs.gentoo.org/596982
Gentoo-Bug: https://bugs.gentoo.org/457014
Gentoo-Bug: https://bugs.gentoo.org/545966
Gentoo-Bug: https://bugs.gentoo.org/606702

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 games-fps/urbanterror/Manifest |   1 +
 .../files/urbanterror-4.3-respect_CFLAGS.patch |  53 +++
 games-fps/urbanterror/metadata.xml |  17 ++-
 .../urbanterror/urbanterror-4.3.2_p20170426.ebuild | 152 +
 4 files changed, 220 insertions(+), 3 deletions(-)

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index 17d6aa25356..5ff4b23affe 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,4 +1,5 @@
 DIST UrbanTerror-4.2.022-to-4.2.023.zip 15296685 SHA256 
71d34f4245c264dd729d40cf76c1471c89606891f88fda28e007ebe6a052dde9 SHA512 
2b35a34cf478939b850fd6f9b2f4a46f55259f32574799968ec4595c8e7c8930910ac6958bf03c99d63516cc4a41dbd6faaad4207326e42a19981561d25aff0e
 WHIRLPOOL 
bc13ec862ad829a5b417b114d50cc3f3dc1701b3c6fd136bafa0e2a68f0bbe44d03ea33a832e4882ab7cf63f3202b1ff6f62660bc69273542165d8e7f1e36d2f
 DIST UrbanTerror42_full022.zip 1924134151 SHA256 
e8b0a2c3a7253c24cac4e5b24028a0c9841717ae867e74ae18a18fd9c7259fd6 SHA512 
6da90696c8e0f2b5315bc2564e45e8d4ee708f5f42dc1ae26846a030798c1614ef938e0ed2028ceb69b7f5a59aa1a2310d73a20530f52be29e7c4e5819f6b290
 WHIRLPOOL 
9e428099bdfdad94cb554821dfd9128cd909c9c51c50b2009b8778aea69bb4be10be0c6a9299de76e60c9d5a22eb0dc06a1987f4851d360c718ed6f019554a36
 DIST urbanterror-4.2.023.tar.gz 12637911 SHA256 
17c79f4ed1adc0859a20f0b19ab75f04e1e7ff518c882b5cd68199b44acff90f SHA512 
c0b3fb0d53889561124ea034bd2b579c3b56489e751adf9479b86c54855b4f0917589a41caa7c1a534afee59983f77394a1c76dc92534dc84116a5566c19e8e5
 WHIRLPOOL 
68fa26a7a0ea19a1b7b3ced968515e1b326a9f7acabc30096b15880a772c4ca4faa764fb1fd4ab07d616718c550284af88cd03deeb8b11b7003b96336413d3ee
+DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 SHA256 
8009516332e1f77eae3681b436e099fdd42ffa55d2691694eedc0ca94b194878 SHA512 
e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3
 WHIRLPOOL 
6aac15e44b0695501195ae172133f4b6788b9dffa5442af20d11626ad27ffd597c7f070c0fb95b0e0e8b8b3d6cf0e1bfc40b0a16abaa27c8f932ee90f19a1824
 DIST urbanterror.svg 1592 SHA256 
0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 
ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98
 WHIRLPOOL 
281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c

diff --git a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch 
b/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
new file mode 100644
index 000..5ce13342ab5
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
@@ -0,0 +1,53 @@
+Author: holgersson 
+Date:   Fri Mar 31 12:13:00 2017 +0200
+
+Respect CFLAGS - inspired by hasufell’s patch
+
+--- a/Makefile 2017-03-31 11:08:58.419210817 +0200
 b/Makefile 2017-03-31 12:06:52.559412054 +0200
+@@ -290,34 +290,33 @@
+ CLIENT_EXTRA_FILES=
+
+ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" 
"gnu"))
+-  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
+--pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
++  BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
+   CLIENT_CFLAGS += $(SDL_CFLAGS)
+
+-  OPTIMIZEVM = -O3
+-  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++  OPTIMIZEVM =
++  OPTIMIZE = $(OPTIMIZEVM)
+
+   ifeq ($(ARCH),x86_64)
+-OPTIMIZEVM = -O3
+-OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++OPTIMIZEVM =
++OPTIMIZE = $(OPTIMIZEVM)
+ HAVE_VM_COMPILED = true
+   else
+   ifeq ($(ARCH),x86)
+-OPTIMIZEVM = -O3 -march=i586
+-OPTIMIZE = $(OPTIMIZEVM) -ffast-math
++OPTIMIZEVM =
++OPTIMIZE = $(OPTIMIZEVM)
+ HAVE_VM_COMPILED=true
+   else
+   ifeq ($(ARCH),ppc)
+-BASE_CFLAGS += -maltivec
++BASE_CFLAGS +=
+ HAVE_VM_COMPILED=true
+   endif
+   ifeq ($(ARCH),ppc64)
+-

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror-data/

2017-05-10 Thread Thomas Deutschmann
commit: 92bae7433a82f1a2905008b1d67d8e58d7eef0aa
Author: Nils Freydank  posteo  de>
AuthorDate: Wed May 10 19:40:39 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed May 10 19:41:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92bae743

games-fps/urbanterror-data: initial import, split out of games-fps/urbanterror

Link: https://github.com/gentoo/gentoo/pull/4172

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 games-fps/urbanterror-data/Manifest|  4 ++
 games-fps/urbanterror-data/metadata.xml| 16 ++
 .../urbanterror-data/urbanterror-data-4.3.2.ebuild | 64 ++
 3 files changed, 84 insertions(+)

diff --git a/games-fps/urbanterror-data/Manifest 
b/games-fps/urbanterror-data/Manifest
new file mode 100644
index 000..66c107a688c
--- /dev/null
+++ b/games-fps/urbanterror-data/Manifest
@@ -0,0 +1,4 @@
+DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 SHA256 
943fbae28a32f8f7a15eba62eadad646f4640d8d1814e3fb14fac0c50bb513e0 SHA512 
f05564babadff73793778926411bc7914bfef4a5f7dfc1003c36e8a549c568ab520adcff8a38e7dd905238738d242aa865e7c6d7db36ed6d592b144e497ed823
 WHIRLPOOL 
b262f51ca35455c013ae5f61e87d5c13a1ac9c5f98eba588398f8ad1db02a9aa505531a08d680770822d57c9df244a532be3ee2cc2dfb224afa8119d5eb5ec45
+DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 SHA256 
519d212c8766470c2970c75f19e99477a8c2546ca4de78bc28dedce8d2fcabb5 SHA512 
cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
 WHIRLPOOL 
d58d949075a9228d832a67507c30942133a2024c131c0127a263ab1b5a5550576f361565ab8df6ef8b8f3e5f898496fa84b0d845cc47d22f491a04bf88b2623d
+DIST urbanterror-data-4.3.2.zip 1491207564 SHA256 
60360806aea9bd383d8a95b8586fe8d8690626b130e907f8727845fd192531bc SHA512 
397aa5ba7f869049844d52a9dec234d020b856e16ba3ff295d97775e4e1d48730aecfba3992baf7d55c643c0073ceda32ada18d1473dadd55f561f27a8b9c4ed
 WHIRLPOOL 
52782d0d6668589c5353a7e73ae6dd4ec02a02361532c36889a4b5f3c53d740bece8d9f421c6faeb9c720e6b68dbbccf1758cb39f7b82239a6517c7b0451c4a2
+DIST urbanterror-data.svg 1592 SHA256 
0d7eb12a8fe8380e0d89199621414dd56ecdfe8a8b99eec5b95d925294521de9 SHA512 
ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98
 WHIRLPOOL 
281413cfeb881466c2d8b882d0aa4dcf19013630a462775345c69e78a0cb86c7efed14f5d22b453c89648da682ab5e98e3579a1c975994a8e90b9fb22c37892c

diff --git a/games-fps/urbanterror-data/metadata.xml 
b/games-fps/urbanterror-data/metadata.xml
new file mode 100644
index 000..866bc44b982
--- /dev/null
+++ b/games-fps/urbanterror-data/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   holgers...@posteo.de
+   Nils Freydank
+   
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+

diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild 
b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
new file mode 100644
index 000..5f763018396
--- /dev/null
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit check-reqs eutils
+
+ENGINE_PV=${PV}
+
+MY_PN=UrbanTerror
+MY_PV=43_full
+
+DESCRIPTION="Data files for UrbanTerror"
+HOMEPAGE="http://www.urbanterror.info/home/;
+SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}.zip -> ${P}.zip
+   https://upload.wikimedia.org/wikipedia/commons/5/56/Urbanterror.svg -> 
${PN}.svg"
+
+# fetch updates recursively for |4.3.x-4.3.0|
+if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   SRC_URI="${SRC_URI} 
https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 
)).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+fi
+unset MY_CTR
+
+LICENSE="Q3AEULA-2111 urbanterror-4.2-maps"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}43"
+
+CHECKREQS_DISK_BUILD="3300M"
+CHECKREQS_DISK_USR="1400M"
+
+src_prepare() {
+   default
+
+   # apply updates we fetched before
+   # again recursively for |4.3.x - 4.3.0|
+   local MY_CTR
+   if [[ "${PV}" != "4.3.0" ]]; then
+   MY_CTR=0
+   while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
+   cp -dfpr \
+   "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( 
${MY_CTR} + 1 ))/* "${S}"
+   MY_CTR=$(( ${MY_CTR} + 1 ))
+   done
+   fi
+}
+
+src_install() {
+   newicon -s scalable 

[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/

2016-04-02 Thread Michael Sterrett
commit: 427bb38ba9b9980affd2ec8d07553062334b3614
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sat Apr  2 18:52:04 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sat Apr  2 18:52:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427bb38b

games-fps/urbanterror: fix building when USE=-curl is specified (bug #572074)

Package-Manager: portage-2.2.26

 .../urbanterror/files/urbanterror-4.2.023-nocurl.patch   | 16 
 games-fps/urbanterror/urbanterror-4.2.023.ebuild |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch 
b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch
new file mode 100644
index 000..b7d1f31
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch
@@ -0,0 +1,16 @@
+fix building when USE=-curl is specified (bug #572074)
+
+--- ./code/client/cl_main.c.orig
 ./code/client/cl_main.c
+@@ -1872,7 +1872,11 @@
+ }
+ 
+ qboolean CL_IsDownloading(void) {
++#if USE_CURL
+   return clc.cURLUsed;
++#else
++  return qfalse;
++#endif
+ }
+ 
+ /*

diff --git a/games-fps/urbanterror/urbanterror-4.2.023.ebuild 
b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
index a28e710..6065053 100644
--- a/games-fps/urbanterror/urbanterror-4.2.023.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
@@ -81,7 +81,9 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch
+   epatch \
+   "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch \
+   "${FILESDIR}"/${PN}-${ENGINE_PV}-nocurl.patch
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/

2016-03-19 Thread Michael Sterrett
commit: 641f68d040ed33b8b77b13d9d16a68043d1c1461
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sat Mar 19 23:01:28 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sat Mar 19 23:02:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641f68d0

games-fps/urbanterror: update url to icon (bug #577758)

Package-Manager: portage-2.2.26

 games-fps/urbanterror/urbanterror-4.2.023.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/urbanterror/urbanterror-4.2.023.ebuild 
b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
index 0124630..a28e710 100644
--- a/games-fps/urbanterror/urbanterror-4.2.023.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ 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"
+   https://upload.wikimedia.org/wikipedia/commons/5/56/Urbanterror.svg -> 
${PN}.svg"
 
 # fetch updates
 if [[ ${FULL_P#*full} != ${PV#*.} ]] ; then