gentoo (valentine's day) resync : 14.02.2021

10 files changed, 18 insertions, 71 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index a25b2a7a122b..391d91556436 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/duke3d-demodata/Manifest b/games-fps/duke3d-demodata/Manifest
deleted file mode 100644
index e8875b3f6328..000000000000
--- a/games-fps/duke3d-demodata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST 3dduke13.zip 5924374 BLAKE2B 177329f04defdd2a2ab35a1926a321bbc8de023878ad6bec610669b5578cbe2f38bc0b03a37c0d0d2dcc99acf2b473ddf683b498b971b857b20964bcdbc7d7c8 SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65
-EBUILD duke3d-demodata-1.3.ebuild 1144 BLAKE2B ce67a72411176e04f1f0965e2b2165033370f80c1cb3a362db8c5919ea7d1954b0a5b21cca572e2ead479ec2eb7b60e261051806e8f76eef18297231393437fa SHA512 090109e0c30828d99745ca968a58f18953e4a9dab6756461dee523a2bf1c5aee966ba8a8fbfeda1d92199856f78869d7532d613365ede170c1ae380c8d28e24b
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild b/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
deleted file mode 100644
index 14a4c8aba39c..000000000000
--- a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit games
-
-DESCRIPTION="Duke Nukem 3D 1.3d shareware data"
-HOMEPAGE="http://www.3drealms.com/duke3d/"
-SRC_URI="https://dnr.duke4.net/dl/024fbc5/3dduke13.zip"
-
-LICENSE="DUKE3D"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="games-fps/eduke32"
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	rm LICENSE.TXT || die
-	mv DN3DSW13.SHR DN3DSW13.SHR.zip || die
-	unpack ./DN3DSW13.SHR.zip
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/duke3d
-
-	# convert to lowercase
-	find . \( -iname "*.CON" -o -iname "*.DMO" -o -iname "*.RTS" -o -iname "*.GRP" -o -iname "*.PCK" -o -iname "*.INI" \) \
-		-exec sh -c 'echo "${1}"
-	mv "${1}" "$(echo "${1}" | tr [:upper:] [:lower:])"' - {} \;
-
-	doins {defs,game,user}.con demo{1,2,3}.dmo duke.rts duke3d.grp modem.pck ultramid.ini
-
-	dodoc FILE_ID.DIZ README.DOC
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	einfo "Please note that many addons for Duke Nukem 3D require the registered version"
-	einfo "and will not work with this shareware version."
-	echo
-}
diff --git a/games-fps/duke3d-demodata/metadata.xml b/games-fps/duke3d-demodata/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-fps/duke3d-demodata/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index bc699a96ef39..bfcf2da0d7bf 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,5 @@
 AUX gzdoom-4.5.0-Introduce-the-BUILD_NONFREE-option.patch 1215 BLAKE2B b2b24d2c1eaff1b9c5de6d2fdd614fb3f6c21b676b1c56283bc3b376bbf31e29c6eed27112c03d8738564215824583338acbfa84289fe69cb78ab8ee613643b4 SHA512 55fecbdbda330ae0e95a3ac99f8780d37ca386704f115680204da5403ad380eec14559f0522f7d2b55e1340aeebb9ecd1cbc41fe61e519689e7bd2feed5745a1
 DIST gzdoom-4.5.0.tar.gz 12741814 BLAKE2B b214f36ffd1991da8d8cce3e82f0395d0ccae60755246856f5cf89aa6646ce139fc26d712e5e3f54791685318ede0ff124bd26ba900f9f5edb19b085f58dc6f5 SHA512 0b432a7cb7e99ee8d661be9d0578b9ead4087a6b4a4ffb43c5363e6eaa4e3acf682e71af98adf17663986d6dae02eea23856cbd13c42bcd92b9ffca4d727d15f
 DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
-EBUILD gzdoom-4.5.0.ebuild 2243 BLAKE2B 18cc0e0e8dc7e2fcf794cf3821154103d1a2176c266d298fa768dd842730311218c812f68497747efd493ad0ee40fc734848cb7371998ab4cc62d9bc0a5bc600 SHA512 0efc66911e83d3d732426929e81061b8d2984872f206f3350222b5b565b3567dc7640e630371c01b52386d7cca727b503f0373d65ae06303dab7448c14f9caeb
-MISC metadata.xml 818 BLAKE2B 5036a4b1f33c1fbe8dda683e35d5b0969bcf939eb2ecc1bb3a1b0c30efe2cc92db3405b31c04cc5416675517b6ed0f9fd0e1029dd81a8a4b53f894533e6bf571 SHA512 de0d5ad463c9dadb7cabf3919ba98d4d245e0d001be36890268b297a6727bb992cbb1785de5a3c9990ed92302fc1242c429b92f78083577140c23645b2a354de
+EBUILD gzdoom-4.5.0.ebuild 2196 BLAKE2B 915de421f5b481f388012a0691e98d2fda7dd69e83b516c1ff423f738f53a5ef8daf3d69f0f5ca5b41b0acd86d4d9bb9e162601d3ae3f9846efd32115358625e SHA512 81541486477c9ecb14408182658ebff6250120d67717ab0d0d9600394628967b53ed93d64ccb2079baebc7dcafea4bea8ec303e100b819dc18bd8e79549928b8
+MISC metadata.xml 749 BLAKE2B 31dc8aee9190f1a3ff9cdba8f633a277f4682c6f4341e775b4647f5456acc8cdad6f79ab95adb375b0f2ccf1236a6140c8121a97e8e5fc96c983dba9e0573af8 SHA512 89029eab8196aab0a096432df15d46e224309efeeda04528b6519d589d16dfb73108abf4044823c1c632c2e9e38389b2ed3096e7f9f3400cf8a5a7b34298e0c2
diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
index 60680a131e1c..a07fb6ae4bc3 100644
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.5.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug gtk gtk2 +non-free openmp"
+IUSE="debug gtk +non-free openmp"
 
 DEPEND="
 	app-arch/bzip2
@@ -23,10 +23,7 @@ DEPEND="
 	media-libs/zmusic
 	sys-libs/zlib
 	virtual/jpeg:0
-	gtk? (
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3 )
-	)"
+	gtk? ( x11-libs/gtk+:3 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${PN}-g${PV}"
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index 656eb066e47e..a805c66b7d18 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -14,7 +14,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
 		<flag name="non-free">Enable non-free components</flag>
 	</use>
 	<upstream>
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 1121d6a33ef9..7d4c8c4e0f3b 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -3,6 +3,7 @@ AUX 0.16-rogue-nan.patch 170 BLAKE2B 76beecbd38d07bad65595a049aea6802f7575d65e16
 AUX README-postinstall 3083 BLAKE2B 364510b4eb37b6623e8346c74743b27156f99938fc9726929500c4488fd9d8a54b45d762586bfb43996d27f8aab09b2cd2feda08cad2aba0be534f4b8ca303e0 SHA512 cc7441ce14117ea765a7df98b3de0370b251f444289fd8aaa03c97ea5b383d626088977bc30dfc7a30124dedce4796b5d6392dad7e3d203ee2257d71a9b49bfe
 AUX quake2-icculus-0.16.1-alsa.patch 4386 BLAKE2B f85c0332ee7ff5fec98dcc5762cf63733f8442e76864cbd844dc19426f14eb22b4d3fec7fea8592fc9fe95cb55193324cefb87076fefb254cb7773cd2423f567 SHA512 8bb9e4d6f551ebe3e6715e044453affd7edd749650791fca32b5286038e75a59685c7d47efce8ac7b9dff488e6c2952dfdc68807f3365d276afb4b7387ad5dbc
 AUX quake2-icculus-0.16.1-amd64.patch 534 BLAKE2B 8f3afa80b23784a6683762a94b651b5999a7570ae954c87e5bf963ea52bf1fbdb3150c22715b4d4711b31892e3d67ef01bdfbb3285338add10bcbba0aaa335c2 SHA512 03faf4b85aa176a267847196fb56204b6d02bde0ebef858a34edb3c87cb41e57636d9b6e5b3be44163e918cb4b3ff38299b2db9de90690179108ee77146b942d
+AUX quake2-icculus-0.16.1-fno-common.patch 389 BLAKE2B e8dc118ea7af1f76e4eb5cde68cba3cd858e26cdb67a2ca9d37a9dbdd476651a45041419fedde7726f3b9054d4936313136bb00bc319a49884a817e50a570daf SHA512 26d72187bd580e18f3eb7e235a3b3e2589968508cc2d3363c2c828f79b9aec8b03c4e23d47a79b988f276ea69d3bd012ab7b866b55c4c69f7f49a75dd41b3944
 AUX quake2-icculus-0.16.1-gcc41.patch 292 BLAKE2B 393df8fbd236fb3eb509fa640c650144e734f15baf3b1f985ca0a0d81810e227e87b4a19ceb5db95067b40370ce7dab1e641f48a9ecd00d7f0bcaa3726f9bc56 SHA512 87193f69670e7cd6573bd4ff550202fda2702a5d7dfadb3af31f673b8910958ec3718e0d7ae558666c6a6921c43d543626dc8eaa0e3822345f33aecdbdf7ee50
 AUX quake2-icculus-0.16.1-gentoo-paths.patch 6419 BLAKE2B ed3fe4cd3f812b6dda63bd017eca74a57dafe0ae56a877a30e814c486b4378a04a7c0525f71a13804f653febec5b6ff855be5cea3b8c4a4ca9bccf0e2d441e4f SHA512 91a83f82b013245256db386a212c044bfbd637e1685e532d2ca75959e6870e65f3763f6d83c85db184d46a0ed77b5d4a53c4f7421b55b82a4709bdfc70d0f307
 AUX quake2-icculus-0.16.1-gnusource.patch 316 BLAKE2B 344afcbda64c0a52e06a91cbcfd4a53f9badf8c0d25ac384525e84eff164a1f103df9289d5a691b413e5e1a1a2749872841ad18ff4e3517465fb1c1cd729edce SHA512 0e1bed0bfd7ab31ad574a17534a49e89b44ef99308b90d9a30726f7d39ec4606514643e064968a5d9e53dd7a20394d5a27162fba06f37713ee3bc1e65f31b76b
@@ -16,5 +17,5 @@ DIST maxpak.pak 3282742 BLAKE2B 3ad4dd5aade5747b100a24499bae0f0d7fd5cc610e4671c1
 DIST quake2-r0.16.1.tar.gz 1525384 BLAKE2B b95db08ed3799d2788a20d24f63ea3a84d7ff4b581ee5f01dc5d588a1d5af50d52586a04ca28d9942e953d028e140112737432e499edcebf999085a29c63fcfb SHA512 63e8fa10446698b1f1cbd20b4bbfeec75d7620cb6454bb90b853cd2a3d6cd9040041a164666a5e015c3a8289423127f9164b500f57793505f6e4671dec932cf2
 DIST roguesrc320.shar.Z 626769 BLAKE2B f6d79630ee41e834ad07907f886766fdc9fd99152c2a1964629d2c74de259b9a232f691e5e3c4ad26ff3239d127f06d20878422dd7c1b896591db7c732a41ef7 SHA512 330db4966b758b8e363eb8d699b30ce5ec7d9fa581936288e7267000d0815996388adebc0206a8903734cdc1c5658616b15518a2bf888ad9e6059f8155960141
 DIST xatrixsrc320.shar.Z 455917 BLAKE2B 646801fad3c7eaac4957a971f507b13fff0ea6ae0423cb7fe8e8276666c4f89165384e2e2148e828b692533f9f582b64db849efe8d858e51026b9fb847282101 SHA512 6723440d3cfdaf7f9b260d5777d9823937a4c3ee800c8c204e8a5c3d29f2b37f6bdc7c0786025a19d040b5692aa54b99b9db2dc121bc0ca2b53c8763b4ab4dfa
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5197 BLAKE2B 0ecece40469fbca27259502d3a2623d9fee73257b8c679e86ab78e3998f059cd23e1e9d3b45a2610420f1c9575f97d81de8d0340cfec4f601f18f0f17cbfc1d6 SHA512 eb648f823a1798427537ad48d0fdf8602ad3ce53391195ff42df21353464df9e575281ba348b4c33352782d07794140db4f8eb208313fb439d23461097714c96
+EBUILD quake2-icculus-0.16.1-r1.ebuild 5237 BLAKE2B 0e99364cb00cfcfcc7a3a9089f9d4318931c1a69543139587ebb2de4accd75f560917c8ba668c04a52dedab7024cf7830511e2e434ead016b08703d2d56c6fd9 SHA512 fa8088fc242db69f2631551be45554f868622302e4dbcf5e23f0185f2589c23c2cefc4a264b944d3063004b786fe21f1f45d9d0f67420cc244eae8710870a99b
 MISC metadata.xml 612 BLAKE2B 0e452fab96a1eaa0cdbb5113cd957576e968eef662103403cef968ae05b909a3d3bc25939dfbb4d36a191d18853e1af0d342ce37cbd6a30defc4fb5ac9e4285c SHA512 0c143ca3470f6b33b35d660e3ad55678356e7139cab94589d18947617988f63f8c69485167d9d8c3e21ef231b0521f993a5063df26ae3e5e5cf4c64bee30d45b
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-fno-common.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-fno-common.patch
new file mode 100644
index 000000000000..8392ec63b784
--- /dev/null
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-fno-common.patch
@@ -0,0 +1,10 @@
+--- a/src/client/client.h
++++ b/src/client/client.h
+@@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ #ifdef QMAX
+ #define random()	((rand () & 0x7fff) / ((float)0x7fff))
+ #define crandom()	(2.0 * (random() - 0.5))
+-vec3_t clientOrg; //lerped org of client for server->client side effects
+ 
+ void vectoangles2 (vec3_t value1, vec3_t angles);
+ 
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
index 13756e436dc6..5a5e6b994311 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
@@ -70,7 +70,8 @@ src_prepare() {
 		"${FILESDIR}"/${P}-x11_soft.patch \
 		"${FILESDIR}"/${P}-x11_mouse.patch \
 		"${FILESDIR}"/${P}-alsa.patch \
-		"${FILESDIR}"/${P}-ia64.patch
+		"${FILESDIR}"/${P}-ia64.patch \
+		"${FILESDIR}"/${P}-fno-common.patch
 
 	if use xatrix ; then
 		epatch "${FILESDIR}/${P}"-gcc41.patch