gentoo auto-resync : 13:11:2023 - 10:28:51

4 files changed, 169 insertions, 2 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 4b996dae5fd5..db6b5b05ee34 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
index 771efddfef40..c0ab82f18eda 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1,5 +1,6 @@
 AUX quakeforge-0.7.2_p20210722-skipped-tests.patch 491 BLAKE2B e9124ae690ee78825b921655f0ad297386a46b66151bcb7f0e9eff2bfc1a3f533b1b0beebdc863399519a104c098d4d2387fefa9a69d0dcfef7b442a7a5d73be SHA512 72e4a8f04cbc46f066fc3543a069a9d94a275c8f1a67028d90791c4c21d92ddd5e912b724c916ddee712b736fc098c747705f11619da2fc8162a8ad818c3b362
 DIST quakeforge-0.7.2_p20210722.tar.gz 3157720 BLAKE2B 9757ed10a5f78d9b5f09029c149c3fc121daf4bef2cc5a1687d00d2d85c36065663407318478c801a4ae62dee03713e35009c91f590d1686678756da1aab7824 SHA512 1c3778ff73cffbb5cadc33e0b544935f822a0f983ed67945dbbd7f6624752b68e3da46f1836f38f22cbae9a9ac191eeacc256ca5da540c5448dfc1fb56b68aa4
 EBUILD quakeforge-0.7.2_p20210722-r1.ebuild 4453 BLAKE2B 07f460a28afdfbed78dd988fc943eeb53948a2d58d30d15df8ddd89e990153f6442fd8536f68df2973ebc89ad2478d2e7a80a54ce0848faf2bb6e68b1ad470a3 SHA512 2baa23c46e72152ef58062af6f4f777e73a71dc892832f3b3e0e469ae0fbdcfffc809571964d0617c301b50911496795b3f56ded1b1169c4570c5a461536a8d8
-EBUILD quakeforge-9999.ebuild 4126 BLAKE2B b75a8a6f2b3c91f62c0ff5a2134d8f8b858d5f8bfed59e212b5c5831d43f0597c717d5a303c9f0e1c1874a21e87a6924d9096ce3d97cecb5807543969f8c8396 SHA512 bb09f03e10b441162ffb051ea36466e3e4e55522678079e5892db171b79f2b14d9b7e18b065813d6f0ab6f53d93737c4b754660d55a78bb85a85941128125fc8
+EBUILD quakeforge-0.7.2_p20210722-r2.ebuild 4463 BLAKE2B 7a448539d20a9577bfc36b7248c3bcf5ac8312e01c2ce6effb4ea509c716aa144218ea4e3d04b865b304dc98d24150636a539d5ba860638b9721643502e8f475 SHA512 9d4d979f458ff0ff5e6de5a3f27e57ce1108ca54eb11b952aa3387954c791520eac713b391d18518e39f6d247c9a493805223990dc74315caf614873ae6e9f9a
+EBUILD quakeforge-9999.ebuild 4136 BLAKE2B 2255a0a80b24261cf6fdc9ca981e93563a4a5faecfe39105355a6506940ff04b9d4f6b9a9dc75fef947143797b5bae04eb5e21f91dd7b5e7a902e82c7635a543 SHA512 005c9a95f8240f6b5df18c8eefaf0df548c476736d91e2ba1f64cac57562c16d7f86c28f8f38679cab5891ea90579fd4cda1eac1ffef7c8fe109881b5571dbaa
 MISC metadata.xml 1839 BLAKE2B 1ba2ccf8438f8788b2ec1c667fb4945c6c6616e92f1c2686a86181751fb469b4e8d0c6e64a358ab4237d42d1917bb1f2edece3db1c373e1df1f2b4d471738e30 SHA512 7c51fd96efd2ecf46346dfe89e82f771fc8c2f381c65c49c59408e53ba294a8d9351833aeb1e1df79b114b3d043ada9fe37c76db5207c35784903d3640678316
diff --git a/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild
new file mode 100644
index 000000000000..e904e35f9cd1
--- /dev/null
+++ b/games-fps/quakeforge/quakeforge-0.7.2_p20210722-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/quakeforge/quakeforge.git"
+else
+	MY_COMMIT="e799a7ae45b0ab2ad7b642953277db8ccf256cf8"
+	SRC_URI="https://github.com/quakeforge/quakeforge/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="3D engine based on id Software's Quake and QuakeWorld game engines"
+HOMEPAGE="http://www.quakeforge.net/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="alsa +client debug doc flac jack ncurses oss png sdl vorbis vulkan wildmidi zlib"
+
+RDEPEND="
+	client? (
+		media-libs/libsamplerate
+		net-misc/curl
+		virtual/opengl
+		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 )
+		vulkan? ( media-libs/vulkan-loader )
+		wildmidi? ( media-sound/wildmidi )
+	)
+	ncurses? ( sys-libs/ncurses:= )
+	png? ( media-libs/libpng:= )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="
+	${RDEPEND}
+	client? (
+		x11-base/xorg-proto
+		vulkan? ( dev-util/vulkan-headers )
+	)"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		>=media-gfx/fig2dev-3.2.9-r1
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-skipped-tests.patch
+)
+
+src_prepare() {
+	default
+
+	echo ${PV} > .tarball-version || die
+	eautoreconf
+}
+
+src_configure() {
+	filter-lto #858755
+	unset LEX YACC #902997,884287
+
+	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)
+		$(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)
+		--disable-Werror
+		--disable-dga
+		--enable-xdg
+		# non-x11 clients are mostly abandoned/broken (SDL1 still useful for pulseaudio)
+		--with-clients=$(usev 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
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake doc
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doxygen/html/. )
+
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+
+	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, jack, oss -- sdl can do pulseaudio)
+	- setrom vid_render gl (or vulkan, sw for software rendering)"
+	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
+
+	if use vulkan; then
+		ewarn "You've enabled the new vulkan support that is still experimental and yet"
+		ewarn "used by default. If have issues, can use '+setrom vid_render gl' command"
+		ewarn "line option to revert to GL."
+	fi
+}
diff --git a/games-fps/quakeforge/quakeforge-9999.ebuild b/games-fps/quakeforge/quakeforge-9999.ebuild
index 9c6f72e80f93..df728f289149 100644
--- a/games-fps/quakeforge/quakeforge-9999.ebuild
+++ b/games-fps/quakeforge/quakeforge-9999.ebuild
@@ -55,7 +55,7 @@ BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen[dot]
-		media-gfx/transfig
+		>=media-gfx/fig2dev-3.2.9-r1
 	)"
 
 src_prepare() {