commit: 2c6a2d8559e988e72db0a15981bec0b9c1d45574
Author: Stefan Cristian B. <stefan.cristian+git <AT> rogentos <DOT> ro>
AuthorDate: Fri Feb 21 19:10:32 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 17:48:32 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6a2d85
dev-util/clion: version bump 2024.3.3 and bugfixes
* Implemented the solution discussed with @thesamesam to strip
debug symbols and relocate them in ${EPREFIX}/opt/${P}.
JetBrains IDEs have almost identical .build-ids, causing conflicts
To prevent the conflicts, we relocate debug symbols per package.
The preferred method is stripping with objcopy and using debugedit to
point to their new /usr/lib/debug/ location.
Tinkered find to exclude files with $() in their name.
* Removed unneeded feature restrict "splitdebug".
* Removed unneeded sys-debug/gdb dependency.
Added instead as optfeature.
Signed-off-by: Stefan Cristian B. <stefan.cristian+git <AT> rogentos.ro>
Closes: https://github.com/gentoo/gentoo/pull/40642
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
dev-util/clion/Manifest | 1 +
dev-util/clion/clion-2024.3.3.ebuild | 121 +++++++++++++++++++++++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 75085c520823..74029ddbb072 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -2,3 +2,4 @@ DIST CLion-2022.3.2.tar.gz 847111855 BLAKE2B
7e1814bcc683126f51eefd350b3d171a22d
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.3.2.tar.gz 1573707642 BLAKE2B
098a573a62ed422c751896bf391be894d6f5b62948dccebfe683f144762520d03bcff55a0b70b9800d6181963429e9eac0a0c3f10606ac1caf7ae54cdcbafd62
SHA512
de2e7a01f302a8e783bc5a4e4733c0c76767c78e29e20bba3ffbfe5c56d3316071d41b12772ba22f140fac5e45f426bea32bfb9b8e3f2550518affe71f178cc3
+DIST CLion-2024.3.3.tar.gz 1579327778 BLAKE2B
8ec7e2cf43c1f21db0c9e6a30b0d1267d4f5a66fddf106411ef5ee6b42ea8a8942276dc41177add61236706885915e282c700d2ecdd28c6ae8898301e4d7f9f5
SHA512
643df0b1c72dd34063126496f8e22cc4a6831da60901a3f3a51778965994a2fe2bc03e3110b36b630b947a5e9ba0ecf688ba6dd9eef4503df4092b5028ee3caf
diff --git a/dev-util/clion/clion-2024.3.3.ebuild
b/dev-util/clion/clion-2024.3.3.ebuild
new file mode 100644
index 000000000000..6243805bfdc4
--- /dev/null
+++ b/dev-util/clion/clion-2024.3.3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper optfeature
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion/";
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz";
+
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+ Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+ 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/2024"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror"
+
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-util/lttng-ust:0/2.12
+ dev-libs/nspr
+ dev-libs/nss
+ dev-libs/wayland
+ dev-build/cmake
+ app-alternatives/ninja
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/mesa
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/zlib
+ x11-libs/cairo
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/libXxf86vm
+ x11-libs/libxcb
+ x11-libs/libxkbcommon
+ x11-libs/pango"
+
+QA_PREBUILT="opt/${PN}/*"
+
+src_prepare() {
+ default
+
+ local remove_me=(
+ Install-Linux-tar.txt
+ help/ReferenceCardForMac.pdf
+ bin/cmake
+ bin/gdb/linux
+ bin/lldb/linux
+ bin/ninja
+ lib/async-profiler/aarch64
+ plugins/clion-radler/DotFiles/linux-arm64
+ plugins/clion-radler/dotTrace.dotMemory/DotFiles/linux-arm64
+ plugins/remote-dev-server/selfcontained
+
plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_aarch64.so
+ )
+
+ 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/lib/libclazyPlugin.so" || die
+}
+
+src_install() {
+ local dir="/opt/${PN}"
+
+ insinto "${dir}"
+ doins -r *
+ 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}
+ # Fix #763582
+ fperms 755
"${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+ fi
+
+ fperms 755
"${dir}"/plugins/clion-radler/DotFiles/linux-x64/Rider.Backend
+
+ dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/x64/ninja
+
+ make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+ newicon "bin/${PN}.svg" "${PN}.svg"
+ make_desktop_entry "${PN}" "CLion" "${PN}" "Development;IDE;"
+
+ # recommended by:
https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+ 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
+}
