gentoo resync : 17.02.2021

4 files changed, 3 insertions, 88 deletions

diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 4a6ef0fd97be..5ae0b7c89f12 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,5 +1,3 @@
-DIST CLion-2020.3.1.tar.gz 624087156 BLAKE2B 5e67194ee08d837da4b5f62707d89befb40b89f577502b8f7575da7765cdf5d8bcebca4276fe75c6d4f154c2de10dc76a1507e944e3155382aa3507a3203a36a SHA512 e0338da95d909af00ad6c1901584971062f0e2aa2a0b6de7b75ac6cb6cd4a90ac09831d1e6a3770f61e2da81a969c3428693c2e192cadd623e7c4b0b094319a0
-DIST clion-2020.2.4.tar.gz 554105965 BLAKE2B f2854abed5773647152d1631e6b3a5493683336b63b6435af7461f41e1e001e834cdf9a4113a6a0ba4e1fd956d5b8a7706ac7b1f28db59ce6a9e05718cbd07b2 SHA512 f0fc517588bf1d61227bd65aa71da3276a643b67ca5dfe4dfc7d6460db5498fe5f2a86a9d5a98d5d3dbef1624baf926093e2a07fab84431d0c9b8daaaffc8a4f
-EBUILD clion-2020.2.4.ebuild 2181 BLAKE2B 7295567cd18a4672aaf8cdd39c8c3795f38c5ce63763628524780eec2c209088ed407bb76c8409bd9aa2567387bbe370d75428bf6df1bb8454739ec6957a0192 SHA512 cf096417f6e0d4493b711add4e253f62ec7e8e9cb29cf1740daecf2b23804b639059ed3b75f09f80f39d188816b9a8803f3e7dca200ade1d182e42f052d04580
-EBUILD clion-2020.3.1-r1.ebuild 2745 BLAKE2B 3d643fefb54fed93ab82bc6764b049990d5dc4fd33922ffb0dd248f1a06896cfeda36ecc9c95260687437cf4bc78b97eab76286ff328cb9e60363f9112eb9d0a SHA512 fb868e55e348552c2797c33c843e9a01fa304e4b0bdb9e7bf7ae4aac129e1c8a226a6eef2f4e8efb492f112ed9a6e49a863e90b8159332803bbcf6ca29f7faa3
-MISC metadata.xml 458 BLAKE2B 1393fb2b8c1487a670f3c2fc7c2fe9246d8f18bc7d33e2d494f0ffc3a3492285dab041f3cf810d16e78a312dd3936eb9bad0838ff9a8c3b6a4b7d80b90764fc4 SHA512 c00a66b6722a62222d06c325df55a3d946267ce7a4a452855933d721b936cd05aae5e9acdb784fc8e97235ead35e6625522c579397f43e9755619b1a8dcaccc7
+DIST CLion-2020.3.2.tar.gz 624043209 BLAKE2B 9a7d1ea2e83c06c27b595f042ba1a9768445ca0d79f6e2e227ed01252b49a72abf0f8c57d9418af31fc9f292bbe4d16306a1359dbf4622170f46d0e22f0b0999 SHA512 a70e9c8393ca8f96e51c2a575dbb67efee61d840198ed5d2dfff19a4d6e63f0612cbdc05752589b29702bb0c90ab1fa07859793f9bbd61d4a5afdd6a33dbae04
+EBUILD clion-2020.3.2.ebuild 2745 BLAKE2B 3d643fefb54fed93ab82bc6764b049990d5dc4fd33922ffb0dd248f1a06896cfeda36ecc9c95260687437cf4bc78b97eab76286ff328cb9e60363f9112eb9d0a SHA512 fb868e55e348552c2797c33c843e9a01fa304e4b0bdb9e7bf7ae4aac129e1c8a226a6eef2f4e8efb492f112ed9a6e49a863e90b8159332803bbcf6ca29f7faa3
+MISC metadata.xml 371 BLAKE2B c653f9e3be558bce98e7e901ec8d83c5e4d415730e18d2130ee35b3ede543a234f6bc40046cfed81b622d64893079a7052bb6cba0bca65486d5461c673daf12b SHA512 70640a8a676dde6f366f3ad3f81709103f229bdda41b1af50f238668876335692c7f8b6806610c24df6dcaedd8d86f58c6eed1f9befe9fe66dec9d95827a574a
diff --git a/dev-util/clion/clion-2020.2.4.ebuild b/dev-util/clion/clion-2020.2.4.ebuild
deleted file mode 100644
index 1fd308530f3a..000000000000
--- a/dev-util/clion/clion-2020.2.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 -> ${P}.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"
-IUSE="custom-jdk"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-RDEPEND="
-	dev-libs/libdbusmenu
-	dev-util/cmake
-	sys-devel/gdb
-	!custom-jdk? ( virtual/jdk )"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-	default
-
-	local remove_me=(
-		bin/gdb/linux
-		bin/lldb/linux
-		bin/cmake
-		license/CMake*
-		lib/pty4j-native/linux/ppc64le
-	)
-
-	use amd64 || remove_me+=( bin/fsnotifier64 lib/pty4j-native/linux/x86_64)
-	use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
-
-	use custom-jdk || remove_me+=( jbr )
-
-	rm -rv "${remove_me[@]}" || die
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,clang/linux/clang{d,-tidy}}
-
-	if use amd64; then
-		fperms 755 "${dir}"/bin/fsnotifier64
-	fi
-	if use arm; then
-		fperms 755 "${dir}"/bin/fsnotifier-arm
-	fi
-	if use x86; then
-		fperms 755 "${dir}"/bin/fsnotifier
-	fi
-
-	if use custom-jdk; then
-		if [[ -d jbr ]]; then
-			fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
-		fi
-	fi
-
-	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-2020.3.1-r1.ebuild b/dev-util/clion/clion-2020.3.2.ebuild
index a78766675052..a78766675052 100644
--- a/dev-util/clion/clion-2020.3.1-r1.ebuild
+++ b/dev-util/clion/clion-2020.3.2.ebuild
diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml
index 7b00c206608d..c92d84e054d0 100644
--- a/dev-util/clion/metadata.xml
+++ b/dev-util/clion/metadata.xml
@@ -9,7 +9,4 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>		
-	<use>
-		<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
-	</use>
 </pkgmetadata>