gentoo auto-resync : 10:04:2023 - 17:37:14

2 files changed, 25 insertions, 28 deletions

diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index a3a276718dda..b97f27433f7a 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,5 +1,5 @@
-DIST CLion-2022.2.4.tar.gz 895935196 BLAKE2B d14fa5bfd91df50f48fcc581133ac1292476fa6706eb486f020141d4addf6d902294766ec9e848974d3e10a31668307c32ef2d7e8db42d65c53d3f36bff4e7dc SHA512 af9cc8a0768877e9fa997655ac3bb5e8fc0fe1128902707bca8574855cce99de855a866d8fdef9c53ef970dfae6bce9edbb2b763dd49df1dc76d45ef85115dc0
 DIST CLion-2022.3.2.tar.gz 847111855 BLAKE2B 7e1814bcc683126f51eefd350b3d171a22d320ec658bc24b8831db1198756c59ee1be951665d10f2c3e76831f0d8ab55c0ae5fd9abeae0acf4e7009ce00f1faa SHA512 7ca87933323c0e1a4800eb75fbe40d179af987f33de51bca0e6b35264aaffea991712187719b837e07bd11457f8891f9f6038fb10f4e3157170d7818179b7531
-EBUILD clion-2022.2.4.ebuild 2921 BLAKE2B 4150a87c2b0a153e804e4c6a4b55bc4a4dcb2db5b1734696254e1733a7b679dd5acb1bf9ba6e2e08c8a5a01a0175c3dbd67537f6949925dbeac7da4b53c8e7f3 SHA512 e384e940f1e1e43250ff3fda8a2991df31e006d0e81080f3d951ede68481e52d6e93813050d6d647d0bbdd3164734956ac0c6cbc8585af3aefe4eeb1293b736e
+DIST CLion-2023.1.tar.gz 856517982 BLAKE2B ed3460070e235a93929dba016775cf4afd845cf99c2732d927a9296ba053bfc75129bcb568aa2a2a413e2b3244c2791cf264b9c1f2219888d04d8d7b46064378 SHA512 b80625f32437baf3aceac284c266246dc76f780fb624bd43588b7f767e807fe3a56b993076bcbf56007f062f2a449529bca5b4fc19505e6d1a92f90c22586f51
 EBUILD clion-2022.3.2.ebuild 2745 BLAKE2B 626a8a4365d67f3a21bc9ee5a7a822b8d4b18831baacd471ccdd7277a3e9a694cf261474c5534d83110e9b4d65a23a102d68a21cd5fa9f7d503331e50d6b05ec SHA512 a9a2deea9b25abcb67d590823ae1935785fdee37d9d77e62cb489ff573ba15ea64e55f28b9194a3878898913591d1c0b156ea2c4216ff84c849f4e721084db1d
+EBUILD clion-2023.1.ebuild 2745 BLAKE2B 626a8a4365d67f3a21bc9ee5a7a822b8d4b18831baacd471ccdd7277a3e9a694cf261474c5534d83110e9b4d65a23a102d68a21cd5fa9f7d503331e50d6b05ec SHA512 a9a2deea9b25abcb67d590823ae1935785fdee37d9d77e62cb489ff573ba15ea64e55f28b9194a3878898913591d1c0b156ea2c4216ff84c849f4e721084db1d
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2022.2.4.ebuild b/dev-util/clion/clion-2023.1.ebuild
index c924960bdb42..1faba92b159b 100644
--- a/dev-util/clion/clion-2022.2.4.ebuild
+++ b/dev-util/clion/clion-2023.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 inherit desktop wrapper
 
 DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="https://www.jetbrains.com/clion"
+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 )
@@ -14,19 +14,18 @@ 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 public-domain PSF-2 UoI-NCSA ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 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
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
+	dev-libs/wayland
 	dev-util/cmake
 	dev-util/ninja
 	media-libs/alsa-lib
@@ -35,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
@@ -49,61 +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*
-		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/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
 	)
 
-	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}
+	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,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"
 }