app-editors/zed: apply changes from ::gentoo

robert7k · Sep 1, 2024 · 6da757d · 6da757d
1 parent 53aefc2
commit 6da757d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/app-editors/zed/Manifest b/app-editors/zed/Manifest
@@ -1044,4 +1044,4 @@ DIST zune-jpeg-0.4.13.crate 62999 BLAKE2B 15938aa5539bdcdb7327dd8774cfd4600ac38b
 DIST zvariant-4.2.0.crate 82180 BLAKE2B 6d8309a223c32eae3c1ba4291d69bab395a3ef0f65da1e380552d27ccc547a31cf32f9dcf2feecce34276c065d044d0c897c9468b6df4c16efa94a0668dd19eb SHA512 ae7329db133ff8c262443bfe6fc10698606501ecdde8295367f3876e9c590730778ad2d4977c27e26288c92737055897686e7a0d30210723279c33da7467af80
 DIST zvariant_derive-4.2.0.crate 11057 BLAKE2B 891c141bfa0db95a5ac62ab2c31bef1215ef658a787d855c09c9b0e42485cd8aa52683c82a07394042615ec51b42ae5efcde81e7dbd2a35f7670888b28477df2 SHA512 8a50d143b38d57a757b3a6b6293c43d7db1a563ccf25002ad6b6a69b7c157765c604329659318a0cb64df1ecf78b3f0dbe88d6650740c016da9161719427f9c2
 DIST zvariant_utils-2.1.0.crate 7043 BLAKE2B b891c5fc2b5afb5eba01b9068b454a965b4f07548c1a080fd5b598165994a5177a7df5f39cf7263ea8bcc5d054c7d87012ca1588737d630d96f24f0d00dee6cf SHA512 345b70d1106b37df41426efdb1ba49bf270e00898381c2a8021b5761c59efdea55def45cb2e2598b130b6cba8733503f3997a55578bca90867ab3e8f2346f80e
-EBUILD zed-0.150.4.ebuild 24498 BLAKE2B 79af0e3fc33888fb21d4486d8680156dff0c95b197fb800c51f9e4f5eef4344342d657a8c7e2d3249d34ba9ee5877ebc89311d9efb1c58041a7d396b8ace0e73 SHA512 9c4b27ecc2c8e5cb542fef57319b590a5ce91a7c436860f3123064908a5e339aabdf215f4db4d8d6a339daf890ec0dd880d455274f3c152c6ec76766f70b4d71
+EBUILD zed-0.150.4.ebuild 24825 BLAKE2B 527b856d7072f4c13ed18006a733ee94b66e6f910f8b3f06df768939639b175ee064f367e57a508e6ba223d344c6bcc488b56c6678811021ffbd7c5b7bc770ab SHA512 c7bf8ceed76908039472d1257876d8dcf928efe6dc3365ca23b005a64519e2a64c66124d8c1dd5c4937f7c6cd4ede036240bf217c456564197a990400bc3a0eb
diff --git a/app-editors/zed/zed-0.150.4.ebuild b/app-editors/zed/zed-0.150.4.ebuild
@@ -1061,9 +1061,11 @@ declare -A GIT_CRATES=(
 	[xkbcommon]='https://github.com/ConradIrwin/xkbcommon-rs;fcbb4612185cc129ceeff51d22f7fb51810a03b2;xkbcommon-rs-%commit%'
 )
 
-inherit cargo desktop flag-o-matic toolchain-funcs xdg
+LLVM_COMPAT=( 18 )
 
-DESCRIPTION="The fast, collaborative code editor."
+inherit cargo check-reqs desktop flag-o-matic llvm-r1 toolchain-funcs xdg
+
+DESCRIPTION="The fast, collaborative code editor"
 HOMEPAGE="https://zed.dev https://github.com/zed-industries/zed"
 SRC_URI="
 	https://github.com/zed-industries/zed/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
@@ -1072,6 +1074,7 @@ SRC_URI="
 LICENSE="0BSD AGPL-3+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 GPL-3+ ISC LGPL-3 MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 KEYWORDS="~amd64"
+CHECKREQS_DISK_BUILD="8G"
 
 DEPEND="
 	app-arch/zstd:=
@@ -1085,19 +1088,26 @@ DEPEND="
 	dev-util/vulkan-tools
 	media-libs/alsa-lib
 	media-libs/fontconfig
-	media-libs/vulkan-loader
+	media-libs/vulkan-loader[X]
 	net-misc/curl
-	x11-libs/libxcb
-	x11-libs/libxkbcommon
+	sys-libs/zlib
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon[X]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
 	>=virtual/rust-1.80.0
 	dev-util/vulkan-headers
 	sys-devel/gettext
 	sys-devel/mold
+	$(llvm_gen_dep '
+		sys-devel/clang:${LLVM_SLOT}=
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
 "
 
+QA_FLAGS_IGNORED="usr/bin/zed"
+
 pkg_setup() {
 	if tc-is-gcc; then
 		export CARGO_PROFILE_RELEASE_LTO="true"
@@ -1142,3 +1152,10 @@ src_install() {
 	newicon -s 1024 crates/zed/resources/[email protected] zed.png
 	make_desktop_entry /usr/bin/zed Zed zed.png "TextEditor;Development;IDE"
 }
+
+src_test () {
+	mkdir -p "${HOME}/.config/zed" || die
+	mkdir -p "${HOME}/.local/share/zed/logs/" || die
+
+	cargo_src_test
+}