gentoo resync : 20.11.2017

4 files changed, 243 insertions, 3 deletions

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index c1e6ccf14568..538f8401ec1a 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,12 +1,15 @@
+AUX urbanterror-4.3-fix-build_system.patch 1927 SHA256 eba6732abb7c9b0359e9d18633bda773a83db958c749ce9ce101ed3ba3738e7f SHA512 a2ba20e40dc00d066d48399a00b53cfe2b23854f09be82fc5a986b93ca409559cda72bda50f7135ae6a01801cf8171784628d12a4b2440e63eaf68e4bfb3f1b2 WHIRLPOOL d9aaf64044752f15006dae19b053f1511598447fff9e5361c1bcbe01751cfcafef4573e960514ab25c440b78c684fa781130acc6e632de084eb061a8ec072470
 AUX urbanterror-4.3-respect_CFLAGS.patch 1473 SHA256 7a6467e157d8e70c409a8cacde491fcee33fd0365605ba15f9e0d9f80924940b SHA512 f0fa26b1c82bf8df7c1b47eb7cd2afbc93c5b61b3638c0d5bdec33f12051ba525851269d70a7379093f5da7a8fbbb8e3e39f9c74d4df1c4807f32673819f01ee WHIRLPOOL 689176cdd85ab5980a0c7726af1accfd0f8c3879261c5141820bf9e5ad421c49012a19f9ec04360e77eb7b503862a1994ba0f97e84772c9c03fea0a9c78d6dee
 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
+DIST urbanterror-4.3.2_p20171105.tar.gz 10067127 SHA256 5b577d3c5ac62cbece532c54a3e30b2c89b9accb60657475a7cd2fb768f0bb02 SHA512 7a9ac15a0508706c17a390a5105badbaaba3b3c0e7e23b3ab9dd16751b1d946c108febba5c2f6af3046d5431fd1c5978a2abc267a740eca1d89d77d7172b41ad WHIRLPOOL 680a170e50d2d398129e1c0788ffa622fb4795d810e01db216232a16e6d8024813d648bf2276a7cb1bf14187d8c32794b0bb48c83d854d5c9989be1bc716560b
 EBUILD urbanterror-4.3.2_p20170426.ebuild 3971 SHA256 b308a14721219d65a1889f6f49a62918ae94db37503b8963be2d8bffc6b19dcf SHA512 93988dfd26880e999b8d2eb34f7cf8961d363f7aa13e3e75fe8e8a40290dc8d5f774b0c3e34ccd4f3b1028a2499b46989417818b7df7a869156a1561a94e50c5 WHIRLPOOL ab2b0d80e85a1b6ec08cb742e2952e5faebebb3432906d22c713d6cad47fe79ae51b2fc0d92e73ded41672d6d27c04b3856e182867ef1305e21efcdfed99399f
 EBUILD urbanterror-4.3.2_p20170713.ebuild 4004 SHA256 11a126c91c5bf155777ce5faaf9364b78ff964e6ea235c8d0bfdc3aa6ee5edb0 SHA512 def80468298e611f7a46bf453582b50f43748da4244d4ae62faeddb26809c6d8f18ad2afa9a0513e1ea3d87b8576df700d092e0412417cf99d63bb63a06df482 WHIRLPOOL e0f0e1f886992640385322e9bf29e8b8c0696a85eaf61d2c47c995a819b7ce95c17169acc5231a0ef8be83b67f70e5f642af11e954de9156fa8b609ab24e0bfc
 EBUILD urbanterror-4.3.2_p20170915.ebuild 4004 SHA256 7a1f1f1996b676412b226eb6f87bdd4d112c40300ed5537b795ba280286412c3 SHA512 73cbfce8f97dcbeaa621a6eca247a3aa496e0221c94dbf718f3a1af550dd9c346842e21fe2690d1ceb4a53dc0c7a70603907558c3c6c43b89f7b81dfc1e6bf8c WHIRLPOOL aec2645cbe2f72ea02ecaad009af408573ca92e1f835c9c6391f5e0e21283e4c882cbed85d95f6654c47d84daccb256362de26ce5f4b09795a3ec5291bc4bd23
 EBUILD urbanterror-4.3.2_p20171016.ebuild 3973 SHA256 ba6f66296fcf8507ce4da49b1ae380f9cb7320d485cfec95de838b704a7cceed SHA512 66f70132d2a855435e49d3db858b39b3dfffea3bf4fdd99849930724a3e9a9031583cda2fa08b4e51e7161fa9b0ecee43cb512920b448aa8ce72834eb4651b05 WHIRLPOOL 927ed2f2f7f8cda4236c33ad0a6f3a212227271ad80bf526bec601c5275071f2c48413b9ecefa16199c1d11090cb61acc3dd5acbe752d4eb97d8b302653ae8d9
+EBUILD urbanterror-4.3.2_p20171105.ebuild 4359 SHA256 348944628740a30f651db42ab5755ef009b5fd8b858f6fb6f92c1874d4e682ab SHA512 9534e3427af0948a232af2f5375499d974107cddfeb2f5800043507819d51e2c1c5feaecc04b4df0c096b5cf756ff6a67a34b1f7181eacfaf7970c8a720c439d WHIRLPOOL f9345006f7297e13f9e7503f73654e76dcbfb51e7c14a02eeca4f80b65710171953949c67401ece5a4e010c1d664d1f390de03e6d1335dcd205ae1480a7b758c
 MISC ChangeLog 2861 SHA256 6a07b67b0007d36999171cc39cddb002e247ed978dac24bca50df23787244b87 SHA512 30a7d06750de5a6ce7cc16f8f34954e0a7f5596a1b75e67cc755404ade0fa731b5571bf51f3224ee6a70a9d8a2fb13abf60e218361ee92e68930336c044d65c5 WHIRLPOOL b6fd9e88efe71379fbcdee7cf2339ca2e2de7275aba3b7a8d6f8f45f1f031b6534f1f07ef233e4ef2fa0551ed23d9cc6136880dc23c2eaee3899797269df75d6
 MISC ChangeLog-2015 10015 SHA256 b3650a701ee283726d067bf6244814e3410f789158f0ec939e52261fbc9c7c47 SHA512 1a14a93b1c3b7786eabb0563ce6b10b5090df027d8b3b04a5a51838880190deb893a17f6e0336f810bf34ae549affccc6e5dd50dedb4ac59d87d8288bae1f7fd WHIRLPOOL 89734ece7c9e708b6e42f48c38c080aaab79dacb98d66f8031dd4ca7db705e90240c7f5ed3a92e6fe68488e0cc585b073d2c0a37bd55e39dcf0a8568f42cc3a0
-MISC metadata.xml 1022 SHA256 91dfa742a5e0abfbee69544d8e816505fe9860707a8186fe5904e263924b130c SHA512 77a9bf551d2e24b4cfd36196bd2d8d8e9a969f5ceb643144893a1b9485d636e59eb7db0f4b3758f38a454c1f4cbaf8b4582181fe59ae08dcea20b3ec0e4db130 WHIRLPOOL ed83dab78fbed48d453e4d5472958434775d85b601c3239360ed1cdf1ba760c0cb62fc87b02f716710dedaf0f4ea30eafcdbca821d8e8c1812bf63e15433c4b1
+MISC metadata.xml 1109 SHA256 c7243d24c3393aa0d3b9f69f3db3c1052a2cf656d9f1cbdcdebbcd36f4f8834d SHA512 cb55a92c3c03065a17f71e5cfc8151a8c12acbc341389a14f96119960eb23c11613adaa8e9b552946d2db728121118a5130447c892d61a1a909b4dd8b94a5dcc WHIRLPOOL b96ed1b3e4ed86ad36ced3a594b875fdd700fd3f90c0a57520ed94647690971b0ccabf6c67b201ad0f770a6c82a08ec2eaebea36fd677d2c7ada093f4b8ba151
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 000000000000..b7a24a1b6e94
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
@@ -0,0 +1,73 @@
+Author: Nils Freydank <holgersson@posteo.de>
+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.000000000 +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)
+@@ -1124,7 +1123,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_REF_CC
+
diff --git a/games-fps/urbanterror/metadata.xml b/games-fps/urbanterror/metadata.xml
index 062f62f84665..38fad51f813c 100644
--- a/games-fps/urbanterror/metadata.xml
+++ b/games-fps/urbanterror/metadata.xml
@@ -16,10 +16,11 @@
 	<use>
 		<flag name="altgamma">Alternative way for gamma setting with modesetting driver</flag>
 		<flag name="client">Build binary for client (includes code for non-dedicated server)</flag>
-		<flag name="opus">Use opus as sound codec</flag>
 		<flag name="mumble">Use Mumble for ingame VoIP (experimental)</flag>
-		<flag name="voip">Use ioq3 ingame VoIP (experimental)</flag>
+		<flag name="opus">Use opus as sound codec</flag>
 		<flag name="server">Build binary for dedicated server</flag>
+		<flag name="skeetshootmod">Build support for skeetshoot mod for specific maps</flag>
+		<flag name="voip">Use ioq3 ingame VoIP (experimental)</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Barbatos/ioq3-for-UrbanTerror-4</remote-id>
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild
new file mode 100644
index 000000000000..4bcbbaa4605a
--- /dev/null
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20171105.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} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
+	EGIT_BRANCH="urt"
+else
+	COMMIT_ID="59594a771796ae3b02e24a23807a808129931d1a"
+	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() {
+	local my_arch=$(usex amd64 "x86_64" "i386")
+	# docs from ioq3, not from UrbanTerror ZIP file
+	dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
+
+	if use client; then
+		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
+		# Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
+		make_desktop_entry ${PN} "UrbanTerror" ${PN}
+	fi
+
+	if use server && ! use client; then
+		# dedicated server only
+		newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
+	fi
+}
+
+pkg_postinst() {
+	use client && xdg_desktop_database_update
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		if use openal; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta s_useopenal \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
+		fi
+
+		if use altgamma; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta r_altgamma \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
+		fi
+
+		if ! use altgamma; then
+			elog ""
+			elog "If you are using a modesetting graphics driver you might"
+			elog "consider setting USE=\"altgamma\"."
+			elog "For details take a look at:"
+			elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
+		fi
+
+		if ! use client; then
+			elog ""
+			elog "You disabled client support. You won't be able to connect"
+			elog "to any servers and play. If you want to do so, enable"
+			elog "USE=\"client\"."
+		fi
+	fi
+
+	if ver_test -ge 4.3.2_p20171105; then
+		# Yippee, new features!
+		if use skeetshootmod; then
+			elog ""
+			elog "You might need to set:"
+			elog "  seta sv_skeetshoot \"1\""
+			elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	use client && xdg_desktop_database_update
+}