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

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     894010aea0472636a15f66a38a84dc58c9ef4ca2
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 19:35:07 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 20:00:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894010ae

games-fps/eduke32: drop old version

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 games-fps/eduke32/Manifest                         |   1 -
 games-fps/eduke32/eduke32-20200505.8904.ebuild     | 227 ---------------------
 .../eduke32-20190419.7615-wad2map-buildfix.patch   |  19 --
 3 files changed, 247 deletions(-)

diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index d6f7b5e5323..717c7f433f8 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -5,5 +5,4 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20200505-8904-0b0e9923c.tar.xz 16569468 BLAKE2B 557a4547e13ff422dacf0885f8ddff8b62bb658bc63c2b70564b5f40cabaf55abd30103a28af474391cd3662641768bcec5f3338f882f82fc657cfa24a566436 SHA512 6b86b1fd16c0175c7dea1816e8d2b4f92f6d5a26c9f68bbbd5cf5ed7821524ef72ef646bc931d4d82773a33438f0de7a33b84429719e485f8cf05cd8ab92cb6b
 DIST eduke32_src_20200808-9208-16a4d06be.tar.xz 19787360 BLAKE2B 3344a660fd5dec951e27e74a0680ba506692991c96438af53901bd5c090ca4c14be90db37ad4cc454c7f0dc2b7628a9bb9abce4e55c4dd9713a1fe90af28c53d SHA512 0b88ed5a0c3a5134aaabe9c30eb2d9a2a17c4833388788c4e1d3bf6bc76aa0edb3b6189c503f614894d480d25a27d498df11fb13ea64c465253a9b564c43b78c

diff --git a/games-fps/eduke32/eduke32-20200505.8904.ebuild b/games-fps/eduke32/eduke32-20200505.8904.ebuild
deleted file mode 100644
index c493f5f8a35..00000000000
--- a/games-fps/eduke32/eduke32-20200505.8904.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop toolchain-funcs xdg-utils
-
-EGIT_COMMIT="0b0e9923c"
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-MY_PV_HRP="5.4"
-MY_PV_OFFENSIVE_XXX="1.33"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="
-	https://dukeworld.com/eduke32/synthesis/latest/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-	https://www.eduke32.com/images/eduke32_classic.png
-	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
-	offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
-	opl? ( https://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-${MY_PV_OPL}.zip )
-	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-${MY_PV_PSX}.zip )
-	sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-${MY_PV_SC55}.zip )
-	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-${MY_PV_VOXELS}.zip )
-"
-
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
-REQUIRED_USE="
-	cdinstall? ( !demo )
-	demo? ( !cdinstall )
-	hrp? ( ^^ ( demo cdinstall )
-		!voxels )
-	offensive? ( ^^ ( demo cdinstall ) )
-	opl? ( ^^ ( demo cdinstall )
-		!sc-55 )
-	psx? ( ^^ ( demo cdinstall ) )
-	sc-55? ( ^^ ( demo cdinstall )
-		!opl )
-	voxels? ( !hrp )
-	vpx? ( opengl )
-"
-
-# There are no tests,
-# instead it tries to build a test game, which does not compile
-RESTRICT="bindist test"
-
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}"
-
-RDEPEND="
-	media-libs/libsdl2[joystick,opengl?,sound,video]
-	media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
-	sys-libs/zlib
-	flac? ( media-libs/flac )
-	gtk? ( x11-libs/gtk+:2 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	png? ( media-libs/libpng:0= )
-	vpx? ( media-libs/libvpx:= )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	xmp? ( media-libs/exempi:2= )
-"
-
-DEPEND="
-	${RDEPEND}
-	cdinstall? ( games-fps/duke3d-data )
-	demo? ( games-fps/duke3d-demodata )
-	timidity? ( media-sound/timidity++ )
-"
-
-BDEPEND="
-	app-arch/unzip
-	x86? ( dev-lang/nasm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20190419.7615-wad2map-buildfix.patch"
-	"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
-	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
-	"${FILESDIR}/${PN}-20200505.8904-gcc10.patch"
-)
-
-src_unpack() {
-	# Extract only the eduke32 archive
-	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
-
-	# Unpack only the documentation
-	if use hrp; then
-		unzip -q "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
-	fi
-	if use offensive; then
-		unzip -q "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip xxx_readme.txt || die
-	fi
-	if use opl; then
-		unzip -q "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip readme.txt || die
-		mv readme.txt opl_readme.txt || die
-	fi
-	if use sc-55; then
-		unzip -q "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip readme/music_readme.txt || die
-	fi
-	if use voxels; then
-		unzip -q "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
-	fi
-}
-
-src_compile() {
-	local myemakeopts=(
-		ALLOCACHE_AS_MALLOC=0
-		AS=$(tc-getAS)
-		CC=$(tc-getCC)
-		CXX=$(tc-getCXX)
-		CLANG=0
-		CPLUSPLUS=1
-		CUSTOMOPT=""
-		DEBUGANYWAY=0
-		F_JUMP_TABLES=""
-		FORCEDEBUG=0
-		HAVE_FLAC=$(usex flac 1 0)
-		HAVE_GTK2=$(usex gtk 1 0)
-		HAVE_VORBIS=$(usex vorbis 1 0)
-		HAVE_XMP=$(usex xmp 1 0)
-		LINKED_GTK=$(usex gtk 1 0)
-		LTO=1
-		LUNATIC=0
-		KRANDDEBUG=0
-		MEMMAP=0
-		MIXERTYPE=SDL
-		NETCODE=$(usex server 1 0)
-		NOASM=0
-		OPTLEVEL=0
-		OPTOPT=""
-		PACKAGE_REPOSITORY=1
-		POLYMER=$(usex opengl 1 0)
-		PRETTY_OUTPUT=0
-		PROFILER=0
-		RELEASE=1
-		RENDERTYPE=SDL
-		SDL_TARGET=2
-		SIMPLE_MENU=0
-		STRIP=""
-		TANDALONE=0
-		STARTUP_WINDOW=$(usex gtk 1 0)
-		USE_OPENGL=$(usex opengl 1 0)
-		USE_LIBVPX=$(usex vpx 1 0)
-		USE_LIBPNG=$(usex png 1 0)
-		USE_LUAJIT_2_1=0
-		WITHOUT_GTK=$(usex gtk 0 1)
-	)
-
-	emake "${myemakeopts[@]}"
-
-	if use tools; then
-		emake utils "${myemakeopts[@]}"
-	fi
-}
-
-src_install() {
-	dobin eduke32 mapster32 "${FILESDIR}"/eduke32-bin
-
-	if use tools; then
-		local tools=(
-			arttool
-			bsuite
-			cacheinfo
-			generateicon
-			givedepth
-			ivfrate
-			kextract
-			kgroup
-			kmd2tool
-			makesdlkeytrans
-			map2stl
-			md2tool
-			mkpalette
-			transpal
-			unpackssi
-			wad2art
-			wad2map
-		)
-
-		dobin "${tools[@]}"
-	fi
-
-	keepdir /usr/share/games/eduke32
-	insinto /usr/share/games/eduke32
-
-	use hrp && doins "${DISTDIR}"/duke3d_hrp-${MY_PV_HRP}.zip
-	use offensive && doins "${DISTDIR}"/duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip
-	use opl && doins "${DISTDIR}"/duke3d_musopl-${MY_PV_OPL}.zip
-	use psx && doins "${DISTDIR}"/duke3d_psx-${MY_PV_PSX}.zip
-	use sc-55 && doins "${DISTDIR}"/duke3d_music-sc55-${MY_PV_SC55}.zip
-	use sdk && doins -r package/sdk
-	use voxels && doins "${DISTDIR}"/duke3d_voxels-${MY_PV_VOXELS}.zip
-
-	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
-	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
-	make_desktop_entry mapster32 Mapster32 eduke32 Game
-
-	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt )
-	use hrp && DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
-	use offensive && DOCS+=( "${WORKDIR}"/xxx_readme.txt )
-	use opl && DOCS+=( "${WORKDIR}"/opl_readme.txt )
-	use sc-55 && DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
-	use voxels && DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch b/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
deleted file mode 100644
index 611f7a9d1ee..00000000000
--- a/games-fps/eduke32/files/eduke32-20190419.7615-wad2map-buildfix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/source/tools/src/wad2map.cpp	2019-04-08 08:29:24.000000000 +0200
-+++ b/source/tools/src/wad2map.cpp	2019-04-20 15:07:38.684542190 +0200
-@@ -7,6 +7,7 @@
- 
- #include "compat.h"
- #include "pragmas.h"
-+#include "vfs.h"
- 
- #define MAXWADS 4096
- #define MAXPOINTS 8192
-@@ -313,7 +314,7 @@
-         Bprintf("Could not find %s\n",scriptname);
-         exit(0);
-     }
--    filpos = 0; fileng = filelength(filhandle);
-+    filpos = 0; fileng = buildvfs_length(filhandle);
-     while (readline() != 0)
-     {
-         i = 0; j = 0; lasti = 0;