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 902C2158030 for ; Fri, 24 Feb 2023 09:27:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DB9CE07E2; Fri, 24 Feb 2023 09:26:59 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 798C5E07E2 for ; Fri, 24 Feb 2023 09:26:59 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7810E340E15 for ; Fri, 24 Feb 2023 09:26:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3FA98AE for ; Fri, 24 Feb 2023 09:26:56 +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: <1677230788.62fa996066c0748429b8d949610f5739456ac8da.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/godot/, dev-games/godot/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/godot/Manifest dev-games/godot/files/godot-4.0_beta8-scons.patch dev-games/godot/godot-4.0_rc2.ebuild X-VCS-Directories: dev-games/godot/files/ dev-games/godot/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 62fa996066c0748429b8d949610f5739456ac8da X-VCS-Branch: master Date: Fri, 24 Feb 2023 09:26:56 +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: a2cd2a6d-98b0-4150-b8b9-56d8b9061c6c X-Archives-Hash: 7959dd20dd519937f747176db62c2577 commit: 62fa996066c0748429b8d949610f5739456ac8da Author: Ionen Wolkens gentoo org> AuthorDate: Fri Feb 24 09:07:29 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Feb 24 09:26:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62fa9960 dev-games/godot: drop 4.0_rc2 Signed-off-by: Ionen Wolkens gentoo.org> dev-games/godot/Manifest | 1 - dev-games/godot/files/godot-4.0_beta8-scons.patch | 41 ---- dev-games/godot/godot-4.0_rc2.ebuild | 240 ---------------------- 3 files changed, 282 deletions(-) diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest index 813045e92311..0bac5203a4a9 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-rc2.tar.xz 29105476 BLAKE2B be30da3909ee881ed929747d97232ad1356b15d0bdb0f5ea07fedc6de300a776ffac4e156134218322ccc4b6e2d4ae457cf53ee72a2da0df645e98fb957e773f SHA512 5d36ca7018ed2963e92a0917a6310f787ab807f47a302f11b6c09ffd60e4e98800aef6957345feb61f49a623eb1993abf601669cd7b7511a5b1d974b129b11c3 DIST godot-4.0-rc3.tar.xz 29301840 BLAKE2B d981240f117839a05c00871b0e019c08e1f6136cea4935ae5028dbd06c16a6f34f7464309f44c1c0bebd982179cad092b4eb36529a412ccfcc27277fca5f3268 SHA512 4d5702b472e0ab52a86c7c47069ba08a8fe2c40d6b4437842c0610fe7e1d139d348ad521967ef844eb0442f78122864d97fab5a99fd21ec40e6b987c2af96c44 diff --git a/dev-games/godot/files/godot-4.0_beta8-scons.patch b/dev-games/godot/files/godot-4.0_beta8-scons.patch deleted file mode 100644 index 4a6254d93d72..000000000000 --- a/dev-games/godot/files/godot-4.0_beta8-scons.patch +++ /dev/null @@ -1,41 +0,0 @@ -* add option to respect AR - (respecting PKG_CONFIG is handled in the ebuild) -* don't strip even with debug symbols disabled -* fix icu unbundling underlinking -* handle recastnavigation unbundling ---- a/SConstruct -+++ b/SConstruct -@@ -239,4 +239,5 @@ - opts.Add("CXX", "C++ compiler") - opts.Add("CC", "C compiler") -+opts.Add("AR", "Archiver") - opts.Add("LINK", "Linker") - opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers") -@@ -545,10 +546,4 @@ - else: - env.Append(CCFLAGS=["-g2"]) -- else: -- if methods.using_clang(env) and not methods.is_vanilla_clang(env): -- # Apple Clang, its linker doesn't like -s. -- env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"]) -- else: -- env.Append(LINKFLAGS=["-s"]) - - if env["optimize"] == "speed": ---- a/platform/linuxbsd/detect.py -+++ b/platform/linuxbsd/detect.py -@@ -221,5 +221,5 @@ - - if not env["builtin_icu"]: -- env.ParseConfig("pkg-config icu-uc --cflags --libs") -+ env.ParseConfig("pkg-config icu-i18n --cflags --libs") - - if not env["builtin_harfbuzz"]: -@@ -232,4 +232,7 @@ - env.ParseConfig("pkg-config libenet --cflags --libs") - -+ if not env["builtin_recast"]: -+ env.ParseConfig("pkg-config recastnavigation --cflags --libs") -+ - if not env["builtin_squish"]: - env.ParseConfig("pkg-config libsquish --cflags --libs") diff --git a/dev-games/godot/godot-4.0_rc2.ebuild b/dev-games/godot/godot-4.0_rc2.ebuild deleted file mode 100644 index d2601d52d4ff..000000000000 --- a/dev-games/godot/godot-4.0_rc2.ebuild +++ /dev/null @@ -1,240 +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" -# tests need more figuring out, they are still somewhat new and 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 -