gentoo resync : 06.04.2022

3 files changed, 25 insertions, 37 deletions

diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index b5b8774bee41..1bcc4cb0b78b 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,4 +1,4 @@
-AUX urbanterror-4.3.4_p20180708-fix-build_system.patch 2736 BLAKE2B 1feaa3012915877abfc2b10b3ab602f9047d16ae7c69a234558aac286548eb91d9e49dcdc41cd51e7c0c9d28b1545a66e0b54a1cf996a370515bbba811715853 SHA512 9afd32a706d6c5de39b6fc1a7d3831873e2fbaa3e13ae41046b6e7a1e639c22bcfc7e2e61cff8d0fb87094b4dc31157c7f4d6f9ea7b1b97504bf40a61acb0906
-DIST urbanterror-4.3.4_p20210304.tar.gz 6189619 BLAKE2B 2a92674372c1d6c988f19179b4514926b171bc7e3e027242d261971c8ed40eca159fd33584ea869562b3002f721c31efd6d3e65c4f96ce2df1b61bcba19a8cbd SHA512 ccdfa55ded774f19028250e6c8fcd371a5934284d85e265879193fab8f50c5026366f68c0bb359003f67528f2e2cb896dc6f3a3da5b5ea144d6e235e864d34e2
-EBUILD urbanterror-4.3.4_p20210304.ebuild 4472 BLAKE2B da2f63c10ffe5a9fd3b7208824e86f63b99ceba176b61fe24341799c1aa0e44692021d5915e4bd00796db0fc1277fb0ce9b3f5da8feeb9d40d94183477310e7b SHA512 24d90ac6b16264da072a62e8a3552ad617e94dea2fbc33939264f54c05891f723d8cd9634ff2b076e28715834eea978aa41f5fdf827f515708a6ccd6fef26b71
+AUX urbanterror-4.3.4_p20211208-respect-flags.patch 2259 BLAKE2B 432fdf6ddc4aab01cc91096a269a7347e357b2f701eb67db6134e2d74cda1406cf126c6a8871a7d4c0db361a5433a9537115d52d29d0088d4cd60942e3e21e34 SHA512 5b0ce59605dfd7e8634f59071a391ba362001d6d24aabab27cb0054ea571fb6a4d3920f5b28d835e425ee724f32dc6281a922885413f3d5161668b0510ca5e17
+DIST urbanterror-4.3.4_p20211208.tar.gz 6187667 BLAKE2B 7901ad0d23d9b80634a3e4e68973227f302bb7004bdb1f450f7ab520f1a3243821aa49712a486d1e577e5bb055504d4005555fa273e64a2e2b57a75661044370 SHA512 24c0fe6775a165ddcc6b919bc46872fdcfff7e471c6ff88b635e6926bce051cc034e7ef8a5145996d67c79632cef763e4cc6c5c988d36088de0f69bb5626ff86
+EBUILD urbanterror-4.3.4_p20211208.ebuild 4500 BLAKE2B 48c0360fa0b8b489a8c46a2193064000a31d5acb6204e346278e7388b18f525608f3ae2c4ecd74fd962e1bcfc992eb011b99a48b8674f87ebca5289e584384ed SHA512 420e2edbecd3b7222029ba7b35239fd04413a7368672acc194f0d8e498bf991014eb22b08610109d34053aa311013bd27629a66672eae06b813f6d6f8801ef08
 MISC metadata.xml 1089 BLAKE2B dc34404fa38f542dd2f026c718e432ba6659dcf459d4ab759f3adb0853ec840651b493f929d7b60bbe7500f45b98c842bfadc58cdeea4e3246301a0e09db466b SHA512 82ee4115569a3278f5e69ed01e41bbda362a4ff9367f00d94173a87a9298944387b0dd5a12cbf0dee4cbb0005dfa80932b5a458733b820acd94416fe077b2d10
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_p20211208-respect-flags.patch
index fddd8df5bf37..d6938f3a4609 100644
--- a/games-fps/urbanterror/files/urbanterror-4.3.4_p20180708-fix-build_system.patch
+++ b/games-fps/urbanterror/files/urbanterror-4.3.4_p20211208-respect-flags.patch
@@ -1,21 +1,7 @@
-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.
-
-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.000000000 +0200
-+++ b/Makefile	2018-09-01 11:00:00.000000001 +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)\\\"
+--- 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
@@ -55,7 +41,7 @@ Edit 2018-09-01: Update to take Makefile changes into account.
      HAVE_VM_COMPILED=true
    endif
    ifeq ($(ARCH),armv7l)
-@@ -1143,7 +1142,7 @@
+@@ -1153,7 +1153,7 @@ endif
  
  define DO_CC
  $(echo_cmd) "CC $<"
@@ -64,7 +50,7 @@ Edit 2018-09-01: Update to take Makefile changes into account.
  endef
  
  define DO_CC_ALTIVEC
-@@ -1153,7 +1152,7 @@
+@@ -1163,7 +1163,7 @@ endef
  
  define DO_REF_CC
  $(echo_cmd) "REF_CC $<"
@@ -73,7 +59,7 @@ Edit 2018-09-01: Update to take Makefile changes into account.
  endef
  
  define DO_REF_CC_ALTIVEC
-@@ -1171,7 +1170,7 @@
+@@ -1181,7 +1181,7 @@ endef
  
  define DO_BOT_CC
  $(echo_cmd) "BOT_CC $<"
@@ -82,7 +68,7 @@ Edit 2018-09-01: Update to take Makefile changes into account.
  endef
  
  ifeq ($(GENERATE_DEPENDENCIES),1)
-@@ -1185,7 +1184,7 @@
+@@ -1195,7 +1195,7 @@ endef
  
  define DO_DED_CC
  $(echo_cmd) "DED_CC $<"
@@ -91,4 +77,3 @@ Edit 2018-09-01: Update to take Makefile changes into account.
  endef
  
  define DO_WINDRES
-
diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
index 79cdded4b1d5..5a8e0c3737e8 100644
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20210304.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.4_p20211208.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 inherit desktop flag-o-matic toolchain-funcs xdg-utils
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
 	EGIT_BRANCH="urt"
 else
-	COMMIT_ID="0429c03056720523d27ca71d5a4aa3e8d00709e7"
+	COMMIT_ID="c988f7669bd70b59beb384563d4c8304062ae011"
 	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/ioq3-${COMMIT_ID}"
 	KEYWORDS="~amd64 ~x86"
@@ -22,27 +22,31 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
-REQUIRED_USE="|| ( client server )
-		voip? ( opus )"
+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
+	"${FILESDIR}"/${PN}-4.3.4_p20211208-respect-flags.patch
 )
 
 RDEPEND="
 	client? (
-		media-libs/libsdl2:=[X,sound,joystick,opengl,video]
+		media-libs/libsdl2[X,sound,joystick,opengl,video]
 		mumble? ( media-sound/mumble:= )
 		openal? ( media-libs/openal:= )
-		opus? ( media-libs/opusfile:= )
-		vorbis? ( media-libs/libvorbis:= )
+		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
+	x11-libs/libX11
+	x11-libs/libXxf86vm
 "
 
 DEPEND="${RDEPEND}"
@@ -57,9 +61,8 @@ pkg_pretend() {
 }
 
 src_configure() {
-	default
-
 	tc-export CC
+	default
 }
 
 src_compile() {