gentoo resync : 28.07.2021

7 files changed, 6 insertions, 207 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 6af12cd53498..4a73d2ef4082 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index dae3bc9eab55..4bcbae81c21a 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,8 +1,7 @@
 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 gzdoom-4.6.0.tar.gz 13921655 BLAKE2B acf3273d53f24a1d65a1d7cd1614589699926211370e84570062464d989adc7a0427423ea3444db37a9c6393d3fee971db84c9a2c4346b5677906dd89d926af4 SHA512 d7c1f5155c1262e79c812983cac3856b917f5861f9ead0b9a307040f99802a489c3f836ed23baae245122971fa4fed872202131c8c8cf17724cf4e9b2b4efea5
-DIST widepix-9273804.tar.gz 1327209 BLAKE2B 9ceb6470fc09600351d62c78b36652fa146f0aa7a0eadc85bcee84d72f49d2360f46d26001b8f0c22ef46abb5d15c9fb4946349cd600bf225fa9ab99be034832 SHA512 8cb6450c315efeff5b0af5a100e8be25a2add1512f236115011de427fd3ca66bf70fba015b6437c1157e97b95cd059a3bad148993677223fea5344a8e7a34060
+DIST gzdoom-4.6.1.tar.gz 13937864 BLAKE2B 59ea057b42058944566a66c21f441752bd014235ac4644f9b50182673856fedc33414cbe12505a294842e46c93faaf120d844ccd49fb9afeede67640feab3764 SHA512 cec64f4f6a3be3693b35d716a44930cfa9fd10b794b380cf0ea624e7901f78f3e5211b17a0905b65de367fa62046cd6ebd099f5300c7f49e1c020faaae15dd41
 DIST widepix-d458411.tar.gz 2542783 BLAKE2B 622355d61c102cf71f724ed709b80ba6ba652905fb806bfd6dad6a0944eabd3bac71c7fdad17354af17493f64d6418e93eef37c032e85615dffa27f9e8faa97f SHA512 fe8a243e2dbe6330121bf139e310baf677ec4803d6b0ecd24a93792a2f7071ba739b1c038ca7aa7eeafcc83bf57c8a009189a90e3115305967ba23b675c96543
-EBUILD gzdoom-4.5.0.ebuild 2196 BLAKE2B 915de421f5b481f388012a0691e98d2fda7dd69e83b516c1ff423f738f53a5ef8daf3d69f0f5ca5b41b0acd86d4d9bb9e162601d3ae3f9846efd32115358625e SHA512 81541486477c9ecb14408182658ebff6250120d67717ab0d0d9600394628967b53ed93d64ccb2079baebc7dcafea4bea8ec303e100b819dc18bd8e79549928b8
 EBUILD gzdoom-4.6.0.ebuild 2229 BLAKE2B 6f0f0014c4c6736aa39b99ec4b34b1c406beeb0b5ef13f3dec728e4b3958bc257c564f9264b6e7a03f7e61e6572781d88b460a2901aa9faad36682b9d2dbed22 SHA512 c9d266fc0a8026b848f31fdf97ac91646affb075209ac9c83c11b60e4688d7ef4923dc523bfb72972a3ea35eeecafdbc1bc59bff4e423b49734343a224e66258
+EBUILD gzdoom-4.6.1.ebuild 2229 BLAKE2B 6f0f0014c4c6736aa39b99ec4b34b1c406beeb0b5ef13f3dec728e4b3958bc257c564f9264b6e7a03f7e61e6572781d88b460a2901aa9faad36682b9d2dbed22 SHA512 c9d266fc0a8026b848f31fdf97ac91646affb075209ac9c83c11b60e4688d7ef4923dc523bfb72972a3ea35eeecafdbc1bc59bff4e423b49734343a224e66258
 MISC metadata.xml 779 BLAKE2B cb0548bb6c9b5c7bccca5e56e76d7d86c6977d371c1c046e9cabdc9e0e0b6f2885c3a6b429e7ae55f965959d876d57ba63c299cc4cb09e668a81bf73a817e845 SHA512 30d36b491fb892a452ce739db6739f98cb593ade08df268837114a9c797f0fe0816b1fac1f7d9a4e131358fbab75a047c26aec1d1db50d30821be02af39be250
diff --git a/games-fps/gzdoom/gzdoom-4.5.0.ebuild b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
index a07fb6ae4bc3..7d3705e66a45 100644
--- a/games-fps/gzdoom/gzdoom-4.5.0.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.6.1.ebuild
@@ -5,10 +5,11 @@ EAPI=7
 
 inherit cmake desktop xdg flag-o-matic
 
+WIDEPIX_COMMIT="d458411db4795dfd1420cf1c6456f6d2999b3bad"
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
 SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz
-	non-free? ( https://github.com/nashmuhandes/WidePix/archive/92738042ca3a37f28153a09809d80a7d61090532.tar.gz -> widepix-9273804.tar.gz )"
+	non-free? ( https://github.com/nashmuhandes/WidePix/archive/${WIDEPIX_COMMIT}.tar.gz -> widepix-${WIDEPIX_COMMIT:0:7}.tar.gz )"
 
 LICENSE="Apache-2.0 BSD BZIP2 GPL-3 LGPL-2.1+ LGPL-3 MIT
 	non-free? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist WidePix )"
@@ -29,7 +30,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-g${PV}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
+	"${FILESDIR}/${PN}-4.5.0-Introduce-the-BUILD_NONFREE-option.patch"
 )
 
 src_prepare() {
@@ -38,7 +39,7 @@ src_prepare() {
 	if ! use non-free ; then
 		rm -rf wadsrc_bm wadsrc_extra wadsrc_widescreen || die
 	else
-		mv "${WORKDIR}/WidePix-92738042ca3a37f28153a09809d80a7d61090532/filter" wadsrc_widescreen/static/ || die
+		mv "${WORKDIR}/WidePix-${WIDEPIX_COMMIT}/filter" wadsrc_widescreen/static/ || die
 	fi
 
 	cmake_src_prepare
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index b3a0d873f9a2..9d51f69ff170 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,9 +1,5 @@
-AUX quakeforge-0.7.2_p20210601-png-stub.patch 230 BLAKE2B fb1185bcbb377186bcacff8156dd4f5724882057b75af0cc42745471fa68fc30b672f589465d05603ded336b5370f9220aa6fb23546923317ca512056f5a0077 SHA512 cd5e88b23042a6462996d88034770211a59018e9ea81a498bbe4e5abd2aa4c01847c607bcd9670f6e1748bef1c4508668ed2b6f3b3b1690b392e9f9a9c93660e
-AUX quakeforge-0.7.2_p20210601-skipped-tests.patch 473 BLAKE2B a5ee046cd5b351741afe1953ddfc039df415d46d6d4f3085555466d052b0b61f58ce2684c8ea3b94817e754a12f5a423b0c98951daaa998970a89f89230a9952 SHA512 8d2f0b5f78b56e564fbf7b8602ded77f2403b0ce19d43c981e5f71d9fa7555529953447241effa209609480822e8a30e69a53b66b53618391887658435dd82aa
 AUX quakeforge-0.7.2_p20210722-skipped-tests.patch 491 BLAKE2B e9124ae690ee78825b921655f0ad297386a46b66151bcb7f0e9eff2bfc1a3f533b1b0beebdc863399519a104c098d4d2387fefa9a69d0dcfef7b442a7a5d73be SHA512 72e4a8f04cbc46f066fc3543a069a9d94a275c8f1a67028d90791c4c21d92ddd5e912b724c916ddee712b736fc098c747705f11619da2fc8162a8ad818c3b362
-DIST quakeforge-0.7.2_p20210601.tar.gz 3140318 BLAKE2B 4359c2e92a52bc314bca82dcf6f90aebe2fb7260e9c2e1444d3ca239c53adf1ca912093c5c0ccacb4cf9375e199c244f1b8787196c2f8f3bbc7eb00962b0d8da SHA512 a27e4317b3c01f129f1f32209c02b86abf7148c3e0b2e39306324d6b4758d9165883c169ebfde03fc7350b499088cd685991483911b5ae57ccb9b80baaefa733
 DIST quakeforge-0.7.2_p20210722.tar.gz 3157720 BLAKE2B 9757ed10a5f78d9b5f09029c149c3fc121daf4bef2cc5a1687d00d2d85c36065663407318478c801a4ae62dee03713e35009c91f590d1686678756da1aab7824 SHA512 1c3778ff73cffbb5cadc33e0b544935f822a0f983ed67945dbbd7f6624752b68e3da46f1836f38f22cbae9a9ac191eeacc256ca5da540c5448dfc1fb56b68aa4
-EBUILD quakeforge-0.7.2_p20210601.ebuild 4879 BLAKE2B dd2ce56a125af5b069e16e159fb9d6a3c413263983d4ce1a730f6e2a53979d9247b5d1b8f953a53ddb7711e7c09853000632aefd121c74340f8ef03621c6ae8c SHA512 17da66fdac3ced92859908bc52878594661970e0fb03492ca720008c54f1a81e068f92a642b8b0b8749b65c76438799b92e6095102b4c6354784d1857da7bd59
 EBUILD quakeforge-0.7.2_p20210722.ebuild 4386 BLAKE2B 268b9ede927ffd7d89b3d2cd6167e03a2666c33dd9def759bd537324cfc9dd462188a1df2c53ca3ed302b1e47c419153819a942bd554c6355bfe17d5814574b9 SHA512 f6808224222281798a853a83a455e77672185fd719c24ec680fc6ae5418db13ae693d2727ceea413bb5e62636c316708fbd4490b2135a9fab543196945548678
 EBUILD quakeforge-9999.ebuild 4363 BLAKE2B 239332acaa1be6a9d7424c905838594e7472415aee36b9b22f669ab7c8028e0fce6367f84f10a2eda1c7794cb91a5ee2ca92573a91ef113c473073a101f27a02 SHA512 8ce407d46a3a19e3a78be764b5c5bd98d3d018163a00eba5223a3a938ab7e9967cec054a00965b4bf1df225fe0a63141367464938a95e88be58cbe288d16e239
 MISC metadata.xml 1905 BLAKE2B 5c3af0de1b06ea4c5ff458d3859d10fc314361fca005e47da1f932e8aa9828dda8dff1fe3226a7ba7db03cc03b3da36854adff2eb9157a2014260fdeec46e4e0 SHA512 85ef7143bfb6fd8efaeb444cd66e561f6d2a4b787cc2d25fbae593cfdbc3ce7dcc899939bcd8489edd8506997f26023a87f8c128b66d2fb53f14082178dcd7c3
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
deleted file mode 100644
index d32fab57b7e1..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-png-stub.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix stub definition for USE=-png
-https://github.com/quakeforge/quakeforge/issues/14
---- a/libs/image/png.c
-+++ b/libs/image/png.c
-@@ -320,3 +320,3 @@
- VISIBLE tex_t *
--LoadPNG (QFile *infile)
-+LoadPNG (QFile *infile, int load)
- {
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch b/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
deleted file mode 100644
index 5b25af47ac26..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.7.2_p20210601-skipped-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-These are only failing at high precision and
-should not affect normal usage.
-  quat/simd: fails with -mavx
-      sebvf: random failure, sometimes pass
---- a/libs/util/test/Makemodule.am
-+++ b/libs/util/test/Makemodule.am
-@@ -15,8 +15,5 @@
- 	libs/util/test/test-qfs \
--	libs/util/test/test-quat \
- 	libs/util/test/test-seb \
--	libs/util/test/test-sebvf \
- 	libs/util/test/test-seg \
- 	libs/util/test/test-set \
--	libs/util/test/test-simd \
- 	libs/util/test/test-txtbuffer \
diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
deleted file mode 100644
index 504324b8b2b3..000000000000
--- a/games-fps/quakeforge/quakeforge-0.7.2_p20210601.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-MY_COMMIT="53b553e89234306dc0111b107308fb42998e522b"
-
-DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
-HOMEPAGE="http://www.quakeforge.net/"
-SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa +client custom-cflags debug doc flac ipv6 jack ncurses oss png sdl vorbis wildmidi zlib"
-
-RDEPEND="
-	client? (
-		media-libs/libsamplerate
-		net-misc/curl
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		alsa? ( media-libs/alsa-lib )
-		flac? ( media-libs/flac )
-		jack? ( virtual/jack )
-		sdl? ( media-libs/libsdl[sound] )
-		vorbis? ( media-libs/libvorbis )
-		wildmidi? ( media-sound/wildmidi )
-	)
-	ncurses? ( sys-libs/ncurses:= )
-	png? ( media-libs/libpng:= )
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="
-	${RDEPEND}
-	client? (
-		virtual/opengl
-		x11-base/xorg-proto
-	)"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		media-gfx/transfig
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-png-stub.patch
-	"${FILESDIR}"/${P}-skipped-tests.patch
-)
-
-src_prepare() {
-	default
-
-	echo ${PV} > .tarball-version || die
-
-	eautoreconf
-}
-
-src_configure() {
-	if ! use custom-cflags; then
-		# package does a lot of fragile micro-optimizations
-		strip-flags
-
-		# nq-x11 segfaults starting a new game with -O2+ and gcc11
-		# https://github.com/quakeforge/quakeforge/issues/12
-		tc-is-gcc && [[ $(gcc-major-version) -ge 11 ]] && replace-flags '-O[2-9]*' -Os
-	fi
-
-	append-ldflags -Wl,-z,noexecstack
-
-	qf_client() {
-		echo $(usex client $(use_enable ${1}) --disable-${1})
-	}
-
-	local econfargs=(
-		$(qf_client alsa)
-		$(qf_client flac)
-		$(qf_client jack)
-		$(qf_client oss)
-		$(qf_client sdl)
-		$(qf_client vorbis)
-		# vulkan is work-in-progress and currently needs <=vulkan-headers-1.2.169
-		# https://github.com/quakeforge/quakeforge/issues/13
-		--disable-vulkan # $(qf_client vulkan)
-		$(qf_client wildmidi)
-		$(use_enable client sound)
-		$(use_enable client vidmode)
-		$(use_enable debug)
-		$(use_enable ncurses curses)
-		$(use_enable png)
-		$(use_enable zlib)
-		$(use_with client x)
-		$(use_with ipv6)
-		--disable-Werror
-		--disable-dga
-		--disable-static
-		--enable-xdg
-		# non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
-		--with-clients=$(usex client x11 '')
-		--with-cpp="$(tc-getCPP) -x c %u %d %s -o %o %i" # see config.d/qfcc.m4
-		--with-global-cfg="${EPREFIX}"/etc/quakeforge.conf
-		--with-sharepath="${EPREFIX}"/usr/share/quake1
-	)
-
-	# Jack audio is special (need a different method to enable), and an
-	# issue prevents it from being usable without another audio output.
-	# https://github.com/quakeforge/quakeforge/issues/16
-	# Given hopefully temporary, not relying on REQUIRED_USE.
-	use alsa || use oss || use sdl || econfargs+=( --enable-oss )
-
-	econf "${econfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doxygen/html/. )
-
-	emake -j1 DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -delete || die
-
-	local DISABLE_AUTOFORMATTING="yes"
-	local DOC_CONTENTS=\
-"Before you can play (using nq-x11 or qw-client-x11), you must ensure
-that ${PN} can find your Quake pak0.pak (and optionally pak1.pak)
-at one of these locations with lowercase filenames:
-	- '~/.local/share/${PN}/id1/pak0.pak'
-	- '${EPREFIX}/usr/share/quake1/id1/pak0.pak'
-
-You can add them yourself or use either of:
-	- games-fps/quake1-data: install from a Quake CD-ROM
-	- games-fps/quake1-demodata: pak0.pak only (limited demo)
-
-Key binds notes:
-	Defaults ('imt_mod' table) expect you to set key binds manually in:
-	- '~/.local/share/${PN}/id1/autoexec.cfg' (or '${EPREFIX}/usr/share/quake1/id1')
-	For the in-game bind menu to be usable ('imt_0' table), bring up the
-	console with backtick \`, and run 'imt imt_0' (only needed once).
-	A mouse-grab bind ('toggle in_grab') and using freelook is recommended.
-
-Audio/Video notes:
-	Can add settings in:
-	- '~/.config/${PN}/${PN}.conf' (or '${EPREFIX}/etc/${PN}.conf')
-	Examples:
-	- set vid_width 800
-	- set vid_height 600
-	- set snd_output sdl (or alsa, oss)
-	- setrom vid_render gl (or sw for software rendering)
-	- setrom snd_render default (specially set jack here for JACK audio)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -le 0.7.2-r1; then
-		elog "Migration may be needed for ${PN}'s home paths, now using:"
-		elog "    ~/.${PN}rc -> ~/.config/${PN}/${PN}.conf"
-		elog "    ~/.${PN}/  -> ~/.local/share/${PN}/"
-		elog "Also, nq-sdl / qw-client-sdl are no longer available (use -x11 instead)."
-	fi
-}