From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2A5715800F for ; Mon, 13 Feb 2023 11:46:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE2EFE0817; Mon, 13 Feb 2023 11:46:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C77DEE0809 for ; Mon, 13 Feb 2023 11:46:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E950A340D9B for ; Mon, 13 Feb 2023 11:46:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DF028AC for ; Mon, 13 Feb 2023 11:46:07 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1676287967.73c28bdfc504436a536d42b74008de9d65fe9bb8.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/files/, dev-games/godot/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/godot/Manifest dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch dev-games/godot/godot-4.0_beta17.ebuild X-VCS-Directories: dev-games/godot/ dev-games/godot/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 73c28bdfc504436a536d42b74008de9d65fe9bb8 X-VCS-Branch: master Date: Mon, 13 Feb 2023 11:46:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b549ea5-d7a6-4600-91c2-51164c881b60 X-Archives-Hash: dd656022cab90ff93549eb19e6d321d0 commit: 73c28bdfc504436a536d42b74008de9d65fe9bb8 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Feb 13 11:04:18 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Feb 13 11:32:47 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c28bdf dev-games/godot: drop 4.0_beta17 Signed-off-by: Ionen Wolkens gentoo.org> dev-games/godot/Manifest | 1 - .../files/godot-4.0_beta17-no-deprecated-fix.patch | 51 ----- dev-games/godot/godot-4.0_beta17.ebuild | 241 --------------------- 3 files changed, 293 deletions(-) diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest index a48e049aa66c..c21ae7c86b8d 100644 --- a/dev-games/godot/Manifest +++ b/dev-games/godot/Manifest @@ -1,3 +1,2 @@ DIST godot-3.5.1-stable.tar.xz 24153448 BLAKE2B 9d61276a2d82ef4f4487ec1046b7fa58f2b3626640b2db25c1f98c3f8e2ff40eddcf943fd9ffaaf6814fbafbbe7ef1d3f642d77af953b87731cff570ac3a5473 SHA512 59e5ca88534f542562971efb83b76561705f9ca8761311f01b4453857e7ae046c17cadd0d5ca6f6f56e262b5031294a8b9ad970fa6ffc95e1a6a1e1bae48d55f -DIST godot-4.0-beta17.tar.xz 31965968 BLAKE2B 897153aa9b36ccb7aea29749534e7a04452cd24ef5e8404063a1f96c6b61633d3f175279f08e49bbc6479a9df0f0ffe7cf4030d483502af7a90cc5cdd24f4010 SHA512 1a0a74a3538947cc3942fdbc27e941e8fe1b4424b257444176ea19fb6db3cc6c374f24190d1779a530cb61b5e42ff242842692d0878280862c5644e9de93d5c9 DIST godot-4.0-rc1.tar.xz 29009768 BLAKE2B 27b39cb048e3c928bac4bd8e1740ae477d6b831b35771ea1132ebd0d3c425587d5fec43057b6097c43c9b6182417d41b3bb85fe7e2336c297b1690c339bad097 SHA512 78e441e88e80e37df421080902ff3a6e460181be306043073b1070320b85854b601b3f34264f58b55b74ca65fa20a0013206e6e3e56481ea3fc86405fa2d467c diff --git a/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch b/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch deleted file mode 100644 index 8c4a14edc4bb..000000000000 --- a/dev-games/godot/files/godot-4.0_beta17-no-deprecated-fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -Backport to fix build with USE=-deprecated - -https://github.com/godotengine/godot/commit/c197b398c38727c6cce3d2fec7aa07d2e1020e09 -From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= -Date: Wed, 1 Feb 2023 22:29:33 +0100 -Subject: [PATCH] Fix build with `deprecated=no` not exclude - ProjectConverter3To4 options - -Fixes #72520. ---- a/main/main.cpp -+++ b/main/main.cpp -@@ -2366,8 +2366,10 @@ bool Main::start() { - String _export_preset; - bool export_debug = false; - bool export_pack_only = false; -+#ifndef DISABLE_DEPRECATED - bool converting_project = false; - bool validating_converting_project = false; -+#endif // DISABLE_DEPRECATED - #endif - - main_timer_sync.init(OS::get_singleton()->get_ticks_usec()); -@@ -2383,10 +2385,12 @@ bool Main::start() { - #ifdef TOOLS_ENABLED - } else if (args[i] == "--no-docbase") { - doc_base = false; -+#ifndef DISABLE_DEPRECATED - } else if (args[i] == "--convert-3to4") { - converting_project = true; - } else if (args[i] == "--validate-conversion-3to4") { - validating_converting_project = true; -+#endif // DISABLE_DEPRECATED - } else if (args[i] == "-e" || args[i] == "--editor") { - editor = true; - } else if (args[i] == "-p" || args[i] == "--project-manager") { -@@ -2547,6 +2551,7 @@ bool Main::start() { - return false; - } - -+#ifndef DISABLE_DEPRECATED - if (converting_project) { - int exit_code = ProjectConverter3To4(converter_max_kb_file, converter_max_line_length).convert(); - OS::get_singleton()->set_exit_code(exit_code); -@@ -2557,6 +2562,7 @@ bool Main::start() { - OS::get_singleton()->set_exit_code(exit_code); - return false; - } -+#endif // DISABLE_DEPRECATED - - #endif - diff --git a/dev-games/godot/godot-4.0_beta17.ebuild b/dev-games/godot/godot-4.0_beta17.ebuild deleted file mode 100644 index 712797804adc..000000000000 --- a/dev-games/godot/godot-4.0_beta17.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit bash-completion-r1 desktop optfeature python-any-r1 -inherit scons-utils toolchain-funcs xdg - -MY_P="${PN}-$(ver_rs 2 -)" - -DESCRIPTION="Multi-platform 2D and 3D game engine with a feature-rich editor" -HOMEPAGE="https://godotengine.org/" -SRC_URI="https://downloads.tuxfamily.org/godotengine/$(ver_rs 2 /)/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}" - -LICENSE=" - MIT - AFL-2.1 Apache-2.0 BSD Boost-1.0 CC0-1.0 LGPL-2.1+ Unlicense ZLIB - gui? ( CC-BY-4.0 ) tools? ( OFL-1.1 )" -SLOT="4" -KEYWORDS="~amd64" -# Enable roughly same as upstream by default so it works as expected, -# except raycast (tools-only heavy dependency), and deprecated. -IUSE="debug deprecated +gui raycast +runner test +theora +tools +upnp +vulkan +webp" -# disable tests until out of beta, tests themselves are new and can be volatile -RESTRICT="test" - -# dlopen: libX*,libglvnd -RDEPEND=" - app-arch/zstd:= - dev-games/recastnavigation:= - dev-libs/icu:= - dev-libs/libpcre2:=[pcre32] - media-libs/freetype[brotli,harfbuzz] - media-libs/harfbuzz:=[icu] - media-libs/libogg - media-libs/libpng:= - media-libs/libvorbis -