[gentoo-commits] repo/gentoo:master commit in: games-fps/yamagi-quake2/, games-fps/yamagi-quake2/files/

[Michał Górny]

commit:     79371c6073162a55dd76cfd218c1b080da342aea
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Apr  7 22:54:36 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 06:51:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79371c60

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

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-fps/yamagi-quake2/Manifest                   |   4 +
 .../yamagi-quake2-addon-respect-flags-r2.patch     |  33 +++++
 games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild  | 149 +++++++++++++++++++++
 3 files changed, 186 insertions(+)

diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
index 068b82c3215..8a129d523fa 100644
--- a/games-fps/yamagi-quake2/Manifest
+++ b/games-fps/yamagi-quake2/Manifest
@@ -1,5 +1,9 @@
 DIST quake2-7.21.tar.xz 1854928 BLAKE2B c8a97503b5304d6f02d562495970e49b7cb7db41ff4a5c726f69c3f6df145e9dccd4d66e217176ae9bcc31fed16c8d595bc969b4bf32e3e12aced2875c857847 SHA512 ddd0811b9c3b55dd5df9fa028951882d5aa40769ba518f42c8f37643bb7a397c125a8897d9dc10306d466d4aeb927ea685b29470cbde29e6fbd6d2d0aafa7c1a
 DIST quake2-7.30.tar.xz 1939836 BLAKE2B 3e952c65cc535f8e1cbe69953c302e681d15f4227fce8bf4a2a0fdadefc8ceb7137e5427cd969ad55b9c2aa994131a0dec71611957f71dbcc9559b9cbc9f4322 SHA512 ea352353c8d6f2c396534208c2f287a06cd6c9d9e60248a6a7f26a84c0cc8b21ab890e06591e470ceea09a1234f5c2dbc1b171f4dbca62d91b2ac33812fdf2e7
+DIST quake2-7.40.tar.xz 1972020 BLAKE2B be5c01dbcb226f343d18f9d318022edff56bac6f953a0b85cbe3c108451c51020339a12b63fd82803cb9cfbbc26f5dfc230b4cad870ab116cb0333baa0160173 SHA512 23ac94b3b5aa28ad7d36e585f00af4aa285db3f93044175c9f65169fb2f89f5d721a3833a386146cf278c4db47846a442ebd8acd98c97ffa6f149d5949dcd5b1
 DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
+DIST quake2-ctf-1.06.tar.xz 135464 BLAKE2B 457ab883ba9ecfb723d890f5c9e3da710aae4ed5fa4e530c8028b0fa93186350e6ed1b483b89ddf98cbb3f3b1992a15c33af5d181073395b61e5b9a7c9987d88 SHA512 24c58f895d4056127e6f714c618d53b80bd75968758d8aa729deba750297efd5d6c40bd69afd98ebbf0d231bd59909e6438ec64b258883d8cfd33d33e928b2f9
 DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
+DIST quake2-rogue-2.05.tar.xz 241120 BLAKE2B 58be655bfcba9c6ee66616dbedaf01c4329d656c205ad99910dccb095981a8f29b09d557e76f9e43df21f36eebeb5ad0c0f2788d2bee2bc1cfe68dda824df5d1 SHA512 521860cc3c46e8679f0dee2b9bc6c3a643439f560ad2437e2961e746285a95fa118201d516eefefdd8b5fe7da8ec5ea0c9fae8910751256a0d986300497631ff
 DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a
+DIST quake2-xatrix-2.06.tar.xz 190560 BLAKE2B 945e80159cd7630280290f6930e1343fdf9dccdbd44d14cd5b36eccae9499d2cd6eddb1a3967721b61349fa60e48c720e4db66fdc1d8930628864c7fe2cd4ada SHA512 98557ed3fc4fddcd36d47dab207b8101b82f40bd976b11195b229a1073ec04216c06dc119269f287fbd9da0418671521ab6393008f2486ab113940d5fec6bfdc

diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
new file mode 100644
index 00000000000..bb800aeaf3c
--- /dev/null
+++ b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags-r2.patch
@@ -0,0 +1,33 @@
+--- quake2-xatrix-2.06.orig/Makefile	2019-02-05 10:56:06.000000000 +0300
++++ quake2-xatrix-2.06/Makefile	2019-04-08 01:24:04.124176498 +0300
+@@ -75,11 +75,11 @@
+ #
+ # -MMD to generate header dependencies.
+ ifeq ($(OSTYPE), Darwin)
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -fwrapv -arch i386 -arch x86_64
+ else
+-CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
+-		  -Wall -pipe -g -MMD -fwrapv
++CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
++		  -Wall -MMD -fwrapv
+ endif
+ 
+ # ----------
+@@ -107,11 +107,11 @@
+ 
+ # Base LDFLAGS.
+ ifeq ($(OSTYPE), Darwin)
+-LDFLAGS := -shared -arch i386 -arch x86_64
++LDFLAGS += -shared -arch i386 -arch x86_64
+ else ifeq ($(OSTYPE), Windows)
+-LDFLAGS := -shared -static-libgcc
++LDFLAGS += -shared -static-libgcc
+ else
+-LDFLAGS := -shared
++LDFLAGS += -shared
+ endif
+ 
+ # ----------

diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.40.ebuild
new file mode 100644
index 00000000000..5e8aa0b53d2
--- /dev/null
+++ b/games-fps/yamagi-quake2/yamagi-quake2-7.40.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
+}