From 250b6c18b161f3ae5263a946de34e70cd7d6afc5 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sat, 10 Apr 2021 13:46:34 +0000
Subject: games-fps/ezquake-bin: add missing x11-libs/libXpm dep

Closes: https://bugs.gentoo.org/750329
Signed-off-by: Sam James <sam@gentoo.org>
---
 games-fps/ezquake-bin/ezquake-bin-2.2-r1.ebuild | 71 ------------------------
 games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild | 72 +++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 71 deletions(-)
 delete mode 100644 games-fps/ezquake-bin/ezquake-bin-2.2-r1.ebuild
 create mode 100644 games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild

(limited to 'games-fps')

diff --git a/games-fps/ezquake-bin/ezquake-bin-2.2-r1.ebuild b/games-fps/ezquake-bin/ezquake-bin-2.2-r1.ebuild
deleted file mode 100644
index f84c116cd555..000000000000
--- a/games-fps/ezquake-bin/ezquake-bin-2.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit wrapper
-
-MY_FULL_PV=1.9.3
-MY_PN="${PN/-bin/}"
-DESCRIPTION="Quakeworld client with mqwcl functionality and many more features"
-HOMEPAGE="http://ezquake.sf.net/"
-SRC_URI="
-	amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz
-		mirror://sourceforge/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz )
-	x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_${MY_FULL_PV}.tar.gz
-		mirror://sourceforge/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz )
-"
-S="${WORKDIR}"/${MY_PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cdinstall"
-
-RESTRICT="strip mirror"
-
-DEPEND="cdinstall? ( games-fps/quake1-data )"
-RDEPEND="
-		${DEPEND}
-		virtual/opengl
-		x11-libs/libXxf86dga
-		x11-libs/libXxf86vm
-"
-
-MY_DIR=opt/${PN}
-QA_PREBUILT="${MY_DIR:1}/ezquake*"
-
-src_unpack() {
-	unpack ${A}
-
-	if use amd64; then
-		mv ${MY_PN}_linux-x86_64.${MY_FULL_PV} "${MY_PN}" || die
-		mv ezquake-gl_linux-x64.glx "${MY_PN}"/ezquake-gl.glx || die
-	else
-		mv ${MY_PN}_linux-x86.${MY_FULL_PV} "${MY_PN}" || die
-		mv ezquake-gl_linux-x86.glx "${MY_PN}"/ezquake-gl.glx || die
-	fi
-}
-
-src_install() {
-	exeinto ${MY_DIR}
-	insinto ${MY_DIR}
-
-	doexe ezquake-gl.glx
-	doins -r ezquake qw
-	dosym ../../usr/share/quake1/id1 ${MY_DIR}/id1
-	make_wrapper ezquake-gl.glx ./ezquake-gl.glx "${MY_DIR}" "${MY_DIR}"
-}
-
-pkg_postinst() {
-	if ! use cdinstall; then
-		elog "NOTE that this client doesn't include .pak files. You *should*"
-		elog "enable \"cdinstall\" flag or install quake1-demodata with the symlink use flag."
-		elog "You can also copy the files from your Quake1 CD to"
-		elog "  ${MY_DIR}/quake1/id1 (all names lowercase)"
-		elog ""
-		elog "You may also want to check:"
-		elog " http://fuhquake.quakeworld.nu - complete howto on commands and variables"
-		elog " http://equake.quakeworld.nu - free package containing various files"
-	fi
-}
diff --git a/games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild b/games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild
new file mode 100644
index 000000000000..2a31a079e3b6
--- /dev/null
+++ b/games-fps/ezquake-bin/ezquake-bin-2.2-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit wrapper
+
+MY_FULL_PV=1.9.3
+MY_PN="${PN/-bin/}"
+DESCRIPTION="Quakeworld client with mqwcl functionality and many more features"
+HOMEPAGE="http://ezquake.sf.net/"
+SRC_URI="
+	amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz
+		mirror://sourceforge/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz )
+	x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_${MY_FULL_PV}.tar.gz
+		mirror://sourceforge/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz )
+"
+S="${WORKDIR}"/${MY_PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="cdinstall"
+
+RESTRICT="strip mirror"
+
+DEPEND="cdinstall? ( games-fps/quake1-data )"
+RDEPEND="
+	${DEPEND}
+	virtual/opengl
+	x11-libs/libXpm
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+"
+
+MY_DIR=opt/${PN}
+QA_PREBUILT="${MY_DIR}/ezquake*"
+
+src_unpack() {
+	unpack ${A}
+
+	if use amd64; then
+		mv ${MY_PN}_linux-x86_64.${MY_FULL_PV} "${MY_PN}" || die
+		mv ezquake-gl_linux-x64.glx "${MY_PN}"/ezquake-gl.glx || die
+	else
+		mv ${MY_PN}_linux-x86.${MY_FULL_PV} "${MY_PN}" || die
+		mv ezquake-gl_linux-x86.glx "${MY_PN}"/ezquake-gl.glx || die
+	fi
+}
+
+src_install() {
+	exeinto ${MY_DIR}
+	insinto ${MY_DIR}
+
+	doexe ezquake-gl.glx
+	doins -r ezquake qw
+	dosym ../../usr/share/quake1/id1 ${MY_DIR}/id1
+	make_wrapper ezquake-gl.glx ./ezquake-gl.glx "${MY_DIR}" "${MY_DIR}"
+}
+
+pkg_postinst() {
+	if ! use cdinstall; then
+		elog "NOTE that this client doesn't include .pak files. You *should*"
+		elog "enable \"cdinstall\" flag or install quake1-demodata with the symlink use flag."
+		elog "You can also copy the files from your Quake1 CD to"
+		elog "  ${MY_DIR}/quake1/id1 (all names lowercase)"
+		elog ""
+		elog "You may also want to check:"
+		elog " http://fuhquake.quakeworld.nu - complete howto on commands and variables"
+		elog " http://equake.quakeworld.nu - free package containing various files"
+	fi
+}
-- 
cgit v1.2.3-65-gdbad