public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2019-12-28  0:11 James Le Cuirot
  0 siblings, 0 replies; 24+ messages in thread
From: James Le Cuirot @ 2019-12-28  0:11 UTC (permalink / raw
  To: gentoo-commits

commit:     35e1a7cb0a492f80e4f9b6233d4151ff29fa57fd
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 00:09:52 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 00:10:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e1a7cb

games-fps/yamagi-quake2: Drop old 7.40

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   1 -
 games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild | 149 ----------------------
 2 files changed, 150 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index dbc41660ecf..048d8efc7a0 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,3 @@
-DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
 DIST quake2-7.41.tar.xz 1978952 BLAKE2B 9d3626f102b652c443caea294f7f66dc46869612b64d16c5f2e9b7f28a83800a0653450f8fc44ebaa83e01ddfaf2b2cd5dd9c6feb8001b5cabd7df32171e035b SHA512 fd2c991274415eb38cf3deb7562f7c51c7f8e935cf7215eba7e8ae088f25cddf95e86221fcbbb5fcc8bd97e264b147951bf5f4aecb8ee54973d46af7ef39d3af
 DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
 DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild
deleted file mode 100644
index 5e8aa0b53d2..00000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 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
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
-REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
-
-COMMON_DEPEND="
-	client? (
-		media-libs/libsdl2[video]
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? (
-			media-libs/libsdl2[opengl]
-			virtual/opengl
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	client? ( openal? ( media-libs/openal ) )
-"
-
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-)
-DOCS=( CHANGELOG README.md doc/. )
-
-mymake() {
-	emake \
-		VERBOSE=1 \
-		WITH_SYSTEMWIDE=yes \
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_OPENAL=$(usex openal) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	if use client; then
-		targets+=( client )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you must at least install:"
-		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
-		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
-		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2023-12-18 18:43 Ionen Wolkens
  0 siblings, 0 replies; 24+ messages in thread
From: Ionen Wolkens @ 2023-12-18 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     3b42f13ef8fa774be1783f5aea8c645164cdb961
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Dec 18 02:24:07 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 18:18:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b42f13e

games-fps/yamagi-quake2: version bump to 8.30

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   5 +
 games-fps/yamagi-quake2/yamagi-quake2-8.30.ebuild | 151 ++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 1d69a8710a45..5abb195ff870 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,10 +1,15 @@
 DIST quake2-8.10.tar.xz 2138064 BLAKE2B 80fbb467977d365aa19015eade8d6cb6004895f8f5a605cdbd840ac41ad2d8a51da1ef3653f401bd1e597c39185f273a5f9720570ad9899815e6bc064a323027 SHA512 390a3971d5473166e4c24ef93b1866ae4ca05d17f6c5906d0b7a5bd81d3fbfbff6756b8222af5e3bf2a2f738215375a9eb2947b8690aceb99ac2bf4125d19d25
 DIST quake2-8.20.tar.xz 2152184 BLAKE2B 6616666bcc48f7d97d06e71744f6ebdd3ef6a2701b628fe6d7c26293f8b62586bd03037877a77c3c56660e6e11704e6149e8bd7aad3c5fe28964ee25278cd16f SHA512 5dbdbbf582494d16d00b9880ddea6de4b098a307dbe4ddf6bc90aa6b2bd2928c10fab40cf5dd63861e7a37f9c75b9afae6f43f8bfff3ee6704ca94f78ff9b7d2
+DIST quake2-8.30.tar.xz 2165532 BLAKE2B cc0d42d643d066368450f2d789a987a978a3c0f319fdba2593e5275c4af3b2e7833913326d6cee39ddf854564638a3e2dc27c8333afbf0ff36691c31f5b093d8 SHA512 2801cc167f6780c93b9abb5462b6f57c4487ba8745f61dd4732ec9fccd0c07b5058b9e6640dae71b74eece5248fbae72ce071cc5b96e0d9a9e0540389e1fa413
 DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
 DIST quake2-ctf-1.09.tar.xz 136564 BLAKE2B 352dd4a8a7a10b28ecff49bf61517fa39f4836e3f40fc41f234d5bb845467e1e87a385d4f4786d61228e2d9bcbb8647b660f054ea72af826b7fefb052f946d7d SHA512 2ba40ef7c973cc57aa632e3a102784f5819109019dc5e614ff376e69ba85a21a85171c713c1c55a023f17ba2f2f8f888acbf37e103e39d4f21cc498d167a0aa6
+DIST quake2-ctf-1.10.tar.xz 136544 BLAKE2B 04a374a32b90d4dd77cb7f57f361775310560b29a75b61b7acec1f3694041b04afa9fc7c75b93872368c6af552531ab2aba0d766f2394fd5a77da8017a3f9878 SHA512 66734ce71097a8a584408916fe445d56e81ae86c19ecdd178dfe9f14aa1a526a9f098b0f5756441c80b5516c160e7f64454acc5c351f0ed99acc7dea0a2d9027
 DIST quake2-ref_vk-1.0.2.tar.gz 295693 BLAKE2B 422fa9f406302140c0cad4994f4e33a6b145dd954417635a73406fd5d888ed8884d335a15e13069881d8102aa87157f0061553c3c3dc253b5fdb40b389b0027f SHA512 5b6d72a6a769cd9171a6ac2776f9c637e527800b3214e1799041e0c19c9b258130b6fb67812e5c889a1b1f593edd14c23ea4aa00cbfec06e68ef8aeb132a7102
 DIST quake2-ref_vk-1.0.4.tar.gz 301286 BLAKE2B f5b03e451a5e341fcce4db353d71dd80f579326e7d7d6db899e17490f74d4d2b74b6186a57a614bb82b8460f59d3b0ad0f60f8045ff6ad35bbc14ebb54cb8e1e SHA512 9db1b75c2676d22e10fe0d9954349585d055eb29a58d63e04a023670d1a60f8bc8fc0b8ecfc854edd1f464d6200a58d56dd8fdd3489389047e2e5198fdf756a3
+DIST quake2-ref_vk-1.0.7.tar.gz 315716 BLAKE2B b12996f3f09f07ebd8ed10fe138115046061941b70db7c7da9d0c639ddb2553fd040f9552db107757ea4f86e496665c520b4d4c2b3611a6d51692bdb5c6cc9b4 SHA512 52a05e64e6d41be78945b6908a08839507e1c14d9d16661ba45eda3bb4147ca4c89cc767343a5ad96e2bcef5c7773ed4fa128eaf829c0433f363873fafd326a4
 DIST quake2-rogue-2.09.tar.xz 305548 BLAKE2B d0623a68b52faf87caa974ba9bcf511e24b132b3fb371dea312c8ff8edab943fcdcfd0bf4278cb996c9b8b85da5c61a1b276e3f0d4493d2e69615908c4f6c01e SHA512 f69fe00c1d3484280231b4ec625aff5f3135f013398014d01ed3823834f17bcbc8930911843b00b088a8247e42ce5074f5b2a029ff2a695ed65e8561ed563de5
 DIST quake2-rogue-2.10.tar.xz 306052 BLAKE2B 3b77949857014dd0fa96ad14eabe9548f18cdc47a7620c2dba89709d5d0747e05a22a5b50fe6ee7599ae61969572fa4b26334615947991008b8187df6eb1d19a SHA512 52929c3d483b569a90f4e3183ffe0525ee5f73cd50ef12148e9c3894ee5e9ec73b3458677fcdeae4df4a93bd49ef9e43d6ff3c4ab989e982018d3e76a76e4fc0
+DIST quake2-rogue-2.11.tar.xz 324220 BLAKE2B c2c4b9b65238302f81f31f02b3576fd29507d276482c74b6b3720ceb4664e49109afc0e14a759de2866125b98e775e9417461682d14b11895e2470cb293e9da9 SHA512 9ff487c7907cb809efe2f327adb9547f65ca4dbaeec638ddc8e9e7b52da4d1b1574107e835a6975ab626ce5c0bf0cec0a7cc5880e45a973a208b7ebf051f80ce
 DIST quake2-xatrix-2.10.tar.xz 214664 BLAKE2B 858a33c10ad3378449cf96cf4cec45bbbeb0680eb7296a6ab9a266dcb83053a1ea784f171b3b163426583ce2bd4b5631daa0b327a9c4ab1c13ab469a62a3d85d SHA512 fa6c008fba766e0ec159ab0a9ea72fb4bcf33c428f5b5c37a0611c9f2052f147d14af9872bbccdfdf4ab485bf523398c32dfa91a767b715a2dc84355b7e1d204
 DIST quake2-xatrix-2.11.tar.xz 215284 BLAKE2B d763005e33d4d5db7c8ca9c93597e6a2d207cb9fb6f3fdbc758c148833226006caa7ebdb23865a6aa434e367d2259e630da177033a6760c7b1e51044cff4cb0b SHA512 a9f668804feb942a65eae1a537a4c26c079511d9dc7bf339fb9e1dff1de4dce8d0795813387e15947d0906044a75de7411d1c84f290b64e37f417d3fdf2fa5b0
+DIST quake2-xatrix-2.12.tar.xz 216216 BLAKE2B db4e59a852a7e6f37532a79f5b74661390dd28782d0ee1ea4cc0ea77d191922adaefba8e8046b38c7b4231bd5a151562f92d56e0ee15b962cb9154fd8de36374 SHA512 291360583777dedab9935634a825f8859c12c851f103136d36c028d185bec2409a6634a6bf83db479c1b3fd3fece11698b1bd274eff75f41d51a9e498f0ba804

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.30.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.30.ebuild
new file mode 100644
index 000000000000..250ea6612a77
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.30.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs wrapper
+
+CTF_V="1.10"
+ROGUE_V="2.11"
+XATRIX_V="2.12"
+REF_VK_V="1.0.7"
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+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 )
+	vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v${REF_VK_V}.tar.gz ->
+		quake2-ref_vk-${REF_VK_V}.tar.gz )
+"
+S="${WORKDIR}/quake2-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+client ctf dedicated gles openal +opengl rogue softrender vulkan xatrix"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl gles softrender vulkan ) )
+"
+
+RDEPEND="
+	client? (
+		media-libs/libsdl2[opengl?,video,vulkan?]
+		net-misc/curl
+		gles? (
+			media-libs/libglvnd
+			media-libs/libsdl2[gles2]
+		)
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? ( media-libs/libglvnd[X] )
+	)
+"
+DEPEND="${RDEPEND}
+	client? ( vulkan? ( dev-util/vulkan-headers ) )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-8.01-execinfo.patch )
+
+DOCS=( CHANGELOG README.md doc )
+
+src_compile() {
+	tc-export CC
+
+	local targets=( game )
+	local emakeargs=(
+		VERBOSE=1
+		WITH_EXECINFO=$(usex elibc_musl no yes)
+		WITH_SYSTEMWIDE=yes
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
+		WITH_OPENAL=$(usex openal)
+	)
+
+	if use client; then
+		targets+=( client )
+		use gles && targets+=( ref_gles3 )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	emake "${emakeargs[@]}" config
+	emake "${emakeargs[@]}" "${targets[@]}"
+
+	if use client && use vulkan; then
+		emake -C "${WORKDIR}"/ref_vk-${REF_VK_V} VERBOSE=1
+	fi
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See doc/070_packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+
+		if use vulkan; then
+			doins "${WORKDIR}"/ref_vk-${REF_VK_V}/release/ref_vk.so
+		fi
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	keepdir /usr/share/quake2
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you should do one of the following things:"
+		elog " - install games-fps/quake2-data or games-fps/quake2-demodata;"
+		elog " - manually copy game data files into ~/.yq2/ or"
+		elog "   ${EROOT}/usr/share/quake2/."
+		elog "Read ${EROOT}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2023-12-18 18:43 Ionen Wolkens
  0 siblings, 0 replies; 24+ messages in thread
From: Ionen Wolkens @ 2023-12-18 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     eeb9faf87ae645b2348f9306286672017189bc9a
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Dec 18 02:25:03 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 18:18:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb9faf8

games-fps/yamagi-quake2: drop 8.10

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/34338
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   5 -
 games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild | 151 ----------------------
 2 files changed, 156 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 5abb195ff870..ccd0dc65a67d 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,15 +1,10 @@
-DIST quake2-8.10.tar.xz 2138064 BLAKE2B 80fbb467977d365aa19015eade8d6cb6004895f8f5a605cdbd840ac41ad2d8a51da1ef3653f401bd1e597c39185f273a5f9720570ad9899815e6bc064a323027 SHA512 390a3971d5473166e4c24ef93b1866ae4ca05d17f6c5906d0b7a5bd81d3fbfbff6756b8222af5e3bf2a2f738215375a9eb2947b8690aceb99ac2bf4125d19d25
 DIST quake2-8.20.tar.xz 2152184 BLAKE2B 6616666bcc48f7d97d06e71744f6ebdd3ef6a2701b628fe6d7c26293f8b62586bd03037877a77c3c56660e6e11704e6149e8bd7aad3c5fe28964ee25278cd16f SHA512 5dbdbbf582494d16d00b9880ddea6de4b098a307dbe4ddf6bc90aa6b2bd2928c10fab40cf5dd63861e7a37f9c75b9afae6f43f8bfff3ee6704ca94f78ff9b7d2
 DIST quake2-8.30.tar.xz 2165532 BLAKE2B cc0d42d643d066368450f2d789a987a978a3c0f319fdba2593e5275c4af3b2e7833913326d6cee39ddf854564638a3e2dc27c8333afbf0ff36691c31f5b093d8 SHA512 2801cc167f6780c93b9abb5462b6f57c4487ba8745f61dd4732ec9fccd0c07b5058b9e6640dae71b74eece5248fbae72ce071cc5b96e0d9a9e0540389e1fa413
-DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
 DIST quake2-ctf-1.09.tar.xz 136564 BLAKE2B 352dd4a8a7a10b28ecff49bf61517fa39f4836e3f40fc41f234d5bb845467e1e87a385d4f4786d61228e2d9bcbb8647b660f054ea72af826b7fefb052f946d7d SHA512 2ba40ef7c973cc57aa632e3a102784f5819109019dc5e614ff376e69ba85a21a85171c713c1c55a023f17ba2f2f8f888acbf37e103e39d4f21cc498d167a0aa6
 DIST quake2-ctf-1.10.tar.xz 136544 BLAKE2B 04a374a32b90d4dd77cb7f57f361775310560b29a75b61b7acec1f3694041b04afa9fc7c75b93872368c6af552531ab2aba0d766f2394fd5a77da8017a3f9878 SHA512 66734ce71097a8a584408916fe445d56e81ae86c19ecdd178dfe9f14aa1a526a9f098b0f5756441c80b5516c160e7f64454acc5c351f0ed99acc7dea0a2d9027
-DIST quake2-ref_vk-1.0.2.tar.gz 295693 BLAKE2B 422fa9f406302140c0cad4994f4e33a6b145dd954417635a73406fd5d888ed8884d335a15e13069881d8102aa87157f0061553c3c3dc253b5fdb40b389b0027f SHA512 5b6d72a6a769cd9171a6ac2776f9c637e527800b3214e1799041e0c19c9b258130b6fb67812e5c889a1b1f593edd14c23ea4aa00cbfec06e68ef8aeb132a7102
 DIST quake2-ref_vk-1.0.4.tar.gz 301286 BLAKE2B f5b03e451a5e341fcce4db353d71dd80f579326e7d7d6db899e17490f74d4d2b74b6186a57a614bb82b8460f59d3b0ad0f60f8045ff6ad35bbc14ebb54cb8e1e SHA512 9db1b75c2676d22e10fe0d9954349585d055eb29a58d63e04a023670d1a60f8bc8fc0b8ecfc854edd1f464d6200a58d56dd8fdd3489389047e2e5198fdf756a3
 DIST quake2-ref_vk-1.0.7.tar.gz 315716 BLAKE2B b12996f3f09f07ebd8ed10fe138115046061941b70db7c7da9d0c639ddb2553fd040f9552db107757ea4f86e496665c520b4d4c2b3611a6d51692bdb5c6cc9b4 SHA512 52a05e64e6d41be78945b6908a08839507e1c14d9d16661ba45eda3bb4147ca4c89cc767343a5ad96e2bcef5c7773ed4fa128eaf829c0433f363873fafd326a4
-DIST quake2-rogue-2.09.tar.xz 305548 BLAKE2B d0623a68b52faf87caa974ba9bcf511e24b132b3fb371dea312c8ff8edab943fcdcfd0bf4278cb996c9b8b85da5c61a1b276e3f0d4493d2e69615908c4f6c01e SHA512 f69fe00c1d3484280231b4ec625aff5f3135f013398014d01ed3823834f17bcbc8930911843b00b088a8247e42ce5074f5b2a029ff2a695ed65e8561ed563de5
 DIST quake2-rogue-2.10.tar.xz 306052 BLAKE2B 3b77949857014dd0fa96ad14eabe9548f18cdc47a7620c2dba89709d5d0747e05a22a5b50fe6ee7599ae61969572fa4b26334615947991008b8187df6eb1d19a SHA512 52929c3d483b569a90f4e3183ffe0525ee5f73cd50ef12148e9c3894ee5e9ec73b3458677fcdeae4df4a93bd49ef9e43d6ff3c4ab989e982018d3e76a76e4fc0
 DIST quake2-rogue-2.11.tar.xz 324220 BLAKE2B c2c4b9b65238302f81f31f02b3576fd29507d276482c74b6b3720ceb4664e49109afc0e14a759de2866125b98e775e9417461682d14b11895e2470cb293e9da9 SHA512 9ff487c7907cb809efe2f327adb9547f65ca4dbaeec638ddc8e9e7b52da4d1b1574107e835a6975ab626ce5c0bf0cec0a7cc5880e45a973a208b7ebf051f80ce
-DIST quake2-xatrix-2.10.tar.xz 214664 BLAKE2B 858a33c10ad3378449cf96cf4cec45bbbeb0680eb7296a6ab9a266dcb83053a1ea784f171b3b163426583ce2bd4b5631daa0b327a9c4ab1c13ab469a62a3d85d SHA512 fa6c008fba766e0ec159ab0a9ea72fb4bcf33c428f5b5c37a0611c9f2052f147d14af9872bbccdfdf4ab485bf523398c32dfa91a767b715a2dc84355b7e1d204
 DIST quake2-xatrix-2.11.tar.xz 215284 BLAKE2B d763005e33d4d5db7c8ca9c93597e6a2d207cb9fb6f3fdbc758c148833226006caa7ebdb23865a6aa434e367d2259e630da177033a6760c7b1e51044cff4cb0b SHA512 a9f668804feb942a65eae1a537a4c26c079511d9dc7bf339fb9e1dff1de4dce8d0795813387e15947d0906044a75de7411d1c84f290b64e37f417d3fdf2fa5b0
 DIST quake2-xatrix-2.12.tar.xz 216216 BLAKE2B db4e59a852a7e6f37532a79f5b74661390dd28782d0ee1ea4cc0ea77d191922adaefba8e8046b38c7b4231bd5a151562f92d56e0ee15b962cb9154fd8de36374 SHA512 291360583777dedab9935634a825f8859c12c851f103136d36c028d185bec2409a6634a6bf83db479c1b3fd3fece11698b1bd274eff75f41d51a9e498f0ba804

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild
deleted file mode 100644
index 4a4a792e4187..000000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop toolchain-funcs wrapper
-
-CTF_V="1.08"
-ROGUE_V="2.09"
-XATRIX_V="2.10"
-REF_VK_V="1.0.2"
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-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 )
-	vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v${REF_VK_V}.tar.gz ->
-		quake2-ref_vk-${REF_VK_V}.tar.gz )
-"
-S="${WORKDIR}/quake2-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+client ctf dedicated gles openal +opengl rogue softrender vulkan xatrix"
-REQUIRED_USE="
-	|| ( client dedicated )
-	client? ( || ( opengl gles softrender vulkan ) )
-"
-
-RDEPEND="
-	client? (
-		media-libs/libsdl2[opengl?,video,vulkan?]
-		net-misc/curl
-		gles? (
-			media-libs/libglvnd
-			media-libs/libsdl2[gles2]
-		)
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? ( media-libs/libglvnd[X] )
-	)
-"
-DEPEND="${RDEPEND}
-	client? ( vulkan? ( dev-util/vulkan-headers ) )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-8.01-execinfo.patch )
-
-DOCS=( CHANGELOG README.md doc )
-
-src_compile() {
-	tc-export CC
-
-	local targets=( game )
-	local emakeargs=(
-		VERBOSE=1
-		WITH_EXECINFO=$(usex elibc_musl no yes)
-		WITH_SYSTEMWIDE=yes
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
-		WITH_OPENAL=$(usex openal)
-	)
-
-	if use client; then
-		targets+=( client )
-		use gles && targets+=( ref_gles3 )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	emake "${emakeargs[@]}" config
-	emake "${emakeargs[@]}" "${targets[@]}"
-
-	if use client && use vulkan; then
-		emake -C "${WORKDIR}"/ref_vk-${REF_VK_V} VERBOSE=1
-	fi
-
-	local addon
-	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See doc/070_packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-
-		if use vulkan; then
-			doins "${WORKDIR}"/ref_vk-${REF_VK_V}/release/ref_vk.so
-		fi
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	keepdir /usr/share/quake2
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you should do one of the following things:"
-		elog " - install games-fps/quake2-data or games-fps/quake2-demodata;"
-		elog " - manually copy game data files into ~/.yq2/ or"
-		elog "   ${EROOT}/usr/share/quake2/."
-		elog "Read ${EROOT}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2023-03-09 20:13 Ionen Wolkens
  0 siblings, 0 replies; 24+ messages in thread
From: Ionen Wolkens @ 2023-03-09 20:13 UTC (permalink / raw
  To: gentoo-commits

commit:     55f0de1de1114ed6192b6885df3c63dc721996fa
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Mar  5 20:44:20 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 20:12:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55f0de1d

games-fps/yamagi-quake2: version bump to 8.20

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/29946
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   5 +
 games-fps/yamagi-quake2/yamagi-quake2-8.20.ebuild | 151 ++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index fce560ee75e3..1d69a8710a45 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,5 +1,10 @@
 DIST quake2-8.10.tar.xz 2138064 BLAKE2B 80fbb467977d365aa19015eade8d6cb6004895f8f5a605cdbd840ac41ad2d8a51da1ef3653f401bd1e597c39185f273a5f9720570ad9899815e6bc064a323027 SHA512 390a3971d5473166e4c24ef93b1866ae4ca05d17f6c5906d0b7a5bd81d3fbfbff6756b8222af5e3bf2a2f738215375a9eb2947b8690aceb99ac2bf4125d19d25
+DIST quake2-8.20.tar.xz 2152184 BLAKE2B 6616666bcc48f7d97d06e71744f6ebdd3ef6a2701b628fe6d7c26293f8b62586bd03037877a77c3c56660e6e11704e6149e8bd7aad3c5fe28964ee25278cd16f SHA512 5dbdbbf582494d16d00b9880ddea6de4b098a307dbe4ddf6bc90aa6b2bd2928c10fab40cf5dd63861e7a37f9c75b9afae6f43f8bfff3ee6704ca94f78ff9b7d2
 DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
+DIST quake2-ctf-1.09.tar.xz 136564 BLAKE2B 352dd4a8a7a10b28ecff49bf61517fa39f4836e3f40fc41f234d5bb845467e1e87a385d4f4786d61228e2d9bcbb8647b660f054ea72af826b7fefb052f946d7d SHA512 2ba40ef7c973cc57aa632e3a102784f5819109019dc5e614ff376e69ba85a21a85171c713c1c55a023f17ba2f2f8f888acbf37e103e39d4f21cc498d167a0aa6
 DIST quake2-ref_vk-1.0.2.tar.gz 295693 BLAKE2B 422fa9f406302140c0cad4994f4e33a6b145dd954417635a73406fd5d888ed8884d335a15e13069881d8102aa87157f0061553c3c3dc253b5fdb40b389b0027f SHA512 5b6d72a6a769cd9171a6ac2776f9c637e527800b3214e1799041e0c19c9b258130b6fb67812e5c889a1b1f593edd14c23ea4aa00cbfec06e68ef8aeb132a7102
+DIST quake2-ref_vk-1.0.4.tar.gz 301286 BLAKE2B f5b03e451a5e341fcce4db353d71dd80f579326e7d7d6db899e17490f74d4d2b74b6186a57a614bb82b8460f59d3b0ad0f60f8045ff6ad35bbc14ebb54cb8e1e SHA512 9db1b75c2676d22e10fe0d9954349585d055eb29a58d63e04a023670d1a60f8bc8fc0b8ecfc854edd1f464d6200a58d56dd8fdd3489389047e2e5198fdf756a3
 DIST quake2-rogue-2.09.tar.xz 305548 BLAKE2B d0623a68b52faf87caa974ba9bcf511e24b132b3fb371dea312c8ff8edab943fcdcfd0bf4278cb996c9b8b85da5c61a1b276e3f0d4493d2e69615908c4f6c01e SHA512 f69fe00c1d3484280231b4ec625aff5f3135f013398014d01ed3823834f17bcbc8930911843b00b088a8247e42ce5074f5b2a029ff2a695ed65e8561ed563de5
+DIST quake2-rogue-2.10.tar.xz 306052 BLAKE2B 3b77949857014dd0fa96ad14eabe9548f18cdc47a7620c2dba89709d5d0747e05a22a5b50fe6ee7599ae61969572fa4b26334615947991008b8187df6eb1d19a SHA512 52929c3d483b569a90f4e3183ffe0525ee5f73cd50ef12148e9c3894ee5e9ec73b3458677fcdeae4df4a93bd49ef9e43d6ff3c4ab989e982018d3e76a76e4fc0
 DIST quake2-xatrix-2.10.tar.xz 214664 BLAKE2B 858a33c10ad3378449cf96cf4cec45bbbeb0680eb7296a6ab9a266dcb83053a1ea784f171b3b163426583ce2bd4b5631daa0b327a9c4ab1c13ab469a62a3d85d SHA512 fa6c008fba766e0ec159ab0a9ea72fb4bcf33c428f5b5c37a0611c9f2052f147d14af9872bbccdfdf4ab485bf523398c32dfa91a767b715a2dc84355b7e1d204
+DIST quake2-xatrix-2.11.tar.xz 215284 BLAKE2B d763005e33d4d5db7c8ca9c93597e6a2d207cb9fb6f3fdbc758c148833226006caa7ebdb23865a6aa434e367d2259e630da177033a6760c7b1e51044cff4cb0b SHA512 a9f668804feb942a65eae1a537a4c26c079511d9dc7bf339fb9e1dff1de4dce8d0795813387e15947d0906044a75de7411d1c84f290b64e37f417d3fdf2fa5b0

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.20.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.20.ebuild
new file mode 100644
index 000000000000..8d465fc19a55
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.20.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs wrapper
+
+CTF_V="1.09"
+ROGUE_V="2.10"
+XATRIX_V="2.11"
+REF_VK_V="1.0.4"
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+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 )
+	vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v${REF_VK_V}.tar.gz ->
+		quake2-ref_vk-${REF_VK_V}.tar.gz )
+"
+S="${WORKDIR}/quake2-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+client ctf dedicated gles openal +opengl rogue softrender vulkan xatrix"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl gles softrender vulkan ) )
+"
+
+RDEPEND="
+	client? (
+		media-libs/libsdl2[opengl?,video,vulkan?]
+		net-misc/curl
+		gles? (
+			media-libs/libglvnd
+			media-libs/libsdl2[gles2]
+		)
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? ( media-libs/libglvnd[X] )
+	)
+"
+DEPEND="${RDEPEND}
+	client? ( vulkan? ( dev-util/vulkan-headers ) )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-8.01-execinfo.patch )
+
+DOCS=( CHANGELOG README.md doc )
+
+src_compile() {
+	tc-export CC
+
+	local targets=( game )
+	local emakeargs=(
+		VERBOSE=1
+		WITH_EXECINFO=$(usex elibc_musl no yes)
+		WITH_SYSTEMWIDE=yes
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
+		WITH_OPENAL=$(usex openal)
+	)
+
+	if use client; then
+		targets+=( client )
+		use gles && targets+=( ref_gles3 )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	emake "${emakeargs[@]}" config
+	emake "${emakeargs[@]}" "${targets[@]}"
+
+	if use client && use vulkan; then
+		emake -C "${WORKDIR}"/ref_vk-${REF_VK_V} VERBOSE=1
+	fi
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See doc/070_packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+
+		if use vulkan; then
+			doins "${WORKDIR}"/ref_vk-${REF_VK_V}/release/ref_vk.so
+		fi
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	keepdir /usr/share/quake2
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you should do one of the following things:"
+		elog " - install games-fps/quake2-data or games-fps/quake2-demodata;"
+		elog " - manually copy game data files into ~/.yq2/ or"
+		elog "   ${EROOT}/usr/share/quake2/."
+		elog "Read ${EROOT}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2022-12-19  7:23 Ionen Wolkens
  0 siblings, 0 replies; 24+ messages in thread
From: Ionen Wolkens @ 2022-12-19  7:23 UTC (permalink / raw
  To: gentoo-commits

commit:     f8ce42fbb1b0fe8fe4f48c49b46859b9231c1ea6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 06:58:06 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 07:11:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ce42fb

games-fps/yamagi-quake2: drop 8.01

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   4 -
 games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild | 146 ----------------------
 2 files changed, 150 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 0e925852b4b6..fce560ee75e3 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,9 +1,5 @@
-DIST quake2-8.01.tar.xz 2109408 BLAKE2B a68fe6ea3a0ab44ba9776bf99a3a826afe0ee25c842d6169296eb8837a3b22146f481defd7a66294dc9e42e75e5848225199e4314bf94756606e7325ba789db2 SHA512 8f616f8f09ad9e44bb34227d5492cc0d63180cecebcc39760582590078f4a63a0a4433d66cdffefb26a68d070b2ea1223334de9ae7c32e6c46e42a5aab721a06
 DIST quake2-8.10.tar.xz 2138064 BLAKE2B 80fbb467977d365aa19015eade8d6cb6004895f8f5a605cdbd840ac41ad2d8a51da1ef3653f401bd1e597c39185f273a5f9720570ad9899815e6bc064a323027 SHA512 390a3971d5473166e4c24ef93b1866ae4ca05d17f6c5906d0b7a5bd81d3fbfbff6756b8222af5e3bf2a2f738215375a9eb2947b8690aceb99ac2bf4125d19d25
 DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
-DIST quake2-ref_vk-1.0.1.tar.gz 290799 BLAKE2B 0716d539704a58067fd2d6d4f21b27976c6bd073b2722584a804c9702f2886b252701d81f2fe1e5aba22ab83fbddd1e35ce3574c3e3d41b609ebac417ee7cfe4 SHA512 99a6b7191a2eed714f70ec389a1f1972f430b9ba324e6880ce96101336beac640fef2d45adc1a6bf04c386a1d088fafd401d303704079ed7207fe7b56d2758db
 DIST quake2-ref_vk-1.0.2.tar.gz 295693 BLAKE2B 422fa9f406302140c0cad4994f4e33a6b145dd954417635a73406fd5d888ed8884d335a15e13069881d8102aa87157f0061553c3c3dc253b5fdb40b389b0027f SHA512 5b6d72a6a769cd9171a6ac2776f9c637e527800b3214e1799041e0c19c9b258130b6fb67812e5c889a1b1f593edd14c23ea4aa00cbfec06e68ef8aeb132a7102
-DIST quake2-rogue-2.08.tar.xz 282140 BLAKE2B e4ead304f35028010f4ffea6eed15753feac99cfa301975f8cae88d9ac10313c9e1a9e29e37d4f186df34abf659dd45b79bda04b5f420565f256bde8b69ab199 SHA512 216b8a9862c7f189bdabc68770306ead4fa2173f9051a8fd2a7927eae8aa4e42116bbde947591432d200832a3038c79316325549822fa531fc0e76a2bec57762
 DIST quake2-rogue-2.09.tar.xz 305548 BLAKE2B d0623a68b52faf87caa974ba9bcf511e24b132b3fb371dea312c8ff8edab943fcdcfd0bf4278cb996c9b8b85da5c61a1b276e3f0d4493d2e69615908c4f6c01e SHA512 f69fe00c1d3484280231b4ec625aff5f3135f013398014d01ed3823834f17bcbc8930911843b00b088a8247e42ce5074f5b2a029ff2a695ed65e8561ed563de5
-DIST quake2-xatrix-2.09.tar.xz 214096 BLAKE2B a4115da0d5624245d1065a67379d95a2b22330e1a5a999d7493d832d5edca4c83752f3a447ab1934c6709b7ed9247d5edd2b3f4b9b398a04982a9428381f2f9d SHA512 a4cf351eca2a72e6b5d8eeecf5d582a3c2c677b71dcf6bcdea310f1503f55ad8ccaf7225461bd78fc695e90d57525fd9a53c5d17e1eabd3a1d28e9386331399c
 DIST quake2-xatrix-2.10.tar.xz 214664 BLAKE2B 858a33c10ad3378449cf96cf4cec45bbbeb0680eb7296a6ab9a266dcb83053a1ea784f171b3b163426583ce2bd4b5631daa0b327a9c4ab1c13ab469a62a3d85d SHA512 fa6c008fba766e0ec159ab0a9ea72fb4bcf33c428f5b5c37a0611c9f2052f147d14af9872bbccdfdf4ab485bf523398c32dfa91a767b715a2dc84355b7e1d204

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
deleted file mode 100644
index 539afb02311d..000000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop toolchain-funcs wrapper
-
-CTF_V="1.08"
-ROGUE_V="2.08"
-XATRIX_V="2.09"
-REF_VK_V="1.0.1"
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-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 )
-	vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v${REF_VK_V}.tar.gz ->
-		quake2-ref_vk-${REF_VK_V}.tar.gz )
-"
-S="${WORKDIR}/quake2-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+client ctf dedicated openal +opengl rogue softrender vulkan xatrix"
-REQUIRED_USE="
-	|| ( client dedicated )
-	client? ( || ( opengl softrender vulkan ) )
-"
-
-RDEPEND="
-	client? (
-		media-libs/libsdl2[opengl?,video,vulkan?]
-		net-misc/curl
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? ( virtual/opengl )
-	)
-"
-DEPEND="${RDEPEND}
-	client? ( vulkan? ( dev-util/vulkan-headers ) )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-8.01-execinfo.patch )
-
-DOCS=( CHANGELOG README.md doc )
-
-src_compile() {
-	tc-export CC
-
-	local targets=( game )
-	local emakeargs=(
-		VERBOSE=1
-		WITH_EXECINFO=$(usex elibc_musl no yes)
-		WITH_SYSTEMWIDE=yes
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
-		WITH_OPENAL=$(usex openal)
-	)
-
-	if use client; then
-		targets+=( client )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	emake "${emakeargs[@]}" config
-	emake "${emakeargs[@]}" "${targets[@]}"
-
-	if use client && use vulkan; then
-		emake -C "${WORKDIR}"/ref_vk-${REF_VK_V} VERBOSE=1
-	fi
-
-	local addon
-	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See doc/070_packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-
-		if use vulkan; then
-			doins "${WORKDIR}"/ref_vk-${REF_VK_V}/release/ref_vk.so
-		fi
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	keepdir /usr/share/quake2
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you should do one of the following things:"
-		elog " - install games-fps/quake2-data or games-fps/quake2-demodata;"
-		elog " - manually copy game data files into ~/.yq2/ or"
-		elog "   ${EROOT}/usr/share/quake2/."
-		elog "Read ${EROOT}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2022-10-03 18:34 Ionen Wolkens
  0 siblings, 0 replies; 24+ messages in thread
From: Ionen Wolkens @ 2022-10-03 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a7ec6dcd8f9fea544c630cd3a4df1f6ddc8ed46e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 17:57:25 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 18:34:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7ec6dcd

games-fps/yamagi-quake2: adjust opengl/gles deps

Mesa is the vendor which could be something else (aka nvidia), and
not much sense in checking directly. On the other hand, I needed to
enable gles2 on libsdl2 (flag handles gles3 too) or it'd complain
when I tried to use it, or at least with libsdl2[-opengl].

virtual/opengl is also mostly deprecated, so switch to libglvnd (this
is not wired to use libOpenGL over libGL so still need [X]).

Also add gles as a REQUIRED_USE option, I could USE="client gles -*"
with libsdl2[-opengl,gles2] and run this with +set vid_renderer gles3.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild
index 3ae5a8fc5ca0..4a4a792e4187 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild
@@ -27,17 +27,20 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+client ctf dedicated gles openal +opengl rogue softrender vulkan xatrix"
 REQUIRED_USE="
 	|| ( client dedicated )
-	client? ( || ( opengl softrender vulkan ) )
+	client? ( || ( opengl gles softrender vulkan ) )
 "
 
 RDEPEND="
 	client? (
 		media-libs/libsdl2[opengl?,video,vulkan?]
 		net-misc/curl
+		gles? (
+			media-libs/libglvnd
+			media-libs/libsdl2[gles2]
+		)
 		openal? ( media-libs/openal )
 		!openal? ( media-libs/libsdl2[sound] )
-		opengl? ( virtual/opengl )
-		gles? ( media-libs/mesa[gles2] )
+		opengl? ( media-libs/libglvnd[X] )
 	)
 "
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2022-10-03 18:34 Ionen Wolkens
  0 siblings, 0 replies; 24+ messages in thread
From: Ionen Wolkens @ 2022-10-03 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     63f249dda98e967f2e447851a1d822233e9fd997
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Oct  1 22:41:01 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 18:34:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f249dd

games-fps/yamagi-quake2: version bump to 8.10

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/27564
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   4 +
 games-fps/yamagi-quake2/metadata.xml              |   1 +
 games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild | 148 ++++++++++++++++++++++
 3 files changed, 153 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 1f2e3c6c6498..0e925852b4b6 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,5 +1,9 @@
 DIST quake2-8.01.tar.xz 2109408 BLAKE2B a68fe6ea3a0ab44ba9776bf99a3a826afe0ee25c842d6169296eb8837a3b22146f481defd7a66294dc9e42e75e5848225199e4314bf94756606e7325ba789db2 SHA512 8f616f8f09ad9e44bb34227d5492cc0d63180cecebcc39760582590078f4a63a0a4433d66cdffefb26a68d070b2ea1223334de9ae7c32e6c46e42a5aab721a06
+DIST quake2-8.10.tar.xz 2138064 BLAKE2B 80fbb467977d365aa19015eade8d6cb6004895f8f5a605cdbd840ac41ad2d8a51da1ef3653f401bd1e597c39185f273a5f9720570ad9899815e6bc064a323027 SHA512 390a3971d5473166e4c24ef93b1866ae4ca05d17f6c5906d0b7a5bd81d3fbfbff6756b8222af5e3bf2a2f738215375a9eb2947b8690aceb99ac2bf4125d19d25
 DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
 DIST quake2-ref_vk-1.0.1.tar.gz 290799 BLAKE2B 0716d539704a58067fd2d6d4f21b27976c6bd073b2722584a804c9702f2886b252701d81f2fe1e5aba22ab83fbddd1e35ce3574c3e3d41b609ebac417ee7cfe4 SHA512 99a6b7191a2eed714f70ec389a1f1972f430b9ba324e6880ce96101336beac640fef2d45adc1a6bf04c386a1d088fafd401d303704079ed7207fe7b56d2758db
+DIST quake2-ref_vk-1.0.2.tar.gz 295693 BLAKE2B 422fa9f406302140c0cad4994f4e33a6b145dd954417635a73406fd5d888ed8884d335a15e13069881d8102aa87157f0061553c3c3dc253b5fdb40b389b0027f SHA512 5b6d72a6a769cd9171a6ac2776f9c637e527800b3214e1799041e0c19c9b258130b6fb67812e5c889a1b1f593edd14c23ea4aa00cbfec06e68ef8aeb132a7102
 DIST quake2-rogue-2.08.tar.xz 282140 BLAKE2B e4ead304f35028010f4ffea6eed15753feac99cfa301975f8cae88d9ac10313c9e1a9e29e37d4f186df34abf659dd45b79bda04b5f420565f256bde8b69ab199 SHA512 216b8a9862c7f189bdabc68770306ead4fa2173f9051a8fd2a7927eae8aa4e42116bbde947591432d200832a3038c79316325549822fa531fc0e76a2bec57762
+DIST quake2-rogue-2.09.tar.xz 305548 BLAKE2B d0623a68b52faf87caa974ba9bcf511e24b132b3fb371dea312c8ff8edab943fcdcfd0bf4278cb996c9b8b85da5c61a1b276e3f0d4493d2e69615908c4f6c01e SHA512 f69fe00c1d3484280231b4ec625aff5f3135f013398014d01ed3823834f17bcbc8930911843b00b088a8247e42ce5074f5b2a029ff2a695ed65e8561ed563de5
 DIST quake2-xatrix-2.09.tar.xz 214096 BLAKE2B a4115da0d5624245d1065a67379d95a2b22330e1a5a999d7493d832d5edca4c83752f3a447ab1934c6709b7ed9247d5edd2b3f4b9b398a04982a9428381f2f9d SHA512 a4cf351eca2a72e6b5d8eeecf5d582a3c2c677b71dcf6bcdea310f1503f55ad8ccaf7225461bd78fc695e90d57525fd9a53c5d17e1eabd3a1d28e9386331399c
+DIST quake2-xatrix-2.10.tar.xz 214664 BLAKE2B 858a33c10ad3378449cf96cf4cec45bbbeb0680eb7296a6ab9a266dcb83053a1ea784f171b3b163426583ce2bd4b5631daa0b327a9c4ab1c13ab469a62a3d85d SHA512 fa6c008fba766e0ec159ab0a9ea72fb4bcf33c428f5b5c37a0611c9f2052f147d14af9872bbccdfdf4ab485bf523398c32dfa91a767b715a2dc84355b7e1d204

diff --git a/games-fps/yamagi-quake2/metadata.xml b/games-fps/yamagi-quake2/metadata.xml
index f8c75f96e318..109c79bc1f83 100644
--- a/games-fps/yamagi-quake2/metadata.xml
+++ b/games-fps/yamagi-quake2/metadata.xml
@@ -19,6 +19,7 @@
 	<use>
 		<flag name="client">Build client</flag>
 		<flag name="ctf">Build support for the 'Capture The Flag' addon</flag>
+		<flag name="gles">Build GLES3 renderer</flag>
 		<flag name="rogue">Build support for the 'Ground Zero' Mission Pack</flag>
 		<flag name="softrender">Build software renderer</flag>
 		<flag name="vulkan">Build experimental Vulkan renderer</flag>

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild
new file mode 100644
index 000000000000..3ae5a8fc5ca0
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.10.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs wrapper
+
+CTF_V="1.08"
+ROGUE_V="2.09"
+XATRIX_V="2.10"
+REF_VK_V="1.0.2"
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+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 )
+	vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v${REF_VK_V}.tar.gz ->
+		quake2-ref_vk-${REF_VK_V}.tar.gz )
+"
+S="${WORKDIR}/quake2-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+client ctf dedicated gles openal +opengl rogue softrender vulkan xatrix"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl softrender vulkan ) )
+"
+
+RDEPEND="
+	client? (
+		media-libs/libsdl2[opengl?,video,vulkan?]
+		net-misc/curl
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? ( virtual/opengl )
+		gles? ( media-libs/mesa[gles2] )
+	)
+"
+DEPEND="${RDEPEND}
+	client? ( vulkan? ( dev-util/vulkan-headers ) )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-8.01-execinfo.patch )
+
+DOCS=( CHANGELOG README.md doc )
+
+src_compile() {
+	tc-export CC
+
+	local targets=( game )
+	local emakeargs=(
+		VERBOSE=1
+		WITH_EXECINFO=$(usex elibc_musl no yes)
+		WITH_SYSTEMWIDE=yes
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
+		WITH_OPENAL=$(usex openal)
+	)
+
+	if use client; then
+		targets+=( client )
+		use gles && targets+=( ref_gles3 )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	emake "${emakeargs[@]}" config
+	emake "${emakeargs[@]}" "${targets[@]}"
+
+	if use client && use vulkan; then
+		emake -C "${WORKDIR}"/ref_vk-${REF_VK_V} VERBOSE=1
+	fi
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See doc/070_packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+
+		if use vulkan; then
+			doins "${WORKDIR}"/ref_vk-${REF_VK_V}/release/ref_vk.so
+		fi
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	keepdir /usr/share/quake2
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you should do one of the following things:"
+		elog " - install games-fps/quake2-data or games-fps/quake2-demodata;"
+		elog " - manually copy game data files into ~/.yq2/ or"
+		elog "   ${EROOT}/usr/share/quake2/."
+		elog "Read ${EROOT}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2022-06-16  9:02 Jakov Smolić
  0 siblings, 0 replies; 24+ messages in thread
From: Jakov Smolić @ 2022-06-16  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     ecbec1dcf55270a9eafc027f10f579af632cb7a8
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 09:02:03 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 09:02:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecbec1dc

games-fps/yamagi-quake2: Keyword 8.01 ppc64, #852245

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
index 12f94411a485..539afb02311d 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/quake2-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+client ctf dedicated openal +opengl rogue softrender vulkan xatrix"
 REQUIRED_USE="
 	|| ( client dedicated )


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2022-04-29 11:23 Ionen Wolkens
  0 siblings, 0 replies; 24+ messages in thread
From: Ionen Wolkens @ 2022-04-29 11:23 UTC (permalink / raw
  To: gentoo-commits

commit:     ebd83e0a6c68dfa47a2d9a89941c3b76d666275e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 10:38:11 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 11:22:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd83e0a

games-fps/yamagi-quake2: drop 8.00

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   1 -
 games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild | 143 ----------------------
 2 files changed, 144 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 0574ba5f5b12..1f2e3c6c6498 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,3 @@
-DIST quake2-8.00.tar.xz 2086776 BLAKE2B 6a525b0d3703e17ca6ff85cbef7cf0c0522308fb71f8db4649e7bfbe3326c610d878d6a4af36ed6a578c700c5e1d004be7c0a9dd86cb495a27c8deb8b761eab9 SHA512 886c0df687e7e64a534f6e6f0b212084212d4d5c1278d2567b25bdd48df9ffab9ce75894ab6cfc2fd3a070adf9c1e3d7bb2e823d4f5aef8ef2cbc21c21c063bd
 DIST quake2-8.01.tar.xz 2109408 BLAKE2B a68fe6ea3a0ab44ba9776bf99a3a826afe0ee25c842d6169296eb8837a3b22146f481defd7a66294dc9e42e75e5848225199e4314bf94756606e7325ba789db2 SHA512 8f616f8f09ad9e44bb34227d5492cc0d63180cecebcc39760582590078f4a63a0a4433d66cdffefb26a68d070b2ea1223334de9ae7c32e6c46e42a5aab721a06
 DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
 DIST quake2-ref_vk-1.0.1.tar.gz 290799 BLAKE2B 0716d539704a58067fd2d6d4f21b27976c6bd073b2722584a804c9702f2886b252701d81f2fe1e5aba22ab83fbddd1e35ce3574c3e3d41b609ebac417ee7cfe4 SHA512 99a6b7191a2eed714f70ec389a1f1972f430b9ba324e6880ce96101336beac640fef2d45adc1a6bf04c386a1d088fafd401d303704079ed7207fe7b56d2758db

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild
deleted file mode 100644
index 195061628b29..000000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop toolchain-funcs wrapper
-
-CTF_V="1.08"
-ROGUE_V="2.08"
-XATRIX_V="2.09"
-REF_VK_V="1.0.1"
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-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 )
-	vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v${REF_VK_V}.tar.gz ->
-		quake2-ref_vk-${REF_VK_V}.tar.gz )
-"
-S="${WORKDIR}/quake2-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+client ctf dedicated openal +opengl rogue softrender vulkan xatrix"
-REQUIRED_USE="
-	|| ( client dedicated )
-	client? ( || ( opengl softrender vulkan ) )
-"
-
-RDEPEND="
-	client? (
-		media-libs/libsdl2[opengl?,video,vulkan?]
-		net-misc/curl
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? ( virtual/opengl )
-	)
-"
-DEPEND="${RDEPEND}
-	client? ( vulkan? ( dev-util/vulkan-headers ) )
-"
-
-DOCS=( CHANGELOG README.md doc )
-
-src_compile() {
-	tc-export CC
-
-	local targets=( game )
-	local emakeargs=(
-		VERBOSE=1
-		WITH_SYSTEMWIDE=yes
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
-		WITH_OPENAL=$(usex openal)
-	)
-
-	if use client; then
-		targets+=( client )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	emake "${emakeargs[@]}" config
-	emake "${emakeargs[@]}" "${targets[@]}"
-
-	if use client && use vulkan; then
-		emake -C "${WORKDIR}"/ref_vk-${REF_VK_V} VERBOSE=1
-	fi
-
-	local addon
-	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See doc/070_packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-
-		if use vulkan; then
-			doins "${WORKDIR}"/ref_vk-${REF_VK_V}/release/ref_vk.so
-		fi
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	keepdir /usr/share/quake2
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you should do one of the following things:"
-		elog " - install games-fps/quake2-data or games-fps/quake2-demodata;"
-		elog " - manually copy game data files into ~/.yq2/ or"
-		elog "   ${EROOT}/usr/share/quake2/."
-		elog "Read ${EROOT}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2022-04-18 13:19 Ionen Wolkens
  0 siblings, 0 replies; 24+ messages in thread
From: Ionen Wolkens @ 2022-04-18 13:19 UTC (permalink / raw
  To: gentoo-commits

commit:     36f659abc87b72ec00f27e2370fe4d07826701ac
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Apr 16 23:11:10 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 13:01:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f659ab

games-fps/yamagi-quake2: Version bump to 8.01

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/25051
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   1 +
 games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild | 143 ++++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index adc6933fda86..0574ba5f5b12 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,5 @@
 DIST quake2-8.00.tar.xz 2086776 BLAKE2B 6a525b0d3703e17ca6ff85cbef7cf0c0522308fb71f8db4649e7bfbe3326c610d878d6a4af36ed6a578c700c5e1d004be7c0a9dd86cb495a27c8deb8b761eab9 SHA512 886c0df687e7e64a534f6e6f0b212084212d4d5c1278d2567b25bdd48df9ffab9ce75894ab6cfc2fd3a070adf9c1e3d7bb2e823d4f5aef8ef2cbc21c21c063bd
+DIST quake2-8.01.tar.xz 2109408 BLAKE2B a68fe6ea3a0ab44ba9776bf99a3a826afe0ee25c842d6169296eb8837a3b22146f481defd7a66294dc9e42e75e5848225199e4314bf94756606e7325ba789db2 SHA512 8f616f8f09ad9e44bb34227d5492cc0d63180cecebcc39760582590078f4a63a0a4433d66cdffefb26a68d070b2ea1223334de9ae7c32e6c46e42a5aab721a06
 DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
 DIST quake2-ref_vk-1.0.1.tar.gz 290799 BLAKE2B 0716d539704a58067fd2d6d4f21b27976c6bd073b2722584a804c9702f2886b252701d81f2fe1e5aba22ab83fbddd1e35ce3574c3e3d41b609ebac417ee7cfe4 SHA512 99a6b7191a2eed714f70ec389a1f1972f430b9ba324e6880ce96101336beac640fef2d45adc1a6bf04c386a1d088fafd401d303704079ed7207fe7b56d2758db
 DIST quake2-rogue-2.08.tar.xz 282140 BLAKE2B e4ead304f35028010f4ffea6eed15753feac99cfa301975f8cae88d9ac10313c9e1a9e29e37d4f186df34abf659dd45b79bda04b5f420565f256bde8b69ab199 SHA512 216b8a9862c7f189bdabc68770306ead4fa2173f9051a8fd2a7927eae8aa4e42116bbde947591432d200832a3038c79316325549822fa531fc0e76a2bec57762

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
new file mode 100644
index 000000000000..2b7bbeeab057
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.01.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs wrapper
+
+CTF_V="1.08"
+ROGUE_V="2.08"
+XATRIX_V="2.09"
+REF_VK_V="1.0.1"
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+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 )
+	vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v${REF_VK_V}.tar.gz ->
+		quake2-ref_vk-${REF_VK_V}.tar.gz )
+"
+S="${WORKDIR}/quake2-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+client ctf dedicated openal +opengl rogue softrender vulkan xatrix"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl softrender vulkan ) )
+"
+
+RDEPEND="
+	client? (
+		media-libs/libsdl2[opengl?,video,vulkan?]
+		net-misc/curl
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? ( virtual/opengl )
+	)
+"
+DEPEND="${RDEPEND}
+	client? ( vulkan? ( dev-util/vulkan-headers ) )
+"
+
+DOCS=( CHANGELOG README.md doc )
+
+src_compile() {
+	tc-export CC
+
+	local targets=( game )
+	local emakeargs=(
+		VERBOSE=1
+		WITH_SYSTEMWIDE=yes
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
+		WITH_OPENAL=$(usex openal)
+	)
+
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	emake "${emakeargs[@]}" config
+	emake "${emakeargs[@]}" "${targets[@]}"
+
+	if use client && use vulkan; then
+		emake -C "${WORKDIR}"/ref_vk-${REF_VK_V} VERBOSE=1
+	fi
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See doc/070_packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+
+		if use vulkan; then
+			doins "${WORKDIR}"/ref_vk-${REF_VK_V}/release/ref_vk.so
+		fi
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	keepdir /usr/share/quake2
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you should do one of the following things:"
+		elog " - install games-fps/quake2-data or games-fps/quake2-demodata;"
+		elog " - manually copy game data files into ~/.yq2/ or"
+		elog "   ${EROOT}/usr/share/quake2/."
+		elog "Read ${EROOT}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2021-07-04 11:53 Ionen Wolkens
  0 siblings, 0 replies; 24+ messages in thread
From: Ionen Wolkens @ 2021-07-04 11:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4f90940087b2edc9610104e6b6ee3a801ce42cc7
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Jun 28 23:05:59 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 11:45:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f909400

games-fps/yamagi-quake2: Version bump to 8.00

* Add experimental Vulkan renderer
* Change game data dir to match games-fps/quake2-data

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/21466
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   5 +
 games-fps/yamagi-quake2/metadata.xml              |   1 +
 games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild | 143 ++++++++++++++++++++++
 3 files changed, 149 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 8390668efd2..95c07132694 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,9 @@
 DIST quake2-7.45.tar.xz 1997816 BLAKE2B 1025a3e226e80b456c48fcd76100f46fa03e3ef2c61d70071136f8119f2b2af39b24fa859239217d34d14501127e4880ff7b61b79dc61c79e64dd22fcc44ce0b SHA512 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b
+DIST quake2-8.00.tar.xz 2086776 BLAKE2B 6a525b0d3703e17ca6ff85cbef7cf0c0522308fb71f8db4649e7bfbe3326c610d878d6a4af36ed6a578c700c5e1d004be7c0a9dd86cb495a27c8deb8b761eab9 SHA512 886c0df687e7e64a534f6e6f0b212084212d4d5c1278d2567b25bdd48df9ffab9ce75894ab6cfc2fd3a070adf9c1e3d7bb2e823d4f5aef8ef2cbc21c21c063bd
 DIST quake2-ctf-1.07.tar.xz 135880 BLAKE2B 7501d5db676cbc7b523313bf4e5d572cc8711efd09e2390d6aa6980d45bc682e7f137581b8a9a8d4b491de8f8ed7dd1cb32a66c9ed2cc456e114f672cedf2a1c SHA512 de2ab94fc7bb43327170f6aefbaf811e7a0071da2e5c4602354854e46e4c8cfc687a6300e7162c8f1be2f0b42cf2d3edc255c2f44fb0e39adc873a521197a316
+DIST quake2-ctf-1.08.tar.xz 136468 BLAKE2B cce9f75333c03494dccc1a693c3c0a62194457673c17c59cd5d08a06a11daa769dabaf787c04d9de291c7cc255b4decef06ae5f045c5bc7bc3f4008f0e6babdb SHA512 3d3343ae5287c5f01efd3363ede19f2e41cc8d083691c928afd9e4a81c0b46f6002eb2ed99d11742b7c04f8ea728a1dbb3b5d26ce4fd1066b4f49e3fb664317e
+DIST quake2-ref_vk-1.0.1.tar.gz 290799 BLAKE2B 0716d539704a58067fd2d6d4f21b27976c6bd073b2722584a804c9702f2886b252701d81f2fe1e5aba22ab83fbddd1e35ce3574c3e3d41b609ebac417ee7cfe4 SHA512 99a6b7191a2eed714f70ec389a1f1972f430b9ba324e6880ce96101336beac640fef2d45adc1a6bf04c386a1d088fafd401d303704079ed7207fe7b56d2758db
 DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789
+DIST quake2-rogue-2.08.tar.xz 282140 BLAKE2B e4ead304f35028010f4ffea6eed15753feac99cfa301975f8cae88d9ac10313c9e1a9e29e37d4f186df34abf659dd45b79bda04b5f420565f256bde8b69ab199 SHA512 216b8a9862c7f189bdabc68770306ead4fa2173f9051a8fd2a7927eae8aa4e42116bbde947591432d200832a3038c79316325549822fa531fc0e76a2bec57762
 DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9
+DIST quake2-xatrix-2.09.tar.xz 214096 BLAKE2B a4115da0d5624245d1065a67379d95a2b22330e1a5a999d7493d832d5edca4c83752f3a447ab1934c6709b7ed9247d5edd2b3f4b9b398a04982a9428381f2f9d SHA512 a4cf351eca2a72e6b5d8eeecf5d582a3c2c677b71dcf6bcdea310f1503f55ad8ccaf7225461bd78fc695e90d57525fd9a53c5d17e1eabd3a1d28e9386331399c

diff --git a/games-fps/yamagi-quake2/metadata.xml b/games-fps/yamagi-quake2/metadata.xml
index 1e4e7f687ed..2b7164c258b 100644
--- a/games-fps/yamagi-quake2/metadata.xml
+++ b/games-fps/yamagi-quake2/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="ctf">Build support for the 'Capture The Flag' addon</flag>
 		<flag name="rogue">Build support for the 'Ground Zero' Mission Pack</flag>
 		<flag name="softrender">Build software renderer</flag>
+		<flag name="vulkan">Build experimental Vulkan renderer</flag>
 		<flag name="xatrix">Build support for the 'The Reckoning' Mission Pack</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild
new file mode 100644
index 00000000000..195061628b2
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-8.00.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs wrapper
+
+CTF_V="1.08"
+ROGUE_V="2.08"
+XATRIX_V="2.09"
+REF_VK_V="1.0.1"
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+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 )
+	vulkan? ( https://github.com/yquake2/ref_vk/archive/refs/tags/v${REF_VK_V}.tar.gz ->
+		quake2-ref_vk-${REF_VK_V}.tar.gz )
+"
+S="${WORKDIR}/quake2-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+client ctf dedicated openal +opengl rogue softrender vulkan xatrix"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl softrender vulkan ) )
+"
+
+RDEPEND="
+	client? (
+		media-libs/libsdl2[opengl?,video,vulkan?]
+		net-misc/curl
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? ( virtual/opengl )
+	)
+"
+DEPEND="${RDEPEND}
+	client? ( vulkan? ( dev-util/vulkan-headers ) )
+"
+
+DOCS=( CHANGELOG README.md doc )
+
+src_compile() {
+	tc-export CC
+
+	local targets=( game )
+	local emakeargs=(
+		VERBOSE=1
+		WITH_SYSTEMWIDE=yes
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/quake2
+		WITH_OPENAL=$(usex openal)
+	)
+
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	emake "${emakeargs[@]}" config
+	emake "${emakeargs[@]}" "${targets[@]}"
+
+	if use client && use vulkan; then
+		emake -C "${WORKDIR}"/ref_vk-${REF_VK_V} VERBOSE=1
+	fi
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See doc/070_packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+
+		if use vulkan; then
+			doins "${WORKDIR}"/ref_vk-${REF_VK_V}/release/ref_vk.so
+		fi
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in $(usev ctf) $(usev rogue) $(usev xatrix); do
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	keepdir /usr/share/quake2
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you should do one of the following things:"
+		elog " - install games-fps/quake2-data or games-fps/quake2-demodata;"
+		elog " - manually copy game data files into ~/.yq2/ or"
+		elog "   ${EROOT}/usr/share/quake2/."
+		elog "Read ${EROOT}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2021-04-06 18:18 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-04-06 18:18 UTC (permalink / raw
  To: gentoo-commits

commit:     6674471002efc8c7853a8f26229dc7eba79b75f6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 01:44:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 18:18:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66744710

games-fps/yamagi-quake2: drop 7.43 (eutils--)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   1 -
 games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild | 152 ----------------------
 2 files changed, 153 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 1f6bc68feb9..8390668efd2 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,3 @@
-DIST quake2-7.43.tar.xz 1989812 BLAKE2B dbce9e3b65a63637726dda375f0fc64193529a3c1744643290778ee8f1a0eff3067f96dd3e76fa4d138cfbb5e9237f7517f608277e4f5b21729473849b7c8ac3 SHA512 c728609e277330b39fc423d66bbd098e360e7fc8c54500fa5accbc4aaeb9145a00c8ff8be67ce8f36047dbe6d98480bdbe1f330da5b0037517607ada8a63e4b8
 DIST quake2-7.45.tar.xz 1997816 BLAKE2B 1025a3e226e80b456c48fcd76100f46fa03e3ef2c61d70071136f8119f2b2af39b24fa859239217d34d14501127e4880ff7b61b79dc61c79e64dd22fcc44ce0b SHA512 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b
 DIST quake2-ctf-1.07.tar.xz 135880 BLAKE2B 7501d5db676cbc7b523313bf4e5d572cc8711efd09e2390d6aa6980d45bc682e7f137581b8a9a8d4b491de8f8ed7dd1cb32a66c9ed2cc456e114f672cedf2a1c SHA512 de2ab94fc7bb43327170f6aefbaf811e7a0071da2e5c4602354854e46e4c8cfc687a6300e7162c8f1be2f0b42cf2d3edc255c2f44fb0e39adc873a521197a316
 DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
deleted file mode 100644
index 335ae177e9f..00000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils
-
-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/"
-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 ~arm64 ~x86"
-IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
-REQUIRED_USE="
-	|| ( client dedicated )
-	client? ( || ( opengl softrender ) )
-"
-
-DEPEND="
-	client? (
-		media-libs/libsdl2[video]
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? (
-			media-libs/libsdl2[opengl]
-			virtual/opengl
-		)
-	)
-"
-RDEPEND="${DEPEND}
-	client? ( openal? ( media-libs/openal ) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-)
-DOCS=( CHANGELOG README.md doc )
-
-mymake() {
-	emake \
-		VERBOSE=1 \
-		WITH_SYSTEMWIDE=yes \
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_OPENAL=$(usex openal) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		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
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	if use client; then
-		targets+=( client )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you must at least install:"
-		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
-		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
-		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2020-10-28  7:51 Joonas Niilola
  0 siblings, 0 replies; 24+ messages in thread
From: Joonas Niilola @ 2020-10-28  7:51 UTC (permalink / raw
  To: gentoo-commits

commit:     b0a910829ac5189cf794cfd99e750cbd484ce50e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 07:05:10 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 07:51:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0a91082

games-fps/yamagi-quake2: switch eutils.eclass to wrapper.eclass in 7.45

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild
index 0dc97a719c1..de8310ba1bf 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop eutils
+inherit desktop wrapper
 
 CTF_V="1.07"
 ROGUE_V="2.07"


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2020-10-28  7:51 Joonas Niilola
  0 siblings, 0 replies; 24+ messages in thread
From: Joonas Niilola @ 2020-10-28  7:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0173c7857729b9eae87ecfe68c002c201999581a
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Oct 24 23:11:31 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 07:51:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0173c785

games-fps/yamagi-quake2: Version bump to 7.45

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   1 +
 games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild | 149 ++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index d0d70974745..1dea6a99fb5 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,5 +1,6 @@
 DIST quake2-7.42.tar.xz 1987332 BLAKE2B 63ced75746eb031faf949c6b094ec607076f481b8d97eca242f9bf6fd6325afc8dfb5f98fe4f8ba5c5e87b721392f613031fc204b775634fc5292a26fef1d76c SHA512 0f51204fcf14ecb3f1f654e6ee19207836cf4642022569ef202bc12f312f76dbd43695aa4d9f9fb70c8b023f42d1a8fcec25f472a32175ebb0a308211fa40cc0
 DIST quake2-7.43.tar.xz 1989812 BLAKE2B dbce9e3b65a63637726dda375f0fc64193529a3c1744643290778ee8f1a0eff3067f96dd3e76fa4d138cfbb5e9237f7517f608277e4f5b21729473849b7c8ac3 SHA512 c728609e277330b39fc423d66bbd098e360e7fc8c54500fa5accbc4aaeb9145a00c8ff8be67ce8f36047dbe6d98480bdbe1f330da5b0037517607ada8a63e4b8
+DIST quake2-7.45.tar.xz 1997816 BLAKE2B 1025a3e226e80b456c48fcd76100f46fa03e3ef2c61d70071136f8119f2b2af39b24fa859239217d34d14501127e4880ff7b61b79dc61c79e64dd22fcc44ce0b SHA512 1aa161ca03782eba14feecd142d65eb5a9ca5af4b384f21d3e68338cd8d88bd5e71c1678d44285eea692d5d1b2161429270745d880b4caacd6c87c7e76ed404b
 DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
 DIST quake2-ctf-1.07.tar.xz 135880 BLAKE2B 7501d5db676cbc7b523313bf4e5d572cc8711efd09e2390d6aa6980d45bc682e7f137581b8a9a8d4b491de8f8ed7dd1cb32a66c9ed2cc456e114f672cedf2a1c SHA512 de2ab94fc7bb43327170f6aefbaf811e7a0071da2e5c4602354854e46e4c8cfc687a6300e7162c8f1be2f0b42cf2d3edc255c2f44fb0e39adc873a521197a316
 DIST quake2-rogue-2.06.tar.xz 243872 BLAKE2B fa289bb9ecd988dd77dd4d581212fc1c2f964371109123ed77ea0a740b65bc117d787c144d9f246d091df3ff19f1c9f5ed42571cd2d450061de63f032cc3c1d6 SHA512 4f8646f6b6cc2b522291e89f63a6d0273353e27bcafed6fcd5c2e509e938ab76504bfe9e92d398c8cee708af64ffbb7d81e98ea0df1e13ba593db4dff8ddfcf6

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild
new file mode 100644
index 00000000000..0dc97a719c1
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.45.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+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/"
+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 ~arm64 ~x86"
+IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
+REQUIRED_USE="
+	|| ( client dedicated )
+	client? ( || ( opengl softrender ) )
+"
+
+DEPEND="
+	client? (
+		media-libs/libsdl2[video]
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? (
+			media-libs/libsdl2[opengl]
+			virtual/opengl
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	client? ( openal? ( media-libs/openal ) )
+"
+
+DOCS=( CHANGELOG README.md doc )
+
+mymake() {
+	emake \
+		VERBOSE=1 \
+		WITH_SYSTEMWIDE=yes \
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
+		WITH_OPENAL=$(usex openal) \
+		"$@"
+}
+
+src_prepare() {
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
+		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
+
+	default
+}
+
+src_compile() {
+	local targets=( game )
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	mymake config
+	mymake "${targets[@]}"
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See stuff/packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you must at least install:"
+		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
+		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
+		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2020-07-20 14:04 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2020-07-20 14:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e89488c1b90008b23d43d0438dba2f8a88f24694
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 14:04:18 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 14:04:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89488c1

games-fps/yamagi-quake2: arm64 keyworded (bug #730706)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
index e9db574e8b5..335ae177e9f 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.43.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/quake2-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
 REQUIRED_USE="
 	|| ( client dedicated )


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2020-04-17 15:10 Joonas Niilola
  0 siblings, 0 replies; 24+ messages in thread
From: Joonas Niilola @ 2020-04-17 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     beeee493fac2d5e5233160d9e6fd210064d29d07
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Mar  8 00:12:09 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 15:10:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beeee493

games-fps/yamagi-quake2: Remove old

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14861
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   3 -
 games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild | 149 ----------------------
 2 files changed, 152 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 7c648cb4640..d0d70974745 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,11 +1,8 @@
-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-ctf-1.07.tar.xz 135880 BLAKE2B 7501d5db676cbc7b523313bf4e5d572cc8711efd09e2390d6aa6980d45bc682e7f137581b8a9a8d4b491de8f8ed7dd1cb32a66c9ed2cc456e114f672cedf2a1c SHA512 de2ab94fc7bb43327170f6aefbaf811e7a0071da2e5c4602354854e46e4c8cfc687a6300e7162c8f1be2f0b42cf2d3edc255c2f44fb0e39adc873a521197a316
-DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
 DIST quake2-rogue-2.06.tar.xz 243872 BLAKE2B fa289bb9ecd988dd77dd4d581212fc1c2f964371109123ed77ea0a740b65bc117d787c144d9f246d091df3ff19f1c9f5ed42571cd2d450061de63f032cc3c1d6 SHA512 4f8646f6b6cc2b522291e89f63a6d0273353e27bcafed6fcd5c2e509e938ab76504bfe9e92d398c8cee708af64ffbb7d81e98ea0df1e13ba593db4dff8ddfcf6
 DIST quake2-rogue-2.07.tar.xz 243828 BLAKE2B f292bc7318ee8094b0dae0219fbf7882fb9a168ee2b311c254b5cabdb53f6a65350be80ea09185f66b5e3af4e670c3dd21235a06aeec2f334dc84cb474cb02da SHA512 21b0dca16240307c1e7a6c2a2c08e380fabf4f6bdbf1981a2183056ccd5f05f7003f41b38b4b131f9b16909b4c714ff2ef23638601b0c420003674bc9a9d0789
-DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc
 DIST quake2-xatrix-2.07.tar.xz 192404 BLAKE2B 54772f1158af82211a5c925676e1399bd9debfa8f336a566dd7c22c6f50eb488030c871a7952b9eb00a7a8498560aed332dfd388074bb5a733ed5e979d59d9dc SHA512 72400afa98faf38559dfbc6dcfd01a16902adc782065bc1bbae4d773b5c139543d79f465195db72f0dbaf33999c667c65fd3582a8029db5b50ea5295d278b2a7
 DIST quake2-xatrix-2.08.tar.xz 192760 BLAKE2B ce6d4bae8ed2970e9ca9971c32fba6b226d7d7616dc7e5168d1504f6ae62ece286c21c22f0f8a3d2df48f7b63b53ec681efa92074f918ef4e5c9b98667e2682b SHA512 cc8fd7add3ded10ad88f1a1629c7222c26a398fa47c2c1aa6091dc310b7f2f5830c997c534b38cc0f6d4153357d76901ba48dbd505ce96f95d84f97f2f0dddd9

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild
deleted file mode 100644
index 5e8aa0b53d2..00000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 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
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
-REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
-
-COMMON_DEPEND="
-	client? (
-		media-libs/libsdl2[video]
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-		opengl? (
-			media-libs/libsdl2[opengl]
-			virtual/opengl
-		)
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	client? ( openal? ( media-libs/openal ) )
-"
-
-DEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-)
-DOCS=( CHANGELOG README.md doc/. )
-
-mymake() {
-	emake \
-		VERBOSE=1 \
-		WITH_SYSTEMWIDE=yes \
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_OPENAL=$(usex openal) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	if use client; then
-		targets+=( client )
-		use opengl && targets+=( ref_gl1 ref_gl3 )
-		use softrender && targets+=( ref_soft )
-	fi
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		if use client; then
-			local addon_name
-			case ${addon} in
-				ctf)    addon_name="CTF" ;;
-				rogue)  addon_name="Ground Zero" ;;
-				xatrix) addon_name="The Reckoning" ;;
-			esac
-
-			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-		fi
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you must at least install:"
-		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
-		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
-		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2019-06-03 15:54 Stefan Strogin
  0 siblings, 0 replies; 24+ messages in thread
From: Stefan Strogin @ 2019-06-03 15:54 UTC (permalink / raw
  To: gentoo-commits

commit:     de69d3e0f97c2e2da471e59bbda2ba3c89022c96
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 15:45:57 2019 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 15:54:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de69d3e0

games-fps/yamagi-quake2: add games@ to maintainers

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-fps/yamagi-quake2/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/games-fps/yamagi-quake2/metadata.xml b/games-fps/yamagi-quake2/metadata.xml
index d965a72ff59..62861e43ce5 100644
--- a/games-fps/yamagi-quake2/metadata.xml
+++ b/games-fps/yamagi-quake2/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">yquake2/yquake2</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2019-06-03 15:54 Stefan Strogin
  0 siblings, 0 replies; 24+ messages in thread
From: Stefan Strogin @ 2019-06-03 15:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2566c62dff1febcc589b92dbc77f7e9feaa3620a
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Mon Jun  3 13:24:47 2019 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 15:54:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2566c62d

games-fps/yamagi-quake2: version bump to 7.41

Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/12182
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                  |   1 +
 games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild | 149 ++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index efdd4db13ee..bc7206ff191 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,5 +1,6 @@
 DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
 DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
+DIST quake2-7.41.tar.xz 1978952 BLAKE2B 9d3626f102b652c443caea294f7f66dc46869612b64d16c5f2e9b7f28a83800a0653450f8fc44ebaa83e01ddfaf2b2cd5dd9c6feb8001b5cabd7df32171e035b SHA512 fd2c991274415eb38cf3deb7562f7c51c7f8e935cf7215eba7e8ae088f25cddf95e86221fcbbb5fcc8bd97e264b147951bf5f4aecb8ee54973d46af7ef39d3af
 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

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild
new file mode 100644
index 00000000000..5e8aa0b53d2
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.41.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2019 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
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
+REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
+
+COMMON_DEPEND="
+	client? (
+		media-libs/libsdl2[video]
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? (
+			media-libs/libsdl2[opengl]
+			virtual/opengl
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	client? ( openal? ( media-libs/openal ) )
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/quake2-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-flags.patch
+)
+DOCS=( CHANGELOG README.md doc/. )
+
+mymake() {
+	emake \
+		VERBOSE=1 \
+		WITH_SYSTEMWIDE=yes \
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
+		WITH_OPENAL=$(usex openal) \
+		"$@"
+}
+
+src_prepare() {
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
+		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags-r2.patch
+		popd >/dev/null || die
+	done
+
+	default
+}
+
+src_compile() {
+	local targets=( game )
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	mymake config
+	mymake "${targets[@]}"
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See stuff/packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you must at least install:"
+		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
+		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
+		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2018-09-17 15:46 Michał Górny
  0 siblings, 0 replies; 24+ messages in thread
From: Michał Górny @ 2018-09-17 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     b250198dbd864c5f26e55f21d625e105cbbcfa20
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Sep  9 13:36:22 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 15:37:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b250198d

games-fps/yamagi-quake2: remove old

Closes: https://github.com/gentoo/gentoo/pull/9812

 games-fps/yamagi-quake2/Manifest                  |   1 -
 games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild | 146 ----------------------
 2 files changed, 147 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 677801d4605..068b82c3215 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,3 @@
-DIST quake2-7.20.tar.xz 1852212 BLAKE2B 87a19be70680866b8b697ea4632239d33fe196dc648553d4a113025d9dc7996a27db2ec0178b28c04ad77854400d9f159bd800681a2bdf5a0121ef764e163ecb SHA512 466c21777e07da6aaec29cf9d3c9246a23d2157398a7e5ff1ad006f0fa7fd89e379b109936780361f03722f896ac34a188d12fc0a51cb543079e07aa6c9240df
 DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
 DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild
deleted file mode 100644
index 779346e191f..00000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils
-
-CTF_V=1.05
-ROGUE_V=2.04
-XATRIX_V=2.05
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated ogg openal rogue xatrix"
-REQUIRED_USE="|| ( client dedicated )"
-
-RDEPEND="sys-libs/zlib:0=
-	client? (
-		media-libs/libsdl2[opengl,video]
-		virtual/opengl
-		ogg? (
-			media-libs/libogg
-			media-libs/libvorbis
-		)
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-	"${FILESDIR}"/${PN}-zlib.patch
-)
-DOCS=( CHANGELOG CONTRIBUTE README.md )
-
-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) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	use client && targets+=( client ref_gl1 ref_gl3 )
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		local addon_name
-		case ${addon} in
-			ctf)    addon_name="CTF" ;;
-			rogue)  addon_name="Ground Zero" ;;
-			xatrix) addon_name="The Reckoning" ;;
-		esac
-
-		make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-		make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you must at least install:"
-		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
-		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
-		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2018-09-17 15:46 Michał Górny
  0 siblings, 0 replies; 24+ messages in thread
From: Michał Górny @ 2018-09-17 15:46 UTC (permalink / raw
  To: gentoo-commits

commit:     01dfab5cfc481506b0af4e468d2528dc543a8a4c
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Sep  9 13:33:31 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 15:37:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01dfab5c

games-fps/yamagi-quake2: version bump to 7.30

Changes in ebuild reflects the following upstream changes:
- external dependencies on libvorbis/libogg and libz are gone;
- libopenal cannot be linked at compile time anymore;
- support for SDL 1.2 and CD-audio playback is gone.

 games-fps/yamagi-quake2/Manifest                  |   1 +
 games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild | 149 ++++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index d7bff3d4fa9..677801d4605 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,5 +1,6 @@
 DIST quake2-7.20.tar.xz 1852212 BLAKE2B 87a19be70680866b8b697ea4632239d33fe196dc648553d4a113025d9dc7996a27db2ec0178b28c04ad77854400d9f159bd800681a2bdf5a0121ef764e163ecb SHA512 466c21777e07da6aaec29cf9d3c9246a23d2157398a7e5ff1ad006f0fa7fd89e379b109936780361f03722f896ac34a188d12fc0a51cb543079e07aa6c9240df
 DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
+DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
 DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
 DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild
new file mode 100644
index 00000000000..f8c0f14af23
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.30.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils
+
+CTF_V=1.05
+ROGUE_V=2.04
+XATRIX_V=2.05
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client ctf dedicated openal +opengl rogue softrender xatrix"
+REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
+
+COMMON_DEPEND="
+	client? (
+		media-libs/libsdl2[video]
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+		opengl? (
+			media-libs/libsdl2[opengl]
+			virtual/opengl
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	client? ( openal? ( media-libs/openal ) )
+"
+
+DEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/quake2-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-flags.patch
+)
+DOCS=( CHANGELOG CONTRIBUTE README.md )
+
+mymake() {
+	emake \
+		VERBOSE=1 \
+		WITH_SYSTEMWIDE=yes \
+		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
+		WITH_OPENAL=$(usex openal) \
+		"$@"
+}
+
+src_prepare() {
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
+		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
+		popd >/dev/null || die
+	done
+
+	default
+}
+
+src_compile() {
+	local targets=( game )
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
+	use dedicated && targets+=( server )
+
+	mymake config
+	mymake "${targets[@]}"
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See stuff/packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
+	done
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you must at least install:"
+		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
+		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
+		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2018-07-22 23:22 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2018-07-22 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     4c82edf83be8090504a799ec2a3dab478b0e5e63
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Jul 22 00:09:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 23:21:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c82edf8

games-fps/yamagi-quake2: fix USE=-client

Do not build/install useless files with USE=-client
Closes: https://github.com/gentoo/gentoo/pull/9309

 ...e2-7.21.ebuild => yamagi-quake2-7.21-r1.ebuild} | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
similarity index 87%
rename from games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild
rename to games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
index 70d72875290..843343c0aca 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.21-r1.ebuild
@@ -76,10 +76,12 @@ src_prepare() {
 
 src_compile() {
 	local targets=( game )
-	use client && targets+=( client )
+	if use client; then
+		targets+=( client )
+		use opengl && targets+=( ref_gl1 ref_gl3 )
+		use softrender && targets+=( ref_soft )
+	fi
 	use dedicated && targets+=( server )
-	use opengl && targets+=( ref_gl1 ref_gl3 )
-	use softrender && targets+=( ref_soft )
 
 	mymake config
 	mymake "${targets[@]}"
@@ -121,15 +123,17 @@ src_install() {
 		insinto /usr/lib/yamagi-quake2/${addon}
 		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
 
-		local addon_name
-		case ${addon} in
-			ctf)    addon_name="CTF" ;;
-			rogue)  addon_name="Ground Zero" ;;
-			xatrix) addon_name="The Reckoning" ;;
-		esac
-
-		make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-		make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		if use client; then
+			local addon_name
+			case ${addon} in
+				ctf)    addon_name="CTF" ;;
+				rogue)  addon_name="Ground Zero" ;;
+				xatrix) addon_name="The Reckoning" ;;
+			esac
+
+			make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+			make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+		fi
 	done
 
 	einstalldocs


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2018-07-21 21:56 Patrice Clement
  0 siblings, 0 replies; 24+ messages in thread
From: Patrice Clement @ 2018-07-21 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     9024bb625fe45b08d86d2432d9be72d7663f7dda
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Fri Jul 20 22:28:15 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 21:56:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9024bb62

games-fps/yamagi-quake2: remove old.

 games-fps/yamagi-quake2/Manifest                  |   1 -
 games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild | 132 ----------------------
 2 files changed, 133 deletions(-)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 236cd44dcf2..d7bff3d4fa9 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,4 +1,3 @@
-DIST quake2-7.10.tar.xz 1792748 BLAKE2B 853d6db1eec46ce40952fd413a259653275081599a940941fc883921b310f436be62b80a1d911a0d8f95a33e540e60bd6db2377370cc443cbaa9c3eec6ae055f SHA512 46247c3e2c8e6dcb056dfc7785dd63bf4f896719894a1c5467f2eb313cc3d8a892fda9bafc2ca760a9ac96f6b8e23485a8740b03e118cf9a524f68657183fbb9
 DIST quake2-7.20.tar.xz 1852212 BLAKE2B 87a19be70680866b8b697ea4632239d33fe196dc648553d4a113025d9dc7996a27db2ec0178b28c04ad77854400d9f159bd800681a2bdf5a0121ef764e163ecb SHA512 466c21777e07da6aaec29cf9d3c9246a23d2157398a7e5ff1ad006f0fa7fd89e379b109936780361f03722f896ac34a188d12fc0a51cb543079e07aa6c9240df
 DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild
deleted file mode 100644
index 09f38aad41c..00000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils
-
-CTF_V=1.05
-ROGUE_V=2.04
-XATRIX_V=2.05
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated ogg openal rogue xatrix"
-REQUIRED_USE="|| ( client dedicated )"
-
-RDEPEND="sys-libs/zlib:0=
-	client? (
-		media-libs/libsdl2[opengl,video]
-		virtual/opengl
-		ogg? (
-			media-libs/libogg
-			media-libs/libvorbis
-		)
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-respect-flags.patch )
-DOCS=( CHANGELOG CONTRIBUTE README.md )
-
-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) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	use client && targets+=( client ref_gl1 ref_gl3 )
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		local addon_name
-		case ${addon} in
-			ctf)    addon_name="CTF" ;;
-			rogue)  addon_name="Ground Zero" ;;
-			xatrix) addon_name="The Reckoning" ;;
-		esac
-
-		make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-		make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2018-07-21 21:56 Patrice Clement
  0 siblings, 0 replies; 24+ messages in thread
From: Patrice Clement @ 2018-07-21 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     a032c2d8c8da689843f1e1a6f56accb28ca101c9
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Fri Jul 20 22:00:18 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 21:55:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a032c2d8

games-fps/yamagi-quake2: version bump to 7.21.

Closes: https://github.com/gentoo/gentoo/pull/9301

 games-fps/yamagi-quake2/Manifest                  |   1 +
 games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild | 146 ++++++++++++++++++++++
 2 files changed, 147 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index cb700cafbe4..236cd44dcf2 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,5 +1,6 @@
 DIST quake2-7.10.tar.xz 1792748 BLAKE2B 853d6db1eec46ce40952fd413a259653275081599a940941fc883921b310f436be62b80a1d911a0d8f95a33e540e60bd6db2377370cc443cbaa9c3eec6ae055f SHA512 46247c3e2c8e6dcb056dfc7785dd63bf4f896719894a1c5467f2eb313cc3d8a892fda9bafc2ca760a9ac96f6b8e23485a8740b03e118cf9a524f68657183fbb9
 DIST quake2-7.20.tar.xz 1852212 BLAKE2B 87a19be70680866b8b697ea4632239d33fe196dc648553d4a113025d9dc7996a27db2ec0178b28c04ad77854400d9f159bd800681a2bdf5a0121ef764e163ecb SHA512 466c21777e07da6aaec29cf9d3c9246a23d2157398a7e5ff1ad006f0fa7fd89e379b109936780361f03722f896ac34a188d12fc0a51cb543079e07aa6c9240df
+DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
 DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
 DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild
new file mode 100644
index 00000000000..779346e191f
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils
+
+CTF_V=1.05
+ROGUE_V=2.04
+XATRIX_V=2.05
+
+DESCRIPTION="Quake 2 engine focused on single player"
+HOMEPAGE="https://www.yamagi.org/quake2/"
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client ctf dedicated ogg openal rogue xatrix"
+REQUIRED_USE="|| ( client dedicated )"
+
+RDEPEND="sys-libs/zlib:0=
+	client? (
+		media-libs/libsdl2[opengl,video]
+		virtual/opengl
+		ogg? (
+			media-libs/libogg
+			media-libs/libvorbis
+		)
+		openal? ( media-libs/openal )
+		!openal? ( media-libs/libsdl2[sound] )
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/quake2-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-respect-flags.patch
+	"${FILESDIR}"/${PN}-zlib.patch
+)
+DOCS=( CHANGELOG CONTRIBUTE README.md )
+
+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) \
+		"$@"
+}
+
+src_prepare() {
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
+		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
+		popd >/dev/null || die
+	done
+
+	default
+}
+
+src_compile() {
+	local targets=( game )
+	use client && targets+=( client ref_gl1 ref_gl3 )
+	use dedicated && targets+=( server )
+
+	mymake config
+	mymake "${targets[@]}"
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
+	done
+}
+
+src_install() {
+	insinto /usr/lib/yamagi-quake2
+	# Yamagi Quake II expects all binaries to be in the same directory
+	# See stuff/packaging.md for more info
+	exeinto /usr/lib/yamagi-quake2
+	doins -r release/.
+
+	if use client; then
+		doexe release/quake2
+		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
+
+		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
+		make_desktop_entry "yquake2" "Yamagi Quake II"
+	fi
+
+	if use dedicated; then
+		doexe release/q2ded
+		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
+	fi
+
+	insinto /usr/lib/yamagi-quake2/baseq2
+	doins stuff/yq2.cfg
+
+	local addon
+	for addon in ctf rogue xatrix; do
+		use ${addon} || continue
+
+		insinto /usr/lib/yamagi-quake2/${addon}
+		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
+
+		local addon_name
+		case ${addon} in
+			ctf)    addon_name="CTF" ;;
+			rogue)  addon_name="Ground Zero" ;;
+			xatrix) addon_name="The Reckoning" ;;
+		esac
+
+		make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
+		make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
+	done
+
+	einstalldocs
+	if use client; then
+		docinto examples
+		dodoc stuff/cdripper.sh
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "In order to play, you must at least install:"
+		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
+		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
+		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
+		elog
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/
@ 2018-07-21 21:56 Patrice Clement
  0 siblings, 0 replies; 24+ messages in thread
From: Patrice Clement @ 2018-07-21 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     0e19dc2e1726a8030992ead1dafdacfcdbca0cd2
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Fri Jul 20 22:24:09 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 21:56:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e19dc2e

games-fps/yamagi-quake2: optionally build software renderer.

 games-fps/yamagi-quake2/metadata.xml              |  1 +
 games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/games-fps/yamagi-quake2/metadata.xml b/games-fps/yamagi-quake2/metadata.xml
index c573477de06..d965a72ff59 100644
--- a/games-fps/yamagi-quake2/metadata.xml
+++ b/games-fps/yamagi-quake2/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="client">Build client</flag>
 		<flag name="ctf">Build support for the 'Capture The Flag' addon</flag>
 		<flag name="rogue">Build support for the 'Ground Zero' Mission Pack</flag>
+		<flag name="softrender">Build software renderer</flag>
 		<flag name="xatrix">Build support for the 'The Reckoning' Mission Pack</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild
index 779346e191f..70d72875290 100644
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.21.ebuild
@@ -19,19 +19,22 @@ 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 rogue xatrix"
-REQUIRED_USE="|| ( client dedicated )"
+IUSE="+client ctf dedicated ogg openal +opengl rogue softrender xatrix"
+REQUIRED_USE="|| ( client dedicated ) client? ( || ( opengl softrender ) )"
 
 RDEPEND="sys-libs/zlib:0=
 	client? (
-		media-libs/libsdl2[opengl,video]
-		virtual/opengl
+		media-libs/libsdl2[video]
 		ogg? (
 			media-libs/libogg
 			media-libs/libvorbis
 		)
 		openal? ( media-libs/openal )
 		!openal? ( media-libs/libsdl2[sound] )
+		opengl? (
+			media-libs/libsdl2[opengl]
+			virtual/opengl
+		)
 	)
 "
 
@@ -73,8 +76,10 @@ src_prepare() {
 
 src_compile() {
 	local targets=( game )
-	use client && targets+=( client ref_gl1 ref_gl3 )
+	use client && targets+=( client )
 	use dedicated && targets+=( server )
+	use opengl && targets+=( ref_gl1 ref_gl3 )
+	use softrender && targets+=( ref_soft )
 
 	mymake config
 	mymake "${targets[@]}"


^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2023-12-18 18:43 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-28  0:11 [gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2023-12-18 18:43 Ionen Wolkens
2023-12-18 18:43 Ionen Wolkens
2023-03-09 20:13 Ionen Wolkens
2022-12-19  7:23 Ionen Wolkens
2022-10-03 18:34 Ionen Wolkens
2022-10-03 18:34 Ionen Wolkens
2022-06-16  9:02 Jakov Smolić
2022-04-29 11:23 Ionen Wolkens
2022-04-18 13:19 Ionen Wolkens
2021-07-04 11:53 Ionen Wolkens
2021-04-06 18:18 Sam James
2020-10-28  7:51 Joonas Niilola
2020-10-28  7:51 Joonas Niilola
2020-07-20 14:04 Sam James
2020-04-17 15:10 Joonas Niilola
2019-06-03 15:54 Stefan Strogin
2019-06-03 15:54 Stefan Strogin
2018-09-17 15:46 Michał Górny
2018-09-17 15:46 Michał Górny
2018-07-22 23:22 Andreas Sturmlechner
2018-07-21 21:56 Patrice Clement
2018-07-21 21:56 Patrice Clement
2018-07-21 21:56 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox