Updating liguros repo21.1.2

6 files changed, 203 insertions, 145 deletions

diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index ac676f22ee5a..c033fe239344 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,2 @@
-DIST CLion-2020.3.tar.gz 631168831 BLAKE2B 4a0a00776a91d93ab7a70a639aef25b9fe604be22d594ca451118f0057679dc29f7329e2516da0ac362312b20b18b819c3f3a494c28c443e4af478be547747bd SHA512 27d533f5b5097590a346ec28e11820a2dd82412ba5a6a4ae7dbb274572ad90b2c853cd47f0bdeb3fb38c0411469a5f5d439105535b92916b75488532be2c3c77
-EBUILD clion-2020.3.ebuild 1414 BLAKE2B 7d9cb4ff64f062668e0c6bd2a58c1afe97e97aa86dc160382bc76c09c32e0d3e67a66a9a4ff93980aff8ced35f527d3e0df4a8b44cdd9f69003a9aa325b5c087 SHA512 a1c54fcd2bc36f50088261c9c0269af78c3a00066c2706e75bbe4cc4a04d11015e2168044345f96759d4a91b900fbe7ba79ac073f22a22268a3fbccac941bf5a
-EBUILD clion-9999.ebuild 1414 BLAKE2B 7d9cb4ff64f062668e0c6bd2a58c1afe97e97aa86dc160382bc76c09c32e0d3e67a66a9a4ff93980aff8ced35f527d3e0df4a8b44cdd9f69003a9aa325b5c087 SHA512 a1c54fcd2bc36f50088261c9c0269af78c3a00066c2706e75bbe4cc4a04d11015e2168044345f96759d4a91b900fbe7ba79ac073f22a22268a3fbccac941bf5a
+DIST CLion-2020.3.1.tar.gz 624087156 BLAKE2B 5e67194ee08d837da4b5f62707d89befb40b89f577502b8f7575da7765cdf5d8bcebca4276fe75c6d4f154c2de10dc76a1507e944e3155382aa3507a3203a36a SHA512 e0338da95d909af00ad6c1901584971062f0e2aa2a0b6de7b75ac6cb6cd4a90ac09831d1e6a3770f61e2da81a969c3428693c2e192cadd623e7c4b0b094319a0
+DIST clion-2020.2.4.tar.gz 554105965 BLAKE2B f2854abed5773647152d1631e6b3a5493683336b63b6435af7461f41e1e001e834cdf9a4113a6a0ba4e1fd956d5b8a7706ac7b1f28db59ce6a9e05718cbd07b2 SHA512 f0fc517588bf1d61227bd65aa71da3276a643b67ca5dfe4dfc7d6460db5498fe5f2a86a9d5a98d5d3dbef1624baf926093e2a07fab84431d0c9b8daaaffc8a4f
diff --git a/dev-util/clion/clion-2020.2.4.ebuild b/dev-util/clion/clion-2020.2.4.ebuild
new file mode 100644
index 000000000000..1fd308530f3a
--- /dev/null
+++ b/dev-util/clion/clion-2020.2.4.ebuild
@@ -0,0 +1,80 @@
+# 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.1-r1.ebuild
new file mode 100644
index 000000000000..a78766675052
--- /dev/null
+++ b/dev-util/clion/clion-2020.3.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 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"
+
+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-atk
+	app-accessibility/at-spi2-core
+	dev-libs/atk
+	dev-libs/libdbusmenu
+	dev-libs/nss
+	dev-util/cmake
+	media-libs/alsa-lib
+	media-libs/freetype
+	media-libs/mesa
+	net-print/cups
+	sys-devel/gdb
+	x11-libs/libdrm
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXi
+	x11-libs/libXScrnSaver
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	x11-libs/pango"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		bin/gdb/linux
+		bin/lldb/linux
+		bin/cmake
+		license/CMake*
+		lib/pty4j-native/linux/aarch64
+		lib/pty4j-native/linux/mips64el
+		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)
+
+	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,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 [[ -d jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+		# Fix #763582
+		fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+	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.ebuild b/dev-util/clion/clion-2020.3.ebuild
deleted file mode 100644
index ea0bc3f5f047..000000000000
--- a/dev-util/clion/clion-2020.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-IUSE="gdb lldb"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-        dev-util/cmake
-        gdb? ( sys-devel/gdb )
-	lldb? ( dev-util/lldb )
-        virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{clion.sh,clang/linux/clang{d,-tidy},fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/clion.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "CLion" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/clion/clion-9999.ebuild b/dev-util/clion/clion-9999.ebuild
deleted file mode 100644
index ea0bc3f5f047..000000000000
--- a/dev-util/clion/clion-9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-IUSE="gdb lldb"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-        dev-util/cmake
-        gdb? ( sys-devel/gdb )
-	lldb? ( dev-util/lldb )
-        virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{clion.sh,clang/linux/clang{d,-tidy},fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/clion.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "CLion" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml
new file mode 100644
index 000000000000..03ec9f1183cd
--- /dev/null
+++ b/dev-util/clion/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>c.a.strahl@gmail.com</email>
+		<name>Christian Strahl</name>
+	</maintainer>
+	<maintainer type="project">
+		<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>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>