From 7c59acba5699c9c58090a7a738669669a7307023 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 21 Aug 2021 23:14:26 +0100
Subject: gentoo resync : 21.08.2021

---
 games-fps/darkplaces/Manifest                      |   2 +-
 games-fps/darkplaces/darkplaces-20140513-r1.ebuild | 204 ---------------------
 games-fps/darkplaces/darkplaces-20140513-r2.ebuild | 204 +++++++++++++++++++++
 3 files changed, 205 insertions(+), 205 deletions(-)
 delete mode 100644 games-fps/darkplaces/darkplaces-20140513-r1.ebuild
 create mode 100644 games-fps/darkplaces/darkplaces-20140513-r2.ebuild

(limited to 'games-fps/darkplaces')

diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
index 14e6fbdc3aef..a4913d69c5b3 100644
--- a/games-fps/darkplaces/Manifest
+++ b/games-fps/darkplaces/Manifest
@@ -2,5 +2,5 @@ AUX darkplaces-20140513-gcc-11.patch 1432 BLAKE2B a46d76475e074b8ce7a3ddc9fd813d
 DIST darkplacesengine20140513.zip 28113487 BLAKE2B 9e3ffa759921fd61d1308f7c08cc1253a5a3d32c57e8dd8c2a05771aa0b5019fac7932ad337e4be95545bf093f4a2f20d221328ae0bfa45c2b00a7f5700fc04a SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c
 DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925
 DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331
-EBUILD darkplaces-20140513-r1.ebuild 4525 BLAKE2B 1b99e2227e00a4bd33d3729021b53e7f3dcc8b46ee025d506fa482380baf04ba18cd6acc3fec61b649d116b2fd7b6327edc3095f02ec41627047d8645f736044 SHA512 5b8d482f1ec1f245c437f75607faec812020b5f3380b708d2eca8d5affa4964fe5cc980a3947bcfc36aa2485a7057e9ea3dab42bdeeebd5ca639bfc3238fdb28
+EBUILD darkplaces-20140513-r2.ebuild 4535 BLAKE2B 383c1c9ed2fc440452a6bca5f6227757beaa719eb64c17b6e4570c43d184bbb42c2c854dc80f493d688117fe655ed194f8562ad9fdb940fcc6b08315ecc36c2e SHA512 dcbffed6cbf5d2f0677dfa6163804addf6d36672a7766060ffa223067d19e37f0a6612a30e2b85884e5824fd43ea6c6ed223ec26bc78add0e74068e2cdd01e89
 MISC metadata.xml 567 BLAKE2B 46fb34c2aab597b51dd9e8d5effb76af828734a9a7826c503de0a843d12ddeb275d31d846f419635450a3ce1880eb31a1942e684cdc82d1aad83d1aa1cc97d17 SHA512 719f0053b4390b1dccb63e70bddb518f9aad79c8b240dd37ed16b1680a1053a51e309632893c87c51d6057e2602bc6a3fbe8c7d11330da76d5646b3c8c542bbd
diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
deleted file mode 100644
index 4ac04b2d8f39..000000000000
--- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic wrapper unpacker
-
-# Latest versions are in http://icculus.org/twilight/darkplaces/files/
-MY_PV="${PV/_beta/beta}"
-MY_ENGINE="${PN}engine${MY_PV}.zip"
-
-# Different Quake 1 engines expect the lights in different directories
-# http://www.fuhquake.net/download.html and http://www.kgbsyndicate.com/romi/
-MY_LIGHTS="fuhquake-lits.rar"
-
-DESCRIPTION="Enhanced engine for iD Software's Quake 1"
-HOMEPAGE="http://icculus.org/twilight/darkplaces/"
-SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
-	lights? (
-		http://www.fuhquake.net/files/extras/${MY_LIGHTS}
-		http://www.kgbsyndicate.com/romi/id1.pk3 )"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
-
-UIRDEPEND="
-	virtual/jpeg:0
-	media-libs/libogg
-	media-libs/libvorbis
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	sdl? ( media-libs/libsdl )
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
-"
-UIDEPEND="
-	x11-base/xorg-proto
-"
-RDEPEND="
-	net-misc/curl
-	cdinstall? ( games-fps/quake1-data )
-	demo? ( games-fps/quake1-demodata )
-	textures? ( >=games-fps/quake1-textures-20050820 )
-	opengl? ( ${UIRDEPEND} )
-	!opengl? ( sdl? ( ${UIRDEPEND} ) )
-	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )
-"
-DEPEND="lights? ( || (
-			app-arch/unrar
-			app-arch/rar ) )
-	opengl? (
-		${UIRDEPEND}
-		${UIDEPEND} )
-	!opengl? ( sdl? (
-		${UIRDEPEND}
-		${UIDEPEND} ) )
-	!opengl? ( !sdl? ( !dedicated? (
-		${UIRDEPEND}
-		${UIDEPEND} ) ) )
-"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-PATCHES=("${FILESDIR}"/${P}-gcc-11.patch)
-
-dir="/usr/share/quake1"
-
-opengl_client() {
-	use opengl || ( ! use dedicated && ! use sdl )
-}
-
-src_unpack() {
-	if use lights ; then
-		unpack "${MY_LIGHTS}"
-		unpack_zip "${DISTDIR}"/id1.pk3
-		mv *.lit maps/ || die
-		mv ReadMe.txt rtlights.txt
-	fi
-
-	unpack "${MY_ENGINE}"
-	unpack ./${PN}*.zip
-}
-
-src_prepare() {
-	default
-
-	rm "${WORKDIR}"/README-SDL.txt
-	cd "${S}"
-	rm mingw_note.txt
-
-	strip-flags
-
-	# Only additional CFLAGS optimization is the -march flag
-	local march=$(get-flag -march)
-	sed -i \
-		-e "s:-lasound:$($(tc-getPKG_CONFIG) --libs alsa):" \
-		-e "/^CPUOPTIMIZATIONS/d" \
-		-e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \
-		-e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \
-		-e '/^LDFLAGS_DEBUG/s/$/ $(LDFLAGS)/' \
-		-e '/^LDFLAGS_RELEASE/s/$/ $(LDFLAGS)/' \
-		-e "s:strip:true:" \
-		makefile.inc || die
-
-	if ! use cdsound ; then
-		# Turn the CD accesses off
-		sed -i \
-			-e "s:/dev/cdrom:/dev/null:" \
-			cd_linux.c || die
-		sed -i \
-			-e 's:COM_CheckParm("-nocdaudio"):1:' \
-			cd_shared.c || die
-	fi
-}
-
-src_compile() {
-	local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
-
-	# Protect against people choosing a strip implementation
-	# bug #739194
-	unset STRIP
-
-	tc-export CC
-
-	# Preferred sound is alsa
-	local sound_api="NULL"
-	use oss && sound_api="OSS"
-	use alsa && sound_api="ALSA"
-	opts="${opts} DP_SOUND_API=${sound_api}"
-
-	local type="release"
-	use debug && type="debug"
-
-	# Only compile a maximum of 1 client
-	if use sdl ; then
-		emake ${opts} "sdl-${type}"
-	elif opengl_client ; then
-		emake ${opts} "cl-${type}"
-	fi
-
-	if use dedicated ; then
-		emake ${opts} "sv-${type}"
-	fi
-}
-
-src_install() {
-	if opengl_client || use sdl ; then
-		local type=glx
-
-		use sdl && type=sdl
-
-		# darkplaces executable is needed, even just for demo
-		newbin "${PN}-${type}" ${PN}
-		newicon darkplaces72x72.png ${PN}.png
-
-		if use demo ; then
-			# Install command-line for demo, even if not desktop entry
-			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
-			make_desktop_entry ${PN} "Dark Places"
-		fi
-	fi
-
-	if use dedicated ; then
-		newbin ${PN}-dedicated ${PN}-ded
-	fi
-
-	dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
-
-	if use lights ; then
-		insinto "${dir}"/id1
-		doins -r "${WORKDIR}"/{cubemaps,maps}
-
-		if use demo ; then
-			# Set up symlinks, for the demo levels to include the lights
-			local d
-			for d in cubemaps maps ; do
-				dosym "${dir}/id1/${d}" "${dir}/demo/${d}"
-			done
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if ! use cdinstall && ! use demo ; then
-		elog "Place pak0.pak and pak1.pak in ${dir}/id1"
-	fi
-
-	if use sdl && ! use alsa ; then
-		ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
-	fi
-}
diff --git a/games-fps/darkplaces/darkplaces-20140513-r2.ebuild b/games-fps/darkplaces/darkplaces-20140513-r2.ebuild
new file mode 100644
index 000000000000..5c2d846cf634
--- /dev/null
+++ b/games-fps/darkplaces/darkplaces-20140513-r2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic wrapper unpacker
+
+# Latest versions are in http://icculus.org/twilight/darkplaces/files/
+MY_PV="${PV/_beta/beta}"
+MY_ENGINE="${PN}engine${MY_PV}.zip"
+
+# Different Quake 1 engines expect the lights in different directories
+# http://www.fuhquake.net/download.html and http://www.kgbsyndicate.com/romi/
+MY_LIGHTS="fuhquake-lits.rar"
+
+DESCRIPTION="Enhanced engine for iD Software's Quake 1"
+HOMEPAGE="http://icculus.org/twilight/darkplaces/"
+SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
+	lights? (
+		http://www.fuhquake.net/files/extras/${MY_LIGHTS}
+		http://www.kgbsyndicate.com/romi/id1.pk3 )"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
+
+UIRDEPEND="
+	virtual/jpeg:0
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	sdl? ( media-libs/libsdl[joystick] )
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXxf86dga
+	x11-libs/libXxf86vm
+"
+UIDEPEND="
+	x11-base/xorg-proto
+"
+RDEPEND="
+	net-misc/curl
+	cdinstall? ( games-fps/quake1-data )
+	demo? ( games-fps/quake1-demodata )
+	textures? ( >=games-fps/quake1-textures-20050820 )
+	opengl? ( ${UIRDEPEND} )
+	!opengl? ( sdl? ( ${UIRDEPEND} ) )
+	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )
+"
+DEPEND="lights? ( || (
+			app-arch/unrar
+			app-arch/rar ) )
+	opengl? (
+		${UIRDEPEND}
+		${UIDEPEND} )
+	!opengl? ( sdl? (
+		${UIRDEPEND}
+		${UIDEPEND} ) )
+	!opengl? ( !sdl? ( !dedicated? (
+		${UIRDEPEND}
+		${UIDEPEND} ) ) )
+"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+
+PATCHES=("${FILESDIR}"/${P}-gcc-11.patch)
+
+dir="/usr/share/quake1"
+
+opengl_client() {
+	use opengl || ( ! use dedicated && ! use sdl )
+}
+
+src_unpack() {
+	if use lights ; then
+		unpack "${MY_LIGHTS}"
+		unpack_zip "${DISTDIR}"/id1.pk3
+		mv *.lit maps/ || die
+		mv ReadMe.txt rtlights.txt
+	fi
+
+	unpack "${MY_ENGINE}"
+	unpack ./${PN}*.zip
+}
+
+src_prepare() {
+	default
+
+	rm "${WORKDIR}"/README-SDL.txt
+	cd "${S}"
+	rm mingw_note.txt
+
+	strip-flags
+
+	# Only additional CFLAGS optimization is the -march flag
+	local march=$(get-flag -march)
+	sed -i \
+		-e "s:-lasound:$($(tc-getPKG_CONFIG) --libs alsa):" \
+		-e "/^CPUOPTIMIZATIONS/d" \
+		-e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \
+		-e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \
+		-e '/^LDFLAGS_DEBUG/s/$/ $(LDFLAGS)/' \
+		-e '/^LDFLAGS_RELEASE/s/$/ $(LDFLAGS)/' \
+		-e "s:strip:true:" \
+		makefile.inc || die
+
+	if ! use cdsound ; then
+		# Turn the CD accesses off
+		sed -i \
+			-e "s:/dev/cdrom:/dev/null:" \
+			cd_linux.c || die
+		sed -i \
+			-e 's:COM_CheckParm("-nocdaudio"):1:' \
+			cd_shared.c || die
+	fi
+}
+
+src_compile() {
+	local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
+
+	# Protect against people choosing a strip implementation
+	# bug #739194
+	unset STRIP
+
+	tc-export CC
+
+	# Preferred sound is alsa
+	local sound_api="NULL"
+	use oss && sound_api="OSS"
+	use alsa && sound_api="ALSA"
+	opts="${opts} DP_SOUND_API=${sound_api}"
+
+	local type="release"
+	use debug && type="debug"
+
+	# Only compile a maximum of 1 client
+	if use sdl ; then
+		emake ${opts} "sdl-${type}"
+	elif opengl_client ; then
+		emake ${opts} "cl-${type}"
+	fi
+
+	if use dedicated ; then
+		emake ${opts} "sv-${type}"
+	fi
+}
+
+src_install() {
+	if opengl_client || use sdl ; then
+		local type=glx
+
+		use sdl && type=sdl
+
+		# darkplaces executable is needed, even just for demo
+		newbin "${PN}-${type}" ${PN}
+		newicon darkplaces72x72.png ${PN}.png
+
+		if use demo ; then
+			# Install command-line for demo, even if not desktop entry
+			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
+			make_desktop_entry ${PN} "Dark Places"
+		fi
+	fi
+
+	if use dedicated ; then
+		newbin ${PN}-dedicated ${PN}-ded
+	fi
+
+	dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
+
+	if use lights ; then
+		insinto "${dir}"/id1
+		doins -r "${WORKDIR}"/{cubemaps,maps}
+
+		if use demo ; then
+			# Set up symlinks, for the demo levels to include the lights
+			local d
+			for d in cubemaps maps ; do
+				dosym "${dir}/id1/${d}" "${dir}/demo/${d}"
+			done
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if ! use cdinstall && ! use demo ; then
+		elog "Place pak0.pak and pak1.pak in ${dir}/id1"
+	fi
+
+	if use sdl && ! use alsa ; then
+		ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
+	fi
+}
-- 
cgit v1.2.3