gentoo auto-resync : 12:02:2023 - 09:56:54

3 files changed, 18 insertions, 132 deletions

diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 51cd0d39fdb7..5155943af261 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,9 +1,7 @@
 DIST CLion-2022.1.3.tar.gz 785987464 BLAKE2B 5b23d54f260a8e6023cce936ba50320c9c815d7024495d4a28a6fe9fa795d9944cce36fedd7b619ccf8188750708eb3bca887f9fc856d2d4defe096505742852 SHA512 5caabc409e9e22e59a26886cb5a5785cc0f2c193e7548a9757d11b4e2b7dad5af7545f3c71b83e3111deb0e0c90507eb5ee6020dcba40e413c0882f2743ac49d
-DIST CLion-2022.2.1.tar.gz 893465319 BLAKE2B c60242c3912b7fbda601e06f6191162da42e3255ed8a3b8eeeab0d910f0d2aac767fa9bc9a4096114c2110f9104604d7294f2e97c4d67004f1c234040d45a6f3 SHA512 b48d8ef74b19e9ba1b75fc9c01ab052a2fbe0a7c1eab086fc0ab9551eabdcb878e478a6c7793bd2bc455453425313b2caa8e884f5ef0a6468ca73fa3877bf892
 DIST CLion-2022.2.4.tar.gz 895935196 BLAKE2B d14fa5bfd91df50f48fcc581133ac1292476fa6706eb486f020141d4addf6d902294766ec9e848974d3e10a31668307c32ef2d7e8db42d65c53d3f36bff4e7dc SHA512 af9cc8a0768877e9fa997655ac3bb5e8fc0fe1128902707bca8574855cce99de855a866d8fdef9c53ef970dfae6bce9edbb2b763dd49df1dc76d45ef85115dc0
-DIST CLion-2022.3.1.tar.gz 846981199 BLAKE2B 9ffdff75303be91611c3b5ba6a599c6200cb3e308adfd9d14c96060aacdd00e7900a8acebf541c563756afa951c7b2e37f0581fd92cea2756f8e82c06eda27bb SHA512 7af05a7de6535bee737750a325d445d3494eff3bc062a355653246e6ac09bc525f7c68e5349c41b4d217eb7c25c3bfe1e83095504fb1ae265d7093d054aef17e
+DIST CLion-2022.3.2.tar.gz 847111855 BLAKE2B 7e1814bcc683126f51eefd350b3d171a22d320ec658bc24b8831db1198756c59ee1be951665d10f2c3e76831f0d8ab55c0ae5fd9abeae0acf4e7009ce00f1faa SHA512 7ca87933323c0e1a4800eb75fbe40d179af987f33de51bca0e6b35264aaffea991712187719b837e07bd11457f8891f9f6038fb10f4e3157170d7818179b7531
 EBUILD clion-2022.1.3-r1.ebuild 2962 BLAKE2B cf320a340c3de6bf4b949faad24ef89976e1395c743f28f7adbb63446960cd9426d4c7290aa36216c02a85c958400b6bf9ce7cba257599f6d285eadb75b15fb6 SHA512 8fbf9ca8b1d7315f225470d83942e28ddfa41b235cb27b14222e8669c2b355170f884573f319fb5246b024d6e4d4d2cf24d513c7ff5d9b2b38a4ecf557b8836c
-EBUILD clion-2022.2.1-r2.ebuild 2980 BLAKE2B 839b519a564f1842802658abdd20ff4eb0d414112ffb843cbf09420f426ae13ea2de6aed993a7806c83e45bbd540f3ca14b40343a02b65e8d106def386cd40c8 SHA512 afb5c402fe3071fd020be4811599d87b9c380987f6752f42527ca365bdf103c8b4e71b60c566817f421ed49b9b76421531210935666e39965f047e13e18a9163
 EBUILD clion-2022.2.4.ebuild 2921 BLAKE2B 4150a87c2b0a153e804e4c6a4b55bc4a4dcb2db5b1734696254e1733a7b679dd5acb1bf9ba6e2e08c8a5a01a0175c3dbd67537f6949925dbeac7da4b53c8e7f3 SHA512 e384e940f1e1e43250ff3fda8a2991df31e006d0e81080f3d951ede68481e52d6e93813050d6d647d0bbdd3164734956ac0c6cbc8585af3aefe4eeb1293b736e
-EBUILD clion-2022.3.1.ebuild 2850 BLAKE2B 542fbf9dab3331add52e28b17003e902e0cf0d255b8d32b48da5aed4e8289eed6998ba685a16bfd4247b904fce6eeb2b19da24302538f52883516337579d58ce SHA512 e7beaa69a566cfb530cbb4806272992dd09e59ed669e2214899610db1334ee5157d915599f9a07a3036a48b5fc11c04fdbd7e075307c702222b0aeb1b663c407
+EBUILD clion-2022.3.2.ebuild 2745 BLAKE2B 626a8a4365d67f3a21bc9ee5a7a822b8d4b18831baacd471ccdd7277a3e9a694cf261474c5534d83110e9b4d65a23a102d68a21cd5fa9f7d503331e50d6b05ec SHA512 a9a2deea9b25abcb67d590823ae1935785fdee37d9d77e62cb489ff573ba15ea64e55f28b9194a3878898913591d1c0b156ea2c4216ff84c849f4e721084db1d
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.2.1-r2.ebuild b/dev-util/clion/clion-2022.2.1-r2.ebuild
deleted file mode 100644
index 5877a908c2d6..000000000000
--- a/dev-util/clion/clion-2022.2.1-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop wrapper
-
-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 public-domain PSF-2 UoI-NCSA ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist mirror splitdebug"
-
-BDEPEND="dev-util/patchelf"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-RDEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		( app-accessibility/at-spi2-atk dev-libs/atk )
-	)
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-util/cmake
-	dev-util/ninja
-	media-libs/alsa-lib
-	media-libs/freetype:2
-	media-libs/mesa
-	net-print/cups
-	sys-apps/dbus
-	sys-devel/gdb
-	x11-libs/cairo
-	x11-libs/pango
-	sys-libs/zlib
-	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/libdrm
-	x11-libs/libxcb
-	x11-libs/libxkbcommon"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-	default
-
-	local remove_me=(
-		bin/cmake
-		bin/lldb/linux
-		bin/gdb/linux
-		bin/ninja
-		license/CMake*
-		lib/pty4j-native/linux/aarch64
-		lib/pty4j-native/linux/arm
-		lib/pty4j-native/linux/mips64el
-		lib/pty4j-native/linux/ppc64le
-		plugins/remote-dev-server/selfcontained
-		plugins/cwm-plugin/quiche-native/linux-aarch64
-	)
-
-	use amd64 || remove_me+=( lib/pty4j-native/linux/x86_64 )
-	use x86 || remove_me+=( lib/pty4j-native/linux/x86 )
-
-	rm -rv "${remove_me[@]}" || die
-
-	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
-	do
-		if [[ -f "${file}" ]]; then
-			patchelf --set-rpath '$ORIGIN' ${file} || die
-		fi
-	done
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,clang/linux/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
-
-	if [[ -d jbr ]]; then
-		fperms 755 "${dir}"/jbr/bin/{java,javac,jdb,jrunscript,keytool,rmiregistry,serialver}
-		# Fix #763582
-		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
-	fi
-	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/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
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
-}
diff --git a/dev-util/clion/clion-2022.3.1.ebuild b/dev-util/clion/clion-2022.3.2.ebuild
index 7f8e5737c108..1faba92b159b 100644
--- a/dev-util/clion/clion-2022.3.1.ebuild
+++ b/dev-util/clion/clion-2022.3.2.ebuild
@@ -19,8 +19,6 @@ RESTRICT="bindist mirror splitdebug"
 
 BDEPEND="dev-util/patchelf"
 
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.46.0:2
 	dev-libs/expat
@@ -36,9 +34,9 @@ RDEPEND="
 	net-print/cups
 	sys-apps/dbus
 	sys-devel/gdb
-	x11-libs/cairo
-	x11-libs/pango
 	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/libdrm
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
@@ -50,57 +48,59 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/libXxf86vm
-	x11-libs/libdrm
 	x11-libs/libxcb
-	x11-libs/libxkbcommon"
+	x11-libs/libxkbcommon
+	x11-libs/pango"
 
-QA_PREBUILT="opt/${P}/*"
+QA_PREBUILT="opt/${PN}/*"
 
 src_prepare() {
 	default
 
 	local remove_me=(
+		help/ReferenceCardForMac.pdf
 		bin/cmake
-		bin/lldb/linux
 		bin/gdb/linux
+		bin/lldb/linux
 		bin/ninja
 		license/CMake*
-		plugins/remote-dev-server/selfcontained
 		plugins/cwm-plugin/quiche-native/darwin-aarch64
 		plugins/cwm-plugin/quiche-native/darwin-x86-64
 		plugins/cwm-plugin/quiche-native/linux-aarch64
 		plugins/cwm-plugin/quiche-native/win32-x86-64
+		plugins/remote-dev-server/selfcontained
 	)
 
 	rm -rv "${remove_me[@]}" || die
 
-	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	for file in "jbr/lib/{libjcef.so,jcef_helper}"
 	do
 		if [[ -f "${file}" ]]; then
-			patchelf --set-rpath '$ORIGIN' ${file} || die
+			patchelf --set-rpath '$ORIGIN' "${file}" || die
 		fi
 	done
 }
 
 src_install() {
-	local dir="/opt/${P}"
+	local dir="/opt/${PN}"
 
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,restart.py,clang/linux/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
+	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,restart.py,clang/linux/x64/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer}}
 
 	if [[ -d jbr ]]; then
 		fperms 755 "${dir}"/jbr/bin/{java,javac,jdb,jrunscript,keytool,rmiregistry,serialver}
 		# Fix #763582
 		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
 	fi
-	dosym -r "${EPREFIX}/usr/bin/ninja" "${dir}"/bin/ninja/linux/ninja
+
+	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
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+	insinto /usr/lib/sysctl.d
+	newins - 30-"${PN}"-inotify-watches.conf <<<"fs.inotify.max_user_watches = 524288"
 }