gentoo auto-resync : 24:02:2025 - 19:24:56

2 files changed, 22 insertions, 9 deletions

diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index efdfd51caf37..51c3d085657f 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,11 +1,11 @@
 DIST CLion-2022.3.2.tar.gz 847111855 BLAKE2B 7e1814bcc683126f51eefd350b3d171a22d320ec658bc24b8831db1198756c59ee1be951665d10f2c3e76831f0d8ab55c0ae5fd9abeae0acf4e7009ce00f1faa SHA512 7ca87933323c0e1a4800eb75fbe40d179af987f33de51bca0e6b35264aaffea991712187719b837e07bd11457f8891f9f6038fb10f4e3157170d7818179b7531
 DIST CLion-2023.1.4.tar.gz 858589459 BLAKE2B aed16b6cd6f88279f772fd38f63ff27019998ed1f7e63c1fcaba16fd1b43277d112806dd8ba4ff5e08a23fb5d80b0b80e24b7ef693e19a38220a7129c71d2d98 SHA512 b50ebcdb0b85ec00a9caaad6a309c8f37524a62115a8efeaa8b05819849bdda2d81bf2fae4a723d7d378fb32910a45af26aa5303006aff2e1ad96d5a4749ba90
 DIST CLion-2023.3.4.tar.gz 907669083 BLAKE2B ed0571341141e58b102cffbf3b96c7e6625f628b6092d93cc80c4d9ed5f47f25be3665ff26553e6c6584e41a519e102eceabe576986c44795a5257312dad1b76 SHA512 f5ab02ed8a3f854dc75483e7766267f043c7a493730900786a3a304e3f2fddaf12375eb6760e9438e8184b7a5405131a2e3ea7536be8b7a7ce0509b0901afc09
-DIST CLion-2024.1.tar.gz 1213246002 BLAKE2B b0060b98dc803e72513fb927c0d8b2762b9d0526d4708f75e3ed1b68642a2f01995b468a7df40b403eee4d619db9afe4430259a092506e139983ecee0629460b SHA512 9335b3811414919df8b251e25cf4a4155675c79c35de3a0ff21a30b06b46e130b0684fd2c6dcc17b4c8ee676211c6df9c84d6b6777bf7d88e1b2ec765c35f69b
 DIST CLion-2024.3.2.tar.gz 1573707642 BLAKE2B 098a573a62ed422c751896bf391be894d6f5b62948dccebfe683f144762520d03bcff55a0b70b9800d6181963429e9eac0a0c3f10606ac1caf7ae54cdcbafd62 SHA512 de2e7a01f302a8e783bc5a4e4733c0c76767c78e29e20bba3ffbfe5c56d3316071d41b12772ba22f140fac5e45f426bea32bfb9b8e3f2550518affe71f178cc3
+DIST CLion-2024.3.3.tar.gz 1579327778 BLAKE2B 8ec7e2cf43c1f21db0c9e6a30b0d1267d4f5a66fddf106411ef5ee6b42ea8a8942276dc41177add61236706885915e282c700d2ecdd28c6ae8898301e4d7f9f5 SHA512 643df0b1c72dd34063126496f8e22cc4a6831da60901a3f3a51778965994a2fe2bc03e3110b36b630b947a5e9ba0ecf688ba6dd9eef4503df4092b5028ee3caf
 EBUILD clion-2022.3.2.ebuild 2758 BLAKE2B a0e3766a8130b7003be4b3532914fdd4e8712452afd07da24563a3f4ccb876b6a2bd40f9aef148d4e3b2ea4196899bb724a165fe2f54ac03a8cc341f9c436e4e SHA512 4d65ba07e2445dc4962bdfba1b70af76c4e89c200a3dfe503bdf787388cc1c8386691cabb7087841bf3cb5599392fbffe3b83673dbcb21c686f5637dc1ad889b
 EBUILD clion-2023.1.4.ebuild 2758 BLAKE2B a0e3766a8130b7003be4b3532914fdd4e8712452afd07da24563a3f4ccb876b6a2bd40f9aef148d4e3b2ea4196899bb724a165fe2f54ac03a8cc341f9c436e4e SHA512 4d65ba07e2445dc4962bdfba1b70af76c4e89c200a3dfe503bdf787388cc1c8386691cabb7087841bf3cb5599392fbffe3b83673dbcb21c686f5637dc1ad889b
 EBUILD clion-2023.3.4-r1.ebuild 2998 BLAKE2B 782bec71f1e8248c4517b6bedfce5f365dce5288d4f4ab451b09fc18e7743419e562ee0f5b7d3204ffb7da021564d4b38ac04b0285ef7bdf4824fc0da588c885 SHA512 e1842772da2b0d9432f611f27da5ca0a3a41218c3b3afe8cb0dd8050dbab334d5e47ea6bd5fbeaf4e92000b105627b2011a9c598f5ac9c28cc1cc12caade3ba0
-EBUILD clion-2024.1-r1.ebuild 3148 BLAKE2B d0f8f66f9c7b39f6ed9af1f9c5c40d7382adbe8293c1557789190143111c70fad48c28d99219f591e4056db86480843eadd71a2076f3eb6af1e0d9e719b06c98 SHA512 c3896e25ce5aef26447639c35f6def76adfaa746b43b0f40a32dbac674bb227d7c5aa089914bc61f260c150cc225416856aeea3694e49a925468567e2d5916a7
 EBUILD clion-2024.3.2.ebuild 3085 BLAKE2B 49b1678641048792a0360d52e0f2efe211d5d3f7cd7740940948ba31f698e6b75ecf890726371b2b97e8900628996300824a7b74c9fb5b132765457ed103a954 SHA512 92150c3f7a33bd0ca215d60e73c82962d09ea772008e3320debc905a1b363d4ae2b0b0209964a5746b8462681976825b528acb4b25ec19faddb40be2298e4213
+EBUILD clion-2024.3.3.ebuild 3529 BLAKE2B 607746d5e027125c910456f5a9d757bd2e172283bc56a5e5c8a1262ebc287abd1f2ab4c017cb7174b03e0bd178a14e6c2f3cd76caee4bdfaef96cdb0700619ab SHA512 5db15ed79351c38c3dd8515211915eb0c7eed0094f3ead645f7c5319c7de7467a90493f76e0a5bb5e7c7634b834a12e423cab1e682af020fa308dd88b64126e5
 MISC metadata.xml 413 BLAKE2B b63281fe1b2d3832daca6738de3417befde23baa504a0648adf17ec5c42f859caef0ea82310e37d2b9d6f2bc3263f7bd4bd4f1e6755aeca23bab257d88dbc998 SHA512 49c51bfcef39d362207e6209a1ed590cca507837be2c3e818e6eff8c999f6e6f1616fcf759d914c0de57d6d9b7da76e1478dfb8150b2a6314c7293c90e2ce80c
diff --git a/dev-util/clion/clion-2024.1-r1.ebuild b/dev-util/clion/clion-2024.3.3.ebuild
index a915eaf7fcd5..6243805bfdc4 100644
--- a/dev-util/clion/clion-2024.1-r1.ebuild
+++ b/dev-util/clion/clion-2024.3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop wrapper
+inherit desktop wrapper optfeature
 
 DESCRIPTION="A complete toolset for C and C++ development"
 HOMEPAGE="https://www.jetbrains.com/clion/"
@@ -14,15 +14,14 @@ LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
 	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
 	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL-1.1 public-domain PSF-2
 	UoI-NCSA ZLIB"
-SLOT="0"
+SLOT="0/2024"
 KEYWORDS="~amd64"
-RESTRICT="bindist mirror splitdebug"
+RESTRICT="bindist mirror"
 
 BDEPEND="dev-util/patchelf"
 
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
-	dev-debug/gdb
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-util/lttng-ust:0/2.12
@@ -32,6 +31,7 @@ RDEPEND="
 	dev-build/cmake
 	app-alternatives/ninja
 	media-libs/alsa-lib
+	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/mesa
 	net-print/cups
@@ -75,10 +75,19 @@ src_prepare() {
 
 	rm -rv "${remove_me[@]}" || die
 
+	# removing debug symbols and relocating debug files as per #876295
+	# we're escaping all the files that contain $() in their name
+	# as they should not be executed
+	find . -type f ! -name '*$(*)*' -exec sh -c '
+		if file "{}" | grep -qE "ELF (32|64)-bit"; then
+			objcopy --remove-section .note.gnu.build-id "{}"
+			debugedit -b "${EPREFIX}/opt/${PN}" -d "/usr/lib/debug" -i "{}"
+		fi
+	' \;
+
 	patchelf --set-rpath '$ORIGIN' "jbr/lib/libjcef.so" || die
 	patchelf --set-rpath '$ORIGIN' "jbr/lib/jcef_helper" || die
-	patchelf --set-rpath '$ORIGIN/../lib' "bin/clang/linux/x64/libclazyPlugin.so" || die
-	patchelf --set-rpath '$ORIGIN/../lib' "bin/clang/linux/x64/libclazyPlugin.so.19git" || die
+	patchelf --set-rpath '$ORIGIN/../lib' "bin/clang/linux/x64/lib/libclazyPlugin.so" || die
 }
 
 src_install() {
@@ -86,7 +95,7 @@ src_install() {
 
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,format.sh,fsnotifier,inspect.sh,jetbrains_client.sh,ltedit.sh,remote-dev-server.sh,repair,restarter,clang/linux/x64/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
+	fperms 755 "${dir}"/bin/{clion.sh,format.sh,fsnotifier,inspect.sh,jetbrains_client.sh,ltedit.sh,remote-dev-server.sh,restarter,clang/linux/x64/bin/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
 
 	if [[ -d jbr ]]; then
 		fperms 755 "${dir}"/jbr/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,keytool,rmiregistry,serialver}
@@ -106,3 +115,7 @@ src_install() {
 	insinto /usr/lib/sysctl.d
 	newins - 30-"${PN}"-inotify-watches.conf <<<"fs.inotify.max_user_watches = 524288"
 }
+
+pkg_postinst() {
+	optfeature "Debugging support" dev-debug/gdb
+}