From d7c33873510292da260a8390e0aa992759f514e1 Mon Sep 17 00:00:00 2001 From: Albert Diserholt Date: Thu, 20 Aug 2020 09:17:33 +0200 Subject: Fix dev-games/godot ebuilds 3.2.2 created the wrong desktop entries 9999 now builds the 4.0 development branch Signed-off-by: Albert Diserholt --- dev-games/godot/Manifest | 4 +- dev-games/godot/godot-3.2.2-r1.ebuild | 166 ++++++++++++++++++++++++++++++++++ dev-games/godot/godot-3.2.2.ebuild | 160 -------------------------------- dev-games/godot/godot-9999.ebuild | 47 ++++++---- 4 files changed, 197 insertions(+), 180 deletions(-) create mode 100644 dev-games/godot/godot-3.2.2-r1.ebuild delete mode 100644 dev-games/godot/godot-3.2.2.ebuild diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest index 43c2589..4e5a648 100644 --- a/dev-games/godot/Manifest +++ b/dev-games/godot/Manifest @@ -1,5 +1,5 @@ DIST 3.1.1-stable.zip 25427059 BLAKE2B 85c4df448f5af7f96a3f5a3ba8e23e7764f83e1a43b21807ccf3ba66356aa3ec1dc56242dcf7d0c7d1d9efcba56b7eab8cfc32e314d1f35978bd34d2c300f65e SHA512 509b144be7416174a487548b5708367f7ce743b0268a710d0dc9a9fb095eb368a218bf5cd591f38f90bb9a96fa24acab442c503f4ea91b485274503e381569cd DIST godot-3.2.2.zip 27714032 BLAKE2B 68d936570a783b902f72bfb80d4e8d9a112e8d741e41167a4af060321ea68d808357c5d45d2c0e835f1edfb70b26ed222c116678ea2b673e9f45ef15217f0b01 SHA512 d33c2a9c9c234a3c89bf8e533f5bdbfa4483f8794d90e928e7fe4acfab0fca9b1acd8cfb8d7606bdfe94d1275b3b07dde512cc0544dd3fc6d2dc8b1199664da2 EBUILD godot-3.1.1.ebuild 3794 BLAKE2B 110ee31e86a3a4202cffac3be24dc3037430fd2bc9e4b1c9a6d67c730f5d5250c4df9f539dabb38465a2196877280696cebaf638fdb1031050ab97bf45be9f12 SHA512 af13c9c329ac5b7d33272c0bccfe0e02663d98dd09d4e3342a58c7a083d9b7df0ab5c38fd51ac5bfa5cdbe51f14865f59a8cab20010acec98b5a7ad9825d60b9 -EBUILD godot-3.2.2.ebuild 3640 BLAKE2B eebf7b5a12e7c8d640c0370e087439323535f230972bf4da4680acc739a6fe84cfb37efb4cc329a4b2604f862293d0abb85de60912f5249ef21f01dc86fbf6b7 SHA512 1a128c8268fad428b141d2c58cec0ec691efea3689427857c8564a41d6274b830da04a2fd8377ae3a9e89e6da3749a7f049edc26adac8560dc8251b000ce8990 -EBUILD godot-9999.ebuild 3640 BLAKE2B eebf7b5a12e7c8d640c0370e087439323535f230972bf4da4680acc739a6fe84cfb37efb4cc329a4b2604f862293d0abb85de60912f5249ef21f01dc86fbf6b7 SHA512 1a128c8268fad428b141d2c58cec0ec691efea3689427857c8564a41d6274b830da04a2fd8377ae3a9e89e6da3749a7f049edc26adac8560dc8251b000ce8990 +EBUILD godot-3.2.2-r1.ebuild 3730 BLAKE2B 378949918f199d27642d9c624629dae68cf78d16fa20da97ce4f28bd6e56dfe9f6c05467231c9badffdfbffb2ba56d12760c6291bfffea8f42906f48bc24a66f SHA512 6a2d3ae793b0ad0ed776c6c1b44a4af647d925a38b1069944aa5959bfa34e79217bb20699ea57011f6afece446309562dc6e739a1c8f67d98228db91517edeb5 +EBUILD godot-9999.ebuild 3864 BLAKE2B c8e9d1a04a41488a7366b065478f9ce85aef54d95f752a596e30fc2e9547f197d7cb15bf871795d2e24855aefd9935072346b111c8629d322dfcded898c627a3 SHA512 7cddfd5ea520cd9170160b064e801d300c2ebf4dc4e32eb6ac5d9d3f96c4af623cb9d70ca0f6fc8fa78ca7b6c156a8f0bd502c518d1c5babfc5123ca594c13d2 diff --git a/dev-games/godot/godot-3.2.2-r1.ebuild b/dev-games/godot/godot-3.2.2-r1.ebuild new file mode 100644 index 0000000..8648b1d --- /dev/null +++ b/dev-games/godot/godot-3.2.2-r1.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 python3_{6..8} ) + +inherit eutils python-any-r1 scons-utils flag-o-matic llvm desktop + +DESCRIPTION="Multi-platform 2D and 3D game engine" +HOMEPAGE="http://godotengine.org" +LICENSE="MIT" +SLOT="0" + +if [[ ${PV} = 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/godotengine/${PN}" + EGIT_BRANCH="master" +else + SRC_URI="https://github.com/godotengine/${PN}/archive/${PV}-stable.zip -> ${P}.zip" + S="${WORKDIR}/${P}-stable" + KEYWORDS="~amd64 ~x86" +fi + +IUSE=" + debug + +enet + +freetype + llvm + lto + +mbedtls + +opus + pulseaudio + theora + +udev + +vorbis + +webp + +X" + +DEPEND=" + >=app-arch/bzip2-1.0.6-r6 + >=app-arch/lz4-0_p120 + >=app-arch/xz-utils-5.0.8 + >=app-arch/zstd-1.4.4 + >=dev-libs/json-c-0.11-r1 + dev-libs/libpcre2[pcre32] + >=media-libs/alsa-lib-1.0.28 + >=media-libs/flac-1.3.1-r1 + freetype? ( >=media-libs/freetype-2.5.3-r1:2 ) + >=media-libs/libogg-1.3.1 + >=media-libs/libpng-1.6.16:0= + >=media-libs/libsndfile-1.0.25-r1 + media-libs/libvpx + theora? ( media-libs/libtheora ) + vorbis? ( >=media-libs/libvorbis-1.3.4 ) + webp? ( media-libs/libwebp ) + opus? ( media-libs/opus ) + >=media-libs/mesa-10.2.8[gles2] + pulseaudio? ( >=media-sound/pulseaudio-5.0-r7 ) + enet? ( net-libs/enet ) + >=net-libs/libasyncns-0.8-r3 + mbedtls? ( net-libs/mbedtls ) + net-libs/miniupnpc + >=sys-apps/attr-2.4.47-r1 + >=sys-apps/tcp-wrappers-7.6.22-r1 + >=sys-apps/util-linux-2.25.2-r2 + !llvm? ( >=sys-devel/gcc-7.0.0:*[cxx] ) + llvm? ( >=sys-devel/llvm-6.0.0 ) + >=sys-libs/gdbm-1.11 + >=sys-libs/glibc-2.20-r2 + >=sys-libs/libcap-2.22-r2 + >=sys-libs/zlib-1.2.8-r1 + X? ( + >=x11-libs/libX11-1.6.2 + >=x11-libs/libXcursor-1.1.14 + >=x11-libs/libXi-1.0.0 + >=x11-libs/libXinerama-1.1.3 + ) + udev? ( virtual/udev ) + virtual/glu" + +#dev-lang/yasm + +RDEPEND="${DEPEND}" + +pkg_setup() { + python-any-r1_pkg_setup + llvm_pkg_setup +} + +src_configure() { + if use llvm && ! tc-is-clang; then + einfo "Enforcing the use of clang due to USE=llvm ..." + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + fi + + strip-unsupported-flags + + MYSCONS=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + builtin_enet=$(usex enet) + builtin_freetype=no + builtin_libogg=no + builtin_libpng=no + builtin_libtheora=$(usex theora) + builtin_libvorbis=$(usex vorbis) + builtin_libvpx=no + builtin_libwebp=$(usex webp) + builtin_mbedtls=$(usex mbedtls) + builtin_miniupnpc=no + builtin_opus=$(usex opus) + builtin_pcre2=no + builtin_zlib=no + builtin_zstd=no + module_enet_enabled=$(usex enet) + module_freetype_enabled=$(usex freetype) + module_mbedtls_enabled=$(usex mbedtls) + module_opus_enabled=$(usex opus) + module_theora_enabled=$(usex theora) + module_vorbis_enabled=$(usex vorbis) + module_webp_enabled=$(usex webp) + platform=$(usex X x11 server) + pulseaudio=$(usex pulseaudio) + tools=yes + progress=false + verbose=true + udev=$(usex udev) + use_llvm=$(usex llvm) + use_lld=$(usex llvm) + use_lto=$(usex lto) + target=$(usex debug debug release_debug) + ) +} + +src_compile() { + escons "${MYSCONS[@]}" +} + +src_install() { + newicon icon.svg ${PN}.svg + dobin bin/godot.* + if [[ "${ARCH}" == "amd64" ]]; then + if use llvm; then + make_desktop_entry godot.x11.opt.tools.64.llvm Godot + with_desktop_entry=1 + else + make_desktop_entry godot.x11.opt.tools.64 Godot + with_desktop_entry=1 + fi + fi + + if [[ "${ARCH}" == "x86" ]]; then + if use llvm; then + make_desktop_entry godot.x11.opt.tools.32.llvm Godot + with_desktop_entry=1 + else + make_desktop_entry godot.x11.opt.tools.32 Godot + with_desktop_entry=1 + fi + fi + + if ! [[ "${with_desktop_entry}" == "1" ]]; then + elog "Couldn't detect running architecture to create a desktop file." + fi +} diff --git a/dev-games/godot/godot-3.2.2.ebuild b/dev-games/godot/godot-3.2.2.ebuild deleted file mode 100644 index 2b8695e..0000000 --- a/dev-games/godot/godot-3.2.2.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2020 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6..8} ) - -inherit eutils python-any-r1 scons-utils flag-o-matic llvm desktop - -DESCRIPTION="Multi-platform 2D and 3D game engine" -HOMEPAGE="http://godotengine.org" -LICENSE="MIT" -SLOT="0" - -if [[ ${PV} = 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/godotengine/${PN}" - EGIT_BRANCH="master" -else - SRC_URI="https://github.com/godotengine/${PN}/archive/${PV}-stable.zip -> ${P}.zip" - S="${WORKDIR}/${P}-stable" - KEYWORDS="~amd64 ~x86" -fi - -IUSE=" - debug - +enet - +freetype - llvm - lto - +mbedtls - +opus - pulseaudio - theora - +udev - +vorbis - +webp" - -DEPEND=" - >=app-arch/bzip2-1.0.6-r6 - >=app-arch/lz4-0_p120 - >=app-arch/xz-utils-5.0.8 - >=app-arch/zstd-1.4.4 - >=dev-libs/json-c-0.11-r1 - dev-libs/libpcre2[pcre32] - >=media-libs/alsa-lib-1.0.28 - >=media-libs/flac-1.3.1-r1 - >=media-libs/libogg-1.3.1 - >=media-libs/libsndfile-1.0.25-r1 - media-libs/libvpx - >=media-libs/mesa-10.2.8[gles2] - webp? ( media-libs/libwebp ) - opus? ( media-libs/opus ) - enet? ( net-libs/enet ) - >=net-libs/libasyncns-0.8-r3 - mbedtls? ( net-libs/mbedtls ) - net-libs/miniupnpc - >=sys-apps/attr-2.4.47-r1 - >=sys-apps/tcp-wrappers-7.6.22-r1 - >=sys-apps/util-linux-2.25.2-r2 - !llvm? ( >=sys-devel/gcc-4.6.4:*[cxx] ) - >=sys-libs/gdbm-1.11 - >=sys-libs/glibc-2.20-r2 - >=sys-libs/libcap-2.22-r2 - >=sys-libs/zlib-1.2.8-r1 - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXcursor-1.1.14 - >=x11-libs/libXinerama-1.1.3 - freetype? ( >=media-libs/freetype-2.5.3-r1:2 ) - llvm? ( >=sys-devel/llvm-3.6.0 ) - >=media-libs/libpng-1.6.16:0= - pulseaudio? ( >=media-sound/pulseaudio-5.0-r7 ) - theora? ( media-libs/libtheora ) - udev? ( virtual/udev ) - virtual/glu - vorbis? ( >=media-libs/libvorbis-1.3.4 )" - -RDEPEND="${DEPEND}" - -pkg_setup() { - python-any-r1_pkg_setup - llvm_pkg_setup -} - -src_configure() { - if use llvm && ! tc-is-clang; then - einfo "Enforcing the use of clang due to USE=llvm ..." - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - fi - - strip-unsupported-flags - - MYSCONS=( - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - builtin_enet=$(usex enet) - builtin_freetype=no - builtin_libogg=no - builtin_libpng=no - builtin_libtheora=$(usex theora) - builtin_libvorbis=$(usex vorbis) - builtin_libvpx=no - builtin_libwebp=$(usex webp) - builtin_mbedtls=$(usex mbedtls) - builtin_miniupnpc=no - builtin_opus=$(usex opus) - builtin_pcre2=no - builtin_zlib=no - builtin_zstd=no - module_enet_enabled=$(usex enet) - module_freetype_enabled=$(usex freetype) - module_mbedtls_enabled=$(usex mbedtls) - module_opus_enabled=$(usex opus) - module_theora_enabled=$(usex theora) - module_vorbis_enabled=$(usex vorbis) - module_webp_enabled=$(usex webp) - platform=x11 - pulseaudio=$(usex pulseaudio) - tools=yes - progress=false - verbose=true - udev=$(usex udev) - use_llvm=$(usex llvm) - use_lld=$(usex llvm) - use_lto=$(usex lto) - target=$(usex debug debug release_debug) - ) -} - -src_compile() { - escons "${MYSCONS[@]}" -} - -src_install() { - newicon icon.svg ${PN}.svg - dobin bin/godot.* - if [[ "${ARCH}" == "amd64" ]]; then - if use llvm; then - make_desktop_entry godot.x11.tools.64.llvm Godot - with_desktop_entry=1 - else - make_desktop_entry godot.x11.tools.64 Godot - with_desktop_entry=1 - fi - fi - - if [[ "${ARCH}" == "x86" ]]; then - if use llvm; then - make_desktop_entry godot.x11.tools.32.llvm Godot - with_desktop_entry=1 - else - make_desktop_entry godot.x11.tools.32 Godot - with_desktop_entry=1 - fi - fi - - if ! [[ "${with_desktop_entry}" == "1" ]]; then - elog "Couldn't detect running architecture to create a desktop file." - fi -} diff --git a/dev-games/godot/godot-9999.ebuild b/dev-games/godot/godot-9999.ebuild index 2b8695e..99a1cb0 100644 --- a/dev-games/godot/godot-9999.ebuild +++ b/dev-games/godot/godot-9999.ebuild @@ -32,8 +32,10 @@ IUSE=" pulseaudio theora +udev + +vulkan +vorbis - +webp" + +webp + +X" DEPEND=" >=app-arch/bzip2-1.0.6-r6 @@ -42,14 +44,21 @@ DEPEND=" >=app-arch/zstd-1.4.4 >=dev-libs/json-c-0.11-r1 dev-libs/libpcre2[pcre32] + dev-util/glslang + vulkan? ( dev-util/vulkan-headers ) >=media-libs/alsa-lib-1.0.28 >=media-libs/flac-1.3.1-r1 + freetype? ( >=media-libs/freetype-2.5.3-r1:2 ) >=media-libs/libogg-1.3.1 + >=media-libs/libpng-1.6.16:0= >=media-libs/libsndfile-1.0.25-r1 media-libs/libvpx - >=media-libs/mesa-10.2.8[gles2] + theora? ( media-libs/libtheora ) + vorbis? ( >=media-libs/libvorbis-1.3.4 ) webp? ( media-libs/libwebp ) opus? ( media-libs/opus ) + >=media-libs/mesa-10.2.8[gles2] + pulseaudio? ( >=media-sound/pulseaudio-5.0-r7 ) enet? ( net-libs/enet ) >=net-libs/libasyncns-0.8-r3 mbedtls? ( net-libs/mbedtls ) @@ -57,22 +66,22 @@ DEPEND=" >=sys-apps/attr-2.4.47-r1 >=sys-apps/tcp-wrappers-7.6.22-r1 >=sys-apps/util-linux-2.25.2-r2 - !llvm? ( >=sys-devel/gcc-4.6.4:*[cxx] ) + !llvm? ( >=sys-devel/gcc-7.0.0:*[cxx] ) + llvm? ( >=sys-devel/llvm-6.0.0 ) >=sys-libs/gdbm-1.11 >=sys-libs/glibc-2.20-r2 >=sys-libs/libcap-2.22-r2 >=sys-libs/zlib-1.2.8-r1 - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXcursor-1.1.14 - >=x11-libs/libXinerama-1.1.3 - freetype? ( >=media-libs/freetype-2.5.3-r1:2 ) - llvm? ( >=sys-devel/llvm-3.6.0 ) - >=media-libs/libpng-1.6.16:0= - pulseaudio? ( >=media-sound/pulseaudio-5.0-r7 ) - theora? ( media-libs/libtheora ) + X? ( + >=x11-libs/libX11-1.6.2 + >=x11-libs/libXcursor-1.1.14 + x11-libs/libXi + >=x11-libs/libXinerama-1.1.3 + ) udev? ( virtual/udev ) - virtual/glu - vorbis? ( >=media-libs/libvorbis-1.3.4 )" + virtual/glu" + +#dev-lang/yasm RDEPEND="${DEPEND}" @@ -95,6 +104,7 @@ src_configure() { CXX="$(tc-getCXX)" builtin_enet=$(usex enet) builtin_freetype=no + builtin_glslang=no builtin_libogg=no builtin_libpng=no builtin_libtheora=$(usex theora) @@ -105,6 +115,7 @@ src_configure() { builtin_miniupnpc=no builtin_opus=$(usex opus) builtin_pcre2=no + builtin_vulkan=$(usex vulkan) builtin_zlib=no builtin_zstd=no module_enet_enabled=$(usex enet) @@ -114,7 +125,7 @@ src_configure() { module_theora_enabled=$(usex theora) module_vorbis_enabled=$(usex vorbis) module_webp_enabled=$(usex webp) - platform=x11 + platform=$(usex X linuxbsd server) pulseaudio=$(usex pulseaudio) tools=yes progress=false @@ -136,20 +147,20 @@ src_install() { dobin bin/godot.* if [[ "${ARCH}" == "amd64" ]]; then if use llvm; then - make_desktop_entry godot.x11.tools.64.llvm Godot + make_desktop_entry godot.linuxbsd.opt.tools.64.llvm Godot with_desktop_entry=1 else - make_desktop_entry godot.x11.tools.64 Godot + make_desktop_entry godot.linuxbsd.opt.tools.64 Godot with_desktop_entry=1 fi fi if [[ "${ARCH}" == "x86" ]]; then if use llvm; then - make_desktop_entry godot.x11.tools.32.llvm Godot + make_desktop_entry godot.linuxbsd.opt.tools.32.llvm Godot with_desktop_entry=1 else - make_desktop_entry godot.x11.tools.32 Godot + make_desktop_entry godot.linuxbsd.opt.tools.32 Godot with_desktop_entry=1 fi fi -- cgit v1.2.3-65-gdbad