gentoo resync : 28.04.2021

4 files changed, 37 insertions, 29 deletions

diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
index ee12bdf6a0fe..16399f0aad3a 100644
--- a/games-fps/qudos/Manifest
+++ b/games-fps/qudos/Manifest
@@ -1,6 +1,6 @@
-AUX qudos-0.40.1-gnusource.patch 338 BLAKE2B 31b811ca4592ee82e15cc55ab0d5e9e054dc3456f421bada3be8c41993bb7e15ae40f1c53b8aa54e9600ac850c5c4336a67647863c4f6e2b6b473f49a40b8fac SHA512 6e6411e0d6a4c48a82f70cc83eb64eb8b86a15f0ffa552007cb5af6a8d0f718527f6acbcdb80393b45344e133f52ee366cf7923423afae25b3c6ab10829dae98
-AUX qudos-0.40.1-libpng15.patch 205 BLAKE2B 254b56d3933f6eaa5c818042b7875c978c8864b2db711e9fe820942aa3316f593eb9ccd20558ccc95083b6350075e6830fcddb1d694b4e27e7dab6727d91fa8f SHA512 4a2ccb3566f0d3126910b48c024fc5b9d40fe471ca73ce043bc8c8339d2a08f124b921e622bdee05ed007861f4b816941307184bfcbdb8281eca02733b289f70
+AUX qudos-0.40.1-gnusource.patch 265 BLAKE2B beb6c3f71b39c28789e3dcaa58185464a312d63fe416324ee7cbc8eec084af41a8ca7590e95b19c02a2bfaacc510f7c0c477c1e96cf8726bfc63ae92076d0e30 SHA512 99e30dbcd4773021e6d8e2dc20cbf054534c1d18d86877688bdcb5ea34e7644e877ae0a674baaa471283899c596293336faa7afd4492336b3284d77256fd318b
+AUX qudos-0.40.1-libpng15.patch 209 BLAKE2B 9fb92e63f23f2acd2b5f14e0ef8d85385af868fcc1ef7200b35a18a979ef556b33a49325c860e54e3ae11aabb7a70097fb0733f3b826b78d650dcf2caf1b3124 SHA512 5e8fd8eef45902dbd41e64f7fcd3a31c91f19edc71e2eb1c89d161f46ef4f4c04894f27db8e0c5f9946673bdf72580aac067c63297214fe45531119d1f948380
 DIST QuDos-0.40.1-src.tar.bz2 2031636 BLAKE2B 4940f589cc6239e1489bb81f2e0c0afd6efb36930595c57131927b777913c904ada04883eb5f12f9aaf0ba06d687bf4be8b03f369dd9684fe21d7b1068240599 SHA512 97b9c6bac0d09c060ab33174604deb2781f0ebdc48b00bd0bc402523fb04cdf84edd8abc18507bba8c7e616f6d460a1de6debc96ec39bb5562b20a7f06eea734
 DIST QuDos-0.40.1.pk3 4210489 BLAKE2B 98e07682368e52f4c318e7b9ab98d01b0363986bfea54edff3b13f7f2f4cad20de0146eb498569d024d22200830b341b02f135bf50df4a317915429bb1437439 SHA512 19c3c6b3d17cbd9642320d8eb7a83d667afeafd0ee5eb818e9f07be71e2ab69182474c1f529ecbcfcfa59590bafedb0de3c70dfff10e4bc7a6e07a1546f27d4b
-EBUILD qudos-0.40.1.ebuild 4165 BLAKE2B f998c2ae42671295d371113637686db876c8ed969a1f32e5dab66f907dbce5c86e45998e02a6ad45c70dea873033e628b130e1df51ae38d3e7e6e214c71eaf4e SHA512 9ec0d0d19f668e40a12c527f26ef777fd858fef545372afbe4a7674543f3862e5e286154ad30e1e2a0184627510e3338ff2f97856886f76db9512fb89fbcda4e
+EBUILD qudos-0.40.1.ebuild 4205 BLAKE2B 4ea2a769ed1a04ba80f8599cfbcf61ae82b20546bfb0e9be5d288b6beb8356a191bb239c27a7e4871f6f613feb77a67520b21f8d3be62575265cbad258e90025 SHA512 aea7c9d34ad037a5b07bf4cb0525776b85ad6d06c9b0de65e099287289dc707c8a6eef20eb09e4134e32cb5ce27670b7a00ec9c327b63df53490240d56248ff6
 MISC metadata.xml 665 BLAKE2B 75a147828cd25bf29c05817fb232f5b11f33fbc12700f2cd08802300d545440aa8e800197e18ffcb1c4bd1de9997c98518cf19570954c1901b9fa3226c49dafe SHA512 d48f88a4c7f4be692bc6d5122634c5725282b1c5ca467ce75e317aa16550790a3a58569960ced134c18b5a36ee33b89a15834ddcc0ee35a4aa33ead7832e2f07
diff --git a/games-fps/qudos/files/qudos-0.40.1-gnusource.patch b/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
index dd2113b0c3bb..b82a276b012c 100644
--- a/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
+++ b/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
@@ -1,5 +1,5 @@
---- src/unix/qsh_unix.c.orig	2011-10-22 17:46:37.665993357 -0500
-+++ src/unix/qsh_unix.c	2011-10-22 17:46:40.965972209 -0500
+--- a/src/unix/qsh_unix.c
++++ b/src/unix/qsh_unix.c
 @@ -17,6 +17,9 @@
   * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   *
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
index ecf9de9370e9..633215be34be 100644
--- a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
+++ b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
@@ -1,5 +1,5 @@
---- src/ref_gl/gl_local.h
-+++ src/ref_gl/gl_local.h
+--- a/src/ref_gl/gl_local.h
++++ b/src/ref_gl/gl_local.h
 @@ -29,6 +29,7 @@
  #include <GL/glu.h>
  #include <GL/glext.h>
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 1c167f70ec4d..24a6a4e01612 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs games
+inherit desktop flag-o-matic toolchain-funcs
 
 FILE_STEM="QuDos-${PV}-src"
 PK3_FILE="QuDos-${PV}.pk3"
@@ -13,6 +13,7 @@ DESCRIPTION="Enhanced Quake 2 engine"
 HOMEPAGE="https://github.com/ZwS/qudos"
 SRC_URI="mirror://gentoo/${FILE_STEM}.tar.bz2
 	https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> ${PK3_FILE}"
+S="${WORKDIR}"/${FILE_STEM}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -34,13 +35,19 @@ DEPEND="opengl? (
 	x11-libs/libXext
 	x11-libs/libXxf86dga
 	x11-libs/libXxf86vm"
-RDEPEND="${DEPEND}
+RDEPEND="
+	${DEPEND}
 	cdinstall? ( games-fps/quake2-data )
 	demo? ( games-fps/quake2-demodata[symlink] )
-	textures? ( games-fps/quake2-textures )"
+	textures? ( games-fps/quake2-textures )
+"
 
-S=${WORKDIR}/${FILE_STEM}
-dir=${GAMES_DATADIR}/${MY_PN}
+dir=usr/share/${MY_PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libpng15.patch
+	"${FILESDIR}"/${P}-gnusource.patch
+)
 
 default_client() {
 	if use opengl || use sdl || ! use dedicated ; then
@@ -51,8 +58,6 @@ default_client() {
 }
 
 pkg_setup() {
-	games_pkg_setup
-
 	if ! use qmax && $( use opengl || use sdl ) ; then
 		elog "The 'qmax' graphical improvements are recommended."
 		echo
@@ -85,12 +90,12 @@ src_unpack() {
 }
 
 src_prepare() {
-	rm docs/gnu.txt
+	rm docs/gnu.txt || die
 
 	# Change default sound driver and its location
 	sed -i \
 		-e "s:\"oss\":\"${snd_drv}\":" \
-		-e "s:\"\./snd:\"$(games_get_libdir)/${PN}/snd:" \
+		-e "s:\"\./snd:\"/usr/$(get_libdir)/${PN}/snd:" \
 		src/client/snd_dma.c || die
 
 	sed -i \
@@ -102,11 +107,12 @@ src_prepare() {
 			-e '1i#define OF(x) x' \
 			src/qcommon/unzip/ioapi.h || die
 	fi
+
 	sed -i -e '106,119 s/CFL/LED/' Makefile || die
 
-	epatch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-gnusource.patch
+	sed -i -e 's:-L/usr/lib -L$(LOCALBASE)/lib :: ' Makefile || die
+
+	default
 }
 
 src_configure() {
@@ -115,7 +121,9 @@ src_configure() {
 }
 
 src_compile() {
-	yesno() { usex $1 YES NO; }
+	yesno() {
+		usex ${1} YES NO;
+	}
 
 	local client="YES"
 	default_client || client="NO"
@@ -137,7 +145,7 @@ src_compile() {
 		TYPE="${type}" \
 		DATADIR="${dir}" \
 		LOCALBASE=/usr \
-		LIBDIR="$(games_get_libdir)"/${PN} \
+		LIBDIR="/usr/$(get_libdir)"/${PN} \
 		WITH_QMAX=$(yesno qmax) \
 		BUILD_3ZB2=$(yesno mods) \
 		BUILD_CTF=$(yesno mods) \
@@ -157,24 +165,24 @@ src_compile() {
 
 src_install() {
 	if default_client ; then
-		newgamesbin ${MY_PN}/QuDos ${PN}
+		newbin ${MY_PN}/QuDos ${PN}
+
 		# Change from gif to png in next version?
 		newicon docs/q2_orig/quake2.gif ${PN}.gif
+
 		make_desktop_entry ${PN} "QuDos" ${PN}.gif
 	fi
 
 	if use dedicated ; then
-		newgamesbin ${MY_PN}/QuDos-ded ${PN}-ded
+		newbin ${MY_PN}/QuDos-ded ${PN}-ded
 	fi
 
-	insinto "$(games_get_libdir)"/${PN}
+	insinto "/usr/$(get_libdir)"/${PN}
 	doins -r ${MY_PN}/*
-	rm "${D}/$(games_get_libdir)"/${PN}/QuDos
+	rm "${ED}/usr/$(get_libdir)"/${PN}/QuDos || die
 
-	insinto "$(games_get_libdir)"/${PN}/baseq2
+	insinto "/usr/$(get_libdir)"/${PN}/baseq2
 	newins "${DISTDIR}/${PK3_FILE}" qudos.pk3
 
 	dodoc $(find docs -name \*.txt) docs/q2_orig/README*
-
-	prepgamesdirs
 }