gentoo resync : 28.04.2019

8 files changed, 75 insertions, 41 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 259152464fd5..bcd881cfb5cc 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index d0e25809f0ce..8fdec2507e98 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,3 +1,4 @@
+AUX eduke32-20190419.7615-wad2map-buildfix.patch 539 BLAKE2B 92fe0ec1c1d126eee7f48b4c403194e8b375f28dc9581cb20b393ea4e7464938aacea760075e6c845d45edcf98df476bb3254026d3304f3c52a98f32cf7f7b00 SHA512 983f847af630456ae61dfa65a6fcd890a04e2b14722efd11bc25a3f9e3ac33b9bd5559b6a1e3927471a45196c417a1e17c0b2dd7f177c44b7aa81aa7e224fa92
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
 AUX log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
 AUX search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
@@ -8,6 +9,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20190304-7392.tar.xz 14730992 BLAKE2B f10702e820e72d03a6f909e3f908cc705877908fc5455aa2060deaed3ff485e26b8fef56fde89e30d066af4663e8eb7ccfa42e71c99a15d99326199c24edd04a SHA512 e63d31e406f2a62559ad6c88c3c54d64397319bf701e6fba0df31574ff124d8378239fc849d10af91544fcdcb437ab853b83222d0f753017fa8e94d4620d7dbf
-EBUILD eduke32-20190304.7392.ebuild 5914 BLAKE2B 0fc6329d7677e0dd658ecb70e4b373f298c39326c179eb05a5d9cde3fc88b96297c1603bcbb32268e15614e28960930f0decc0831f9fcf55e70c686a1b721779 SHA512 1b1e918f7dcffbfae470f1eed6e7e404ee6cedb18004d183099b3d60282900d4d6ddce29edaaacaa1cf467e0ae062620977b392bc03eb3a442f355cf4493a938
+DIST eduke32_src_20190419-7615.tar.xz 14740500 BLAKE2B 462a93789c0c096f85f889769ca3bf642c33cd997e1b2cfb821060aa2dbd0040b0dbd910d33da09e2be8b6610d62fbb06fed2dd62aeaa619fa23c17b6a538feb SHA512 ca496c0f6478cb246e0746de1ecf171e46762d65fdb6906c8174f610b8f52362d84c48e0f4095fe00a41e4c73cbb7298ec3446d4bc0be68ed0f9a52a768183fe
+EBUILD eduke32-20190419.7615.ebuild 5957 BLAKE2B 49af6fbf6756aec89f74bf6f9440ffaf1a8971e3fcaee05c3bcf6491401fd2a1f7000ac286d3bab3ccf13015b28d158bc6802ce3b2aeb0d3d33e3f4e8d843c32 SHA512 175743bbd23da4afb7558ded6d8c3db78a3867cd34484c5db45396b8669af3ffb934f3770a63d3a27971954094c5b435436cc1bd00df4a0141a3202beea96ac8
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20190304.7392.ebuild b/games-fps/eduke32/eduke32-20190419.7615.ebuild
index b4a97498c3e4..d70f5ef8c30e 100644
--- a/games-fps/eduke32/eduke32-20190304.7392.ebuild
+++ b/games-fps/eduke32/eduke32-20190419.7615.ebuild
@@ -78,6 +78,7 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/${P}-wad2map-buildfix.patch"
 	"${FILESDIR}/log-to-tmpdir.patch"
 	"${FILESDIR}/search-duke3d-path.patch"
 )
diff --git a/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch b/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
new file mode 100644
index 000000000000..611f7a9d1ee0
--- /dev/null
+++ b/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
@@ -0,0 +1,19 @@
+--- a/source/tools/src/wad2map.cpp	2019-04-08 08:29:24.000000000 +0200
++++ b/source/tools/src/wad2map.cpp	2019-04-20 15:07:38.684542190 +0200
+@@ -7,6 +7,7 @@
+ 
+ #include "compat.h"
+ #include "pragmas.h"
++#include "vfs.h"
+ 
+ #define MAXWADS 4096
+ #define MAXPOINTS 8192
+@@ -313,7 +314,7 @@
+         Bprintf("Could not find %s\n",scriptname);
+         exit(0);
+     }
+-    filpos = 0; fileng = filelength(filhandle);
++    filpos = 0; fileng = buildvfs_length(filhandle);
+     while (readline() != 0)
+     {
+         i = 0; j = 0; lasti = 0;
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 9902cb40968b..20c5e638ce2a 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,11 +1,14 @@
+AUX yamagi-quake2-addon-respect-flags-r2.patch 966 BLAKE2B 08c2259fbbbc45ea41e2472ff544f8a51082069f0c340c548694d26dafc8f7d86418deed928b8150f52115cf23c399f4886c90570185ff78fe7c6a9d5b6c5286 SHA512 4f5d0402f9b3c227363681bdd38cb098795b18589d2a44f3ab5d9682cf58d6315015c22747167298a63f1fcbca00109208894b1c35ac2e6e4dec3900e25e7780
 AUX yamagi-quake2-addon-respect-flags.patch 823 BLAKE2B 348115f8a35d61e9dc4a1121bb98cfe1c2d6925fc7fc3bb7965d1f10d8bc4958f222982892216ee312ec245c3e505c9e9b8c20c65539f24145af4355959a4542 SHA512 c570ea602d3d5fedc6defae5c6b8d99f079ea5562b9c864f896a97c01ca504dbbb669e9a43eb5757abca884ad39c7a2f685c3fb915d32bd8dd5ff22f6934a4fd
 AUX yamagi-quake2-respect-flags.patch 1209 BLAKE2B 757b7f1757a752871525ed397f53db8992292dde7a68fb22030ded806e64f4853ac1c2e75304afb2f88f1f2d36edc99758dee4fa6cbfe353fa5004aabb65b982 SHA512 abaa7041640556d1b7272fec820a987e02b4a7d466765a637ddc0ce39c38eafe95e46f91e5bdcf74030df2dff7674e96c8a49ca48b99400f74b85551e0d9a5c3
-AUX yamagi-quake2-zlib.patch 592 BLAKE2B 836093baf5f0a7554d07e8305dfb9fe83ece7069562d7c0d7941c241ba8442d02819234e5a4f89031e9d9b82ad5bdb85cdfd507bab5f3f1f9a53cec9ed948527 SHA512 cc0e0ee7807a4aa0edc540ccde8ee37f4550a34ee24efadb876d0defc08fb06d4d3be7c94e5ebf45247798b4d7d3b98184b0c93a6511fc7369f8ae1c5b4aa2d1
-DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
 DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
+DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
+DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
 DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
+DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
 DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a
-EBUILD yamagi-quake2-7.21-r1.ebuild 3617 BLAKE2B 548a194cc4272205742910b1d8c12c556662ff8f8518fa845c820ca7eef0fa11a1da749d88c22890b8e3f87a0d3bf7796677f080d3b1c313ff1107a5d254a87a SHA512 54537512dde14d87ccc79eeee5663ecd61ce0652e69f180331277c45b46a8f9ee8b6367d3baa1863ebc57d6af179d503f75ae8b0d97b895da570b3535f46ae99
+DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc
 EBUILD yamagi-quake2-7.30.ebuild 3511 BLAKE2B 60ab56562da9039fa4c025123a0e4e0a4967d7b10f3bcfd8264ab8d0f333c7591c87c144112ab8f7a641f657ea467a6991cb99945d9c9ba42834de4c0c49284d SHA512 e5e715a5dcfbdac444a483586598ddcc2e5591113a9e3d2518733839b5cc35cb33f2b239b0c341af7fecd36e52e26428541c7a0669a94d0c17ebcf8cb052d0f5
+EBUILD yamagi-quake2-7.40.ebuild 3506 BLAKE2B bcd0bfd72fe5d400340b30d68409d62ec56460e8ea294c602c3a9517d5a70a0b3c4aed25a5e580cebe3bbdbb4a3e389e66e363591466e206f786431062a30929 SHA512 7adc7b327244e9e4a409a03522830552d5f150d697f2e2c8169224916fb63aa4b8663f86f2d939d8f71e6ee4ace54cc9876284b5ee855acec9ea8aae36f0323a
 MISC metadata.xml 788 BLAKE2B 4cde6f9131f2ab9cf23094ef634b7c77608c34f783a54779ae4dff32724d4bd7982b8ca3edb1148819b8b193f319bbe0a75eda3dfdcd83680c6a3c164ce7eea7 SHA512 8dc5c8a0163f78c49aa9eec53740405aeffd1fff2ee5301a4300002f986484563169345a8a4dd255c7efac497aed5375f23878c9d86a380a931c88b80ab806ec
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
new file mode 100644
index 000000000000..bb800aeaf3c9
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
@@ -0,0 +1,33 @@
+--- quake2-xatrix-2.06.orig/Makefile	2019-02-05 10:56:06.000000000 +0300
++++ quake2-xatrix-2.06/Makefile	2019-04-08 01:24:04.124176498 +0300
+@@ -75,11 +75,11 @@
+ #
+ # -MMD to generate header dependencies.
+ ifeq ($(OSTYPE), Darwin)
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -fwrapv -arch i386 -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
+ 
+ # ----------
+@@ -107,11 +107,11 @@
+ 
+ # Base LDFLAGS.
+ ifeq ($(OSTYPE), Darwin)
+-LDFLAGS := -shared -arch i386 -arch x86_64
++LDFLAGS += -shared -arch i386 -arch x86_64
+ else ifeq ($(OSTYPE), Windows)
+-LDFLAGS := -shared -static-libgcc
++LDFLAGS += -shared -static-libgcc
+ else
+-LDFLAGS := -shared
++LDFLAGS += -shared
+ endif
+ 
+ # ----------
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
deleted file mode 100644
index 1de79c986907..000000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/383179
-
-Upstream removed OF macro definition:
-https://github.com/yquake2/yquake2/commit/716d72a295c9247b3c88ccd180bb7a517ed99e13
-
---- a/src/common/unzip/ioapi.h	2018-03-10 20:24:21.000000000 +0300
-+++ b/src/common/unzip/ioapi.h	2018-04-10 00:34:08.688675097 +0300
-@@ -120,6 +120,9 @@
- #define ZLIB_FILEFUNC_MODE_EXISTING (4)
- #define ZLIB_FILEFUNC_MODE_CREATE   (8)
- 
-+#ifdef _Z_OF
-+#define OF _Z_OF
-+#endif
- 
- #ifndef ZCALLBACK
-  #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild
index 843343c0acaf..5e8aa0b53d2d 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop eutils
 
-CTF_V=1.05
-ROGUE_V=2.04
-XATRIX_V=2.05
+CTF_V=1.06
+ROGUE_V=2.05
+XATRIX_V=2.06
 
 DESCRIPTION="Quake 2 engine focused on single player"
 HOMEPAGE="https://www.yamagi.org/quake2/"
@@ -19,16 +19,12 @@ SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated ogg openal +opengl rogue softrender xatrix"
+IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
 REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
 
-RDEPEND="sys-libs/zlib:0=
+COMMON_DEPEND="
 	client? (
 		media-libs/libsdl2[video]
-		ogg? (
-			media-libs/libogg
-			media-libs/libvorbis
-		)
 		openal? ( media-libs/openal )
 		!openal? ( media-libs/libsdl2[sound] )
 		opengl? (
@@ -37,26 +33,24 @@ RDEPEND="sys-libs/zlib:0=
 		)
 	)
 "
+RDEPEND="${COMMON_DEPEND}
+	client? ( openal? ( media-libs/openal ) )
+"
 
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}"
 
 S="${WORKDIR}/quake2-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-respect-flags.patch
-	"${FILESDIR}"/${PN}-zlib.patch
 )
-DOCS=( CHANGELOG CONTRIBUTE README.md )
+DOCS=( CHANGELOG README.md doc/. )
 
 mymake() {
 	emake \
 		VERBOSE=1 \
-		DLOPEN_OPENAL=no \
-		WITH_CDA=no \
 		WITH_SYSTEMWIDE=yes \
 		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_ZIP=yes \
-		WITH_OGG=$(usex ogg) \
 		WITH_OPENAL=$(usex openal) \
 		"$@"
 }
@@ -67,7 +61,7 @@ src_prepare() {
 		use ${addon} || continue
 
 		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
+		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch
 		popd >/dev/null || die
 	done