commit: 5009fffd4fa94f0401e910c004c9f84b40543d28 Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com> AuthorDate: Tue Jul 10 14:58:36 2018 +0000 Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org> CommitDate: Tue Jul 10 21:29:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5009fffd
games-fps/eduke32: drop old version Package-Manager: Portage-2.3.41, Repoman-2.3.9 games-fps/eduke32/Manifest | 1 - games-fps/eduke32/eduke32-20180508.6885.ebuild | 233 ----------------------- games-fps/eduke32/files/fix-build-transpal.patch | 20 -- 3 files changed, 254 deletions(-) diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest index 9e3eb5fbde9..5a7ed79e93b 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_20180508-6885.tar.xz 14703224 BLAKE2B 8b90bf5771c2c27701316df8b9e738082d03552dddbd4d8be7e25195fd2da746afb2857e166ac6e6c0c78ad43e3c21f809538f0c54936ce82b5f2a3f93f80f94 SHA512 2b1be82a1bfbb0cf2a9b7bb0b73e69232bc2ce7adf343e25319b16c4240a6b3acf0fb8708e6ab8c7daa18f5a3039772472fd6542f6ea6dbe0530c8c3361c791c DIST eduke32_src_20180702-6937.tar.xz 14703496 BLAKE2B b1028551621bf12cbf8e6b0626cfb9634aa096d59a9dcc173cdb89614e68006d56468e2507e8f44f9c7a81e3c2bb392b79ccdafda420d456e169f135f78e106b SHA512 f219c30c6b5892846cc1f2a025e192d868610607213671658a62bcc833a5e0d8f5a3841681475574451e9938a8b8f47410e5f7f34267b618d03a2f154539cfef diff --git a/games-fps/eduke32/eduke32-20180508.6885.ebuild b/games-fps/eduke32/eduke32-20180508.6885.ebuild deleted file mode 100644 index d0de4c73bf6..00000000000 --- a/games-fps/eduke32/eduke32-20180508.6885.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop eapi7-ver gnome2-utils toolchain-funcs - -MY_BUILD="$(ver_cut 2)" -MY_DATE="$(ver_cut 1)" - -MY_PN_HRP="duke3d_hrp" -MY_PN_OPL="duke3d_musopl" -MY_PN_PSX="duke3d_psx" -MY_PN_SC55="duke3d_music-sc55" -MY_PN_XXX="duke3d_xxx" - -MY_PV_HRP="5.4" -MY_PV_OPL="2.01" -MY_PV_PSX="1.11" -MY_PV_SC55="4.02" -MY_PV_XXX="1.33" - -DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D" -HOMEPAGE="http://www.eduke32.com/"; -SRC_URI="http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz - http://www.eduke32.com/images/eduke32_classic.png - hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> ${MY_PN_HRP}-${MY_PV_HRP}.zip ) - offensive? ( http://www.duke4.org/files/nightfright/related/${MY_PN_XXX}.zip -> ${MY_PN_XXX}-${MY_PV_XXX}.zip ) - opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> ${MY_PN_OPL}-${MY_PV_OPL}.zip ) - psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> ${MY_PN_PSX}-${MY_PV_PSX}.zip ) - sc-55? ( http://www.duke4.org/files/nightfright/music/${MY_PN_SC55}.zip -> ${MY_PN_SC55}-${MY_PV_SC55}.zip )" - -KEYWORDS="~amd64 ~hppa ~x86" -LICENSE="BUILDLIC GPL-2 HRP" -SLOT="0" -IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis vpx xmp" -REQUIRED_USE="cdinstall? ( !demo ) - demo? ( !cdinstall ) - hrp? ( ^^ ( demo cdinstall ) ) - offensive? ( ^^ ( demo cdinstall ) ) - opl? ( ^^ ( demo cdinstall ) - !sc-55 ) - psx? ( ^^ ( demo cdinstall ) ) - sc-55? ( ^^ ( demo cdinstall ) - !opl ) - vpx? ( opengl )" - -S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}" - -MY_DEPEND_RDEPEND="media-libs/libsdl2[joystick,opengl?,sound,video,X] - 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= ) - timidity? ( media-sound/timidity-freepats ) - vpx? ( media-libs/libvpx:= ) - vorbis? ( media-libs/libogg - media-libs/libvorbis ) - xmp? ( media-libs/exempi:= )" - -RDEPEND="${MY_DEPEND_RDEPEND} - cdinstall? ( games-fps/duke3d-data ) - demo? ( games-fps/duke3d-demodata )" - -DEPEND="${MY_DEPEND_RDEPEND} - app-arch/unzip - x86? ( dev-lang/nasm )" - -PATCHES=( "${FILESDIR}/fix-build-transpal.patch" "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" ) - -src_unpack() { - # Extract only the eduke32 archive - unpack ${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz - - # Unpack only the documentation - if use hrp; then - unzip -q "${DISTDIR}"/${MY_PN_HRP}-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die - fi - if use offensive; then - unzip -q "${DISTDIR}"/${MY_PN_XXX}-${MY_PV_XXX}.zip xxx_readme.txt || die - fi - if use opl; then - unzip -q "${DISTDIR}"/${MY_PN_OPL}-${MY_PV_OPL}.zip readme.txt || die - fi - if use sc-55; then - unzip -q "${DISTDIR}"/${MY_PN_SC55}-${MY_PV_SC55}.zip readme/music_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() { - local binary - local binaries=( - eduke32 - mapster32 - "${FILESDIR}"/eduke32-bin - ) - for binary in "${binaries[@]}"; do - dobin "${binary}" - done - - if use tools; then - local tool - local tools=( - arttool - bsuite - cacheinfo - generateicon - givedepth - ivfrate - kextract - kgroup - kmd2tool - makesdlkeytrans - map2stl - md2tool - mkpalette - transpal - unpackssi - wad2art - wad2map - ) - for tool in "${tools[@]}"; do - dobin ${tool} - done - fi - - keepdir /usr/share/games/eduke32 - insinto /usr/share/games/eduke32 - if use hrp; then - doins "${DISTDIR}"/${MY_PN_HRP}-${MY_PV_HRP}.zip - fi - if use offensive; then - doins "${DISTDIR}"/${MY_PN_XXX}-${MY_PV_XXX}.zip - fi - if use opl; then - doins "${DISTDIR}"/${MY_PN_OPL}-${MY_PV_OPL}.zip - fi - if use psx; then - doins "${DISTDIR}"/${MY_PN_PSX}-${MY_PV_PSX}.zip - fi - if use sc-55; then - doins "${DISTDIR}"/${MY_PN_SC55}-${MY_PV_SC55}.zip - fi - if use sdk; then - doins -r package/sdk - fi - - 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 ) - if use hrp; then - DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt ) - fi - if use offensive; then - DOCS+=( "${WORKDIR}"/xxx_readme.txt ) - fi - if use opl; then - DOCS+=( "${WORKDIR}"/readme.txt ) - fi - if use sc-55; then - DOCS+=( "${WORKDIR}"/readme/music_readme.txt ) - fi - einstalldocs -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-fps/eduke32/files/fix-build-transpal.patch b/games-fps/eduke32/files/fix-build-transpal.patch deleted file mode 100644 index 3c22bc40550..00000000000 --- a/games-fps/eduke32/files/fix-build-transpal.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/source/tools/src/transpal.cpp 2017-02-01 11:01:11.000000000 +0100 -+++ b/source/tools/src/transpal.cpp 2018-05-11 00:06:37.329712454 +0200 -@@ -26,7 +26,7 @@ - r = ((ptr[0]*t+32768)>>16); - g = ((ptr[1]*t+32768)>>16); - b = ((ptr[2]*t+32768)>>16); -- return(getclosestcol(r,g,b)); -+ return(paletteGetClosestColor(r,g,b)); - } - - static char gettrans(char dat1, char dat2, int datransratio) -@@ -39,7 +39,7 @@ - r = ptr[0]; r += (((ptr2[0]-r)*datransratio+128)>>8); - g = ptr[1]; g += (((ptr2[1]-g)*datransratio+128)>>8); - b = ptr[2]; b += (((ptr2[2]-b)*datransratio+128)>>8); -- return(getclosestcol(r,g,b)); -+ return(paletteGetClosestColor(r,g,b)); - } - - int main(int argc, char **argv)
