gentoo resync : 25.04.2020

4 files changed, 56 insertions, 18 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index b84eb1872cb1..21dde0356cf4 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index a45279d4fb38..23030a2e574b 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,14 +1,16 @@
 AUX yamagi-quake2-7.42-fno-common.patch 2725 BLAKE2B 231b4e9ee57e3885c78e1469a7f729e430f03485535b81af315c971d632a6b7d8bd0a28f8c552e69afaa06fc5105f6ae757bfac327e23aa91c3299f8a5136000 SHA512 107a157bba10ad82bae0a767e00dc445c45b2b3acb5123fb81ea9b38ae4ff361dc38d575ba3dcc0960e46ee29fe4f97b6b2d580947e54f056705c8e144f027bb
 AUX yamagi-quake2-addon-respect-flags-r2.patch 966 BLAKE2B 08c2259fbbbc45ea41e2472ff544f8a51082069f0c340c548694d26dafc8f7d86418deed928b8150f52115cf23c399f4886c90570185ff78fe7c6a9d5b6c5286 SHA512 4f5d0402f9b3c227363681bdd38cb098795b18589d2a44f3ab5d9682cf58d6315015c22747167298a63f1fcbca00109208894b1c35ac2e6e4dec3900e25e7780
 AUX yamagi-quake2-addon-respect-flags-r3.patch 996 BLAKE2B 7d3c6f13b4973db9d63e15de469953699df48668d5bc5d69607f090f6bac57ea4119174f6de3306f1fc8cd2acdbfb90b8808eebfa7af7e4b4b5996d3b2546d93 SHA512 7136ccc0d666ef14f040e7ca19506dd0be5debe21f0eb819c74851e80445187f98ae60f76d8038d2ead40b1ef0f56643f769d6f9e4241e2b175ea11a19a676da
+AUX yamagi-quake2-addon-respect-flags-r4.patch 901 BLAKE2B 3aea1c44231122cc95e5f17ae3051111a77a688abf1553470725266a7619ee810878362abbf2b99371e023bee7975542a63bf7fe93153fed95a60ac77285a9d3 SHA512 ede9fcc0db375defbfe8e79105ca330d8ed46498f67a858b923f337eef558ac4dc9f54b8d3de895e7269750009f26c1643c4e3c26362c2f2be751005ec42d855
 AUX yamagi-quake2-respect-flags.patch 1209 BLAKE2B 757b7f1757a752871525ed397f53db8992292dde7a68fb22030ded806e64f4853ac1c2e75304afb2f88f1f2d36edc99758dee4fa6cbfe353fa5004aabb65b982 SHA512 abaa7041640556d1b7272fec820a987e02b4a7d466765a637ddc0ce39c38eafe95e46f91e5bdcf74030df2dff7674e96c8a49ca48b99400f74b85551e0d9a5c3
-DIST quake2-7.41.tar.xz 1978952 BLAKE2B 9d3626f102b652c443caea294f7f66dc46869612b64d16c5f2e9b7f28a83800a0653450f8fc44ebaa83e01ddfaf2b2cd5dd9c6feb8001b5cabd7df32171e035b SHA512 fd2c991274415eb38cf3deb7562f7c51c7f8e935cf7215eba7e8ae088f25cddf95e86221fcbbb5fcc8bd97e264b147951bf5f4aecb8ee54973d46af7ef39d3af
 DIST quake2-7.42.tar.xz 1987332 BLAKE2B 63ced75746eb031faf949c6b094ec607076f481b8d97eca242f9bf6fd6325afc8dfb5f98fe4f8ba5c5e87b721392f613031fc204b775634fc5292a26fef1d76c SHA512 0f51204fcf14ecb3f1f654e6ee19207836cf4642022569ef202bc12f312f76dbd43695aa4d9f9fb70c8b023f42d1a8fcec25f472a32175ebb0a308211fa40cc0
+DIST quake2-7.43.tar.xz 1989812 BLAKE2B dbce9e3b65a63637726dda375f0fc64193529a3c1744643290778ee8f1a0eff3067f96dd3e76fa4d138cfbb5e9237f7517f608277e4f5b21729473849b7c8ac3 SHA512 c728609e277330b39fc423d66bbd098e360e7fc8c54500fa5accbc4aaeb9145a00c8ff8be67ce8f36047dbe6d98480bdbe1f330da5b0037517607ada8a63e4b8
 DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
-DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
+DIST quake2-ctf-1.07.tar.xz 135880 BLAKE2B 7501d5db676cbc7b523313bf4e5d572cc8711efd09e2390d6aa6980d45bc682e7f137581b8a9a8d4b491de8f8ed7dd1cb32a66c9ed2cc456e114f672cedf2a1c SHA512 de2ab94fc7bb43327170f6aefbaf811e7a0071da2e5c4602354854e46e4c8cfc687a6300e7162c8f1be2f0b42cf2d3edc255c2f44fb0e39adc873a521197a316
 DIST quake2-rogue-2.06.tar.xz 243872 BLAKE2B fa289bb9ecd988dd77dd4d581212fc1c2f964371109123ed77ea0a740b65bc117d787c144d9f246d091df3ff19f1c9f5ed42571cd2d450061de63f032cc3c1d6 SHA512 4f8646f6b6cc2b522291e89f63a6d0273353e27bcafed6fcd5c2e509e938ab76504bfe9e92d398c8cee708af64ffbb7d81e98ea0df1e13ba593db4dff8ddfcf6
-DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc
+DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789
 DIST quake2-xatrix-2.07.tar.xz 192404 BLAKE2B 54772f1158af82211a5c925676e1399bd9debfa8f336a566dd7c22c6f50eb488030c871a7952b9eb00a7a8498560aed332dfd388074bb5a733ed5e979d59d9dc SHA512 72400afa98faf38559dfbc6dcfd01a16902adc782065bc1bbae4d773b5c139543d79f465195db72f0dbaf33999c667c65fd3582a8029db5b50ea5295d278b2a7
-EBUILD yamagi-quake2-7.41.ebuild 3506 BLAKE2B bcd0bfd72fe5d400340b30d68409d62ec56460e8ea294c602c3a9517d5a70a0b3c4aed25a5e580cebe3bbdbb4a3e389e66e363591466e206f786431062a30929 SHA512 7adc7b327244e9e4a409a03522830552d5f150d697f2e2c8169224916fb63aa4b8663f86f2d939d8f71e6ee4ace54cc9876284b5ee855acec9ea8aae36f0323a
+DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9
 EBUILD yamagi-quake2-7.42.ebuild 3636 BLAKE2B 50b15d9a17697e8191fd9ead2575162536b9c08f56d098a6e45c41093a9c20804cce9e2f0a09e4a623edb119d675d161c3e4141b07523347592ca4fc3cc6088f SHA512 e9707a7b71e4937d9a717c02005e76e9a10bddad7860983b96df5d3e17ea036196125984f9c2900df71fbc8adf6d8f9779085b9a5c9b77f7810351e7da857443
+EBUILD yamagi-quake2-7.43.ebuild 3550 BLAKE2B bdd1943a6d914525462edfc92d57ba9420c8a356c09036cc267f2eeaf7f1705d1893e8d3f9ab0e62690d30298297ae7667114a900fc1a28e9ee219b241fd19ee SHA512 4db94adbbe9521d39dfe6dc96274786684251c1799f058afcf4d813415a94bf543d92b12bcf3bbdb301b4be67b20a57c80fa52ef6a2bea62b92c1afd8baa3fd3
 MISC metadata.xml 902 BLAKE2B 5431861cde41e065d91af512cbac3e1f41c8c28dc253d54124eef822a38a021be9e9fd6b000bf6571ae242fc87009ea2a4c5045a568adaa37a99302eb1fe8e7f SHA512 7303da58e949237b5d1c6a6fe83c597c4e5dd955ce07368876ee03114cb124cedc44c8d4c51bb4e530c3194ed7041c694167a4495a698fb3b8a6beaf4b8b6f77
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r4.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r4.patch
new file mode 100644
index 000000000000..86c794b99e5e
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r4.patch
@@ -0,0 +1,33 @@
+--- a/Makefile	2020-02-24 19:01:11.000000000 +0300
++++ b/Makefile	2020-03-08 03:07:40.480074095 +0300
+@@ -66,11 +66,11 @@ endif
+ #
+ # -MMD to generate header dependencies.
+ ifeq ($(OSTYPE), Darwin)
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -fwrapv -arch x86_64
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -fwrapv -arch x86_64
+ else
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -MMD -fwrapv
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -MMD -fwrapv
+ endif
+ 
+ # ----------
+@@ -93,11 +93,11 @@ endif
+ 
+ # Base LDFLAGS.
+ ifeq ($(OSTYPE), Darwin)
+-LDFLAGS := -shared -arch x86_64
++LDFLAGS += -shared -arch x86_64
+ else ifeq ($(OSTYPE), Windows)
+-LDFLAGS := -shared -static-libgcc
++LDFLAGS += -shared -static-libgcc
+ else
+-LDFLAGS := -shared -lm
++LDFLAGS += -shared -lm
+ endif
+ 
+ # ----------
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
index 5e8aa0b53d2d..e9db574e8b51 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit desktop eutils
 
-CTF_V=1.06
-ROGUE_V=2.05
-XATRIX_V=2.06
+CTF_V="1.07"
+ROGUE_V="2.07"
+XATRIX_V="2.08"
 
 DESCRIPTION="Quake 2 engine focused on single player"
 HOMEPAGE="https://www.yamagi.org/quake2/"
@@ -15,17 +15,20 @@ SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
 	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
 	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
 	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
+S="${WORKDIR}/quake2-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
-REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl softrender ) )
+"
 
-COMMON_DEPEND="
+DEPEND="
 	client? (
 		media-libs/libsdl2[video]
-		openal? ( media-libs/openal )
 		!openal? ( media-libs/libsdl2[sound] )
 		opengl? (
 			media-libs/libsdl2[opengl]
@@ -33,18 +36,14 @@ COMMON_DEPEND="
 		)
 	)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	client? ( openal? ( media-libs/openal ) )
 "
 
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-respect-flags.patch
 )
-DOCS=( CHANGELOG README.md doc/. )
+DOCS=( CHANGELOG README.md doc )
 
 mymake() {
 	emake \
@@ -61,7 +60,11 @@ src_prepare() {
 		use ${addon} || continue
 
 		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch
+		if [[ ${addon} = ctf ]]; then
+			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r4.patch
+		else
+			eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r3.patch
+		fi
 		popd >/dev/null || die
 	done