From 8a5490bc40056f346876921c6da5ae45443a7b0f Mon Sep 17 00:00:00 2001
From: grepwood <grepwood>
Date: Sat, 4 May 2024 14:16:34 +0200
Subject: [PATCH] Removed cdinstall due to https://bugs.gentoo.org/931197

---
 .../darkplaces-20240226_pre20240226.ebuild          | 13 +++++--------
 games-fps/quake15/quake15-0_beta2-r1.ebuild         | 13 +++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/games-fps/darkplaces/darkplaces-20240226_pre20240226.ebuild b/games-fps/darkplaces/darkplaces-20240226_pre20240226.ebuild
index ad2ae81..3f67b3d 100644
--- a/games-fps/darkplaces/darkplaces-20240226_pre20240226.ebuild
+++ b/games-fps/darkplaces/darkplaces-20240226_pre20240226.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,8 +20,8 @@ SRC_URI="https://github.com/DarkPlacesEngine/darkplaces/archive/${GIT_COMMIT}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="capture cdinstall cpu_flags_x86_sse debug dedicated demo ipv6 lights sdl textures"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="capture cpu_flags_x86_sse debug dedicated demo ipv6 lights sdl textures"
 
 REQUIRED_USE="
 	amd64? ( cpu_flags_x86_sse )
@@ -42,7 +42,6 @@ RDEPEND="
 	media-libs/libjpeg-turbo
 	sys-libs/zlib
 	media-libs/libpng
-	cdinstall? ( games-fps/quake1-data )
 	demo? ( games-fps/quake1-demodata )
 	textures? ( >=games-fps/quake1-textures-20050820 )
 	sdl? ( ${SDL_RDEPEND} )
@@ -150,10 +149,8 @@ src_install() {
 		newbin "${PN}-${type}" ${PN}
 		newicon darkplaces72x72.png ${PN}.png
 		if use demo; then
-			# Install command-line for demo, even if not desktop entry
+			# Install command-line for demo
 			make_wrapper ${PN}-demo "${PN} -game demo"
-		fi
-		if use demo && ! use cdinstall; then
 			make_desktop_entry ${PN}-demo "Dark Places (Demo)"
 		else
 			# Full version takes precedence over demo
@@ -178,7 +175,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use cdinstall && ! use demo ; then
+	if ! use demo ; then
 		elog "Remember to place pak0.pak and pak1.pak in ${dir}/id1"
 		if use cdda; then
 			elog "If you wish to have the original soundtrack available without playing from an optical drive, please make sure that the path ${dir}/id1/sound/cdtracks exists, and that it contains the original soundtrack. The expected filename schema is track%i.%s with a double-digit count, either in WAV RIFF or OGG Vorbis format."
diff --git a/games-fps/quake15/quake15-0_beta2-r1.ebuild b/games-fps/quake15/quake15-0_beta2-r1.ebuild
index 0a716a8..961a1dc 100644
--- a/games-fps/quake15/quake15-0_beta2-r1.ebuild
+++ b/games-fps/quake15/quake15-0_beta2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ LICENSE="GPL-2 UNKNOWN"
 SLOT="0"
 # DarkPlaces' PNG is broken on big endian and this mod unfortunately uses PNG a lot. Sorry :(
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="alsa capture cdda cdinstall cpu_flags_x86_sse cpu_flags_x86_sse2 debug dedicated ipv6 opengl oss sdl textures"
+IUSE="alsa capture cdda cpu_flags_x86_sse cpu_flags_x86_sse2 debug dedicated ipv6 opengl oss sdl textures"
 
 REQUIRED_USE="
 	alsa? ( !oss )
@@ -63,7 +63,6 @@ RDEPEND="
 	media-libs/libjpeg-turbo
 	sys-libs/zlib
 	media-libs/libpng
-	cdinstall? ( games-fps/quake1-data )
 	textures? ( >=games-fps/quake1-textures-20050820 )
 	opengl? ( ${GLX_RDEPEND} )
 	sdl? ( ${SDL_RDEPEND} )
@@ -243,11 +242,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use cdinstall; then
-		elog "Please make sure that the path /usr/share/quake1/id1 exists and place pak0.pak and pak1.pak in /usr/share/quake1/id1"
-		if use cdda; then
-			elog "If you wish to have the original soundtrack available without playing from an optical drive, please make sure that the path /usr/share/quake1/id1/sound/cdtracks exists, and that it contains the original soundtrack. The expected filename schema is track%i.%s with a double-digit count, either in WAV RIFF or OGG Vorbis format."
-		fi
+	elog "Please make sure that the path /usr/share/quake1/id1 exists and place pak0.pak and pak1.pak in /usr/share/quake1/id1"
+	if use cdda; then
+		elog "If you wish to have the original soundtrack available without playing from an optical drive, please make sure that the path /usr/share/quake1/id1/sound/cdtracks exists, and that it contains the original soundtrack. The expected filename schema is track%i.%s with a double-digit count, either in WAV RIFF or OGG Vorbis format."
 	fi
 	if use sdl && ! use alsa; then
 		einfo "If audio latency is an issue, consider choosing OpenGL and ALSA USE flags instead of SDL."