Updating liguros repo21.1.2

7 files changed, 305 insertions, 153 deletions

diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 6c63d4dc3ad3..efa611895f90 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,3 +1,2 @@
-DIST ideaIC-2020.3.tar.gz 738387806 BLAKE2B c2454441ce90fb80d965472b0859389bc2fc4bbc3ae79d022c387a14a56dc8e5c8b30ac720136fdf53d7a9b8912e6e83a07e2f880e7e1f690a2a7374789c9473 SHA512 bb85b4b4708730e04a75aa3bdbe5519a274425e23edc092dc5104966486252f53a75ed81c7c6e657c85822c50f24f1bc8453bff266051302206ec67a1bb6abf3
-EBUILD idea-community-2020.3.ebuild 1562 BLAKE2B ae143a477fe51f8d2710436ceb0ad5c74d32b9bc325b0288351dde4bae7f22a3974f9821deb811b7b7b61c1741895a96393686e3b541dae8a092d3f1af00679a SHA512 76244437043533e0ce3e788363c42c623651f7429697e55599b4ed5082c78a92053ef7a719df66150ed2cf1e3462e543aa6a052c5b4daa28ca60ff60e8605bf1
-EBUILD idea-community-9999.ebuild 1562 BLAKE2B ae143a477fe51f8d2710436ceb0ad5c74d32b9bc325b0288351dde4bae7f22a3974f9821deb811b7b7b61c1741895a96393686e3b541dae8a092d3f1af00679a SHA512 76244437043533e0ce3e788363c42c623651f7429697e55599b4ed5082c78a92053ef7a719df66150ed2cf1e3462e543aa6a052c5b4daa28ca60ff60e8605bf1
+DIST ideaIC-3.1.203.6682.168.tar.gz 577542631 BLAKE2B d47d017b76fa9106a55805b558bd49d6d45dd216ac28151f03cc2a7f3a751707b62fa49623bb04b426d90cfd1cce4e04b2490bb91ec01dfeccdf4a80f1694f7e SHA512 71849f9440c34359a23af1f4735c3b0ac6378f6ab8ddf5799ad7e26036dc87b4abbc234043bd368a7698daf91f83cf989539054db7e1fb9ea95ebf7d756ac068
+DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
diff --git a/dev-util/idea-community/files/idea-community-jdk.patch b/dev-util/idea-community/files/idea-community-jdk.patch
new file mode 100644
index 000000000000..b89e6773fd01
--- /dev/null
+++ b/dev-util/idea-community/files/idea-community-jdk.patch
@@ -0,0 +1,11 @@
+--- a/bin/idea.sh	2020-12-30 15:51:43.743936660 -0500
++++ b/bin/idea.sh	2020-12-30 17:58:16.759719538 -0500
+@@ -66,6 +66,8 @@ PATHS_SELECTOR="IdeaIC2020.3"
+ # shellcheck disable=SC2154
+ if [ -n "$IDEA_JDK" ] && [ -x "$IDEA_JDK/bin/java" ]; then
+   JDK="$IDEA_JDK"
++else
++  JDK="/opt/openjdk-bin-11" && [[ -d "/opt/openjdk-11" ]] && JDK="/usr/lib64/openjdk-bin-11"
+ fi
+ 
+ if [ -z "$JDK" ] && [ -s "${XDG_CONFIG_HOME:-$HOME/.config}/${PRODUCT_VENDOR}/${PATHS_SELECTOR}/idea.jdk" ]; then
diff --git a/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild b/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild
new file mode 100644
index 000000000000..bb95ab1a3858
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.8 build 1098.1  )
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS="~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15
+	|| (
+		dev-java/openjdk:11
+		dev-java/openjdk-bin:11
+	)"
+RDEPEND="${DEPEND}
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	=dev-util/lldb-10*
+	|| (
+		dev-java/openjdk:11
+		dev-java/openjdk-bin:11
+	)"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+	default_src_unpack
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;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
+}
diff --git a/dev-util/idea-community/idea-community-2020.3.ebuild b/dev-util/idea-community/idea-community-2020.3.ebuild
deleted file mode 100644
index bf6dae4f3363..000000000000
--- a/dev-util/idea-community/idea-community-2020.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The most intelligent Java IDE."
-HOMEPAGE="https://www.jetbrains.com/idea"
-LICENSE="Apache-2.0"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-	dev-libs/libdbusmenu
-"
-
-RESTRICT="bindist mirror strip"
-
-QA_PREBUILT="
-	/opt/${PN}/bin/fsnotifier
-	/opt/${PN}/bin/fsnotifier64
-	/opt/${PN}/bin/libdbm64.so
-"
-
-MY_PN="idea"
-S="${WORKDIR}/${MY_PN}IC-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/${MY_PN}/${MY_PN}IC-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/idea* "${S}" || die "Failed to move/rename source dir"
-}
-
-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/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/idea.sh /usr/bin/${PN}
-
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ IDEA Community" "${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/idea-community/idea-community-2021.3.1.203.6682.168.ebuild b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild
new file mode 100644
index 000000000000..bb95ab1a3858
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.8 build 1098.1  )
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS="~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15
+	|| (
+		dev-java/openjdk:11
+		dev-java/openjdk-bin:11
+	)"
+RDEPEND="${DEPEND}
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	=dev-util/lldb-10*
+	|| (
+		dev-java/openjdk:11
+		dev-java/openjdk-bin:11
+	)"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+	default_src_unpack
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;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
+}
diff --git a/dev-util/idea-community/idea-community-9999.ebuild b/dev-util/idea-community/idea-community-9999.ebuild
deleted file mode 100644
index bf6dae4f3363..000000000000
--- a/dev-util/idea-community/idea-community-9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The most intelligent Java IDE."
-HOMEPAGE="https://www.jetbrains.com/idea"
-LICENSE="Apache-2.0"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-	dev-libs/libdbusmenu
-"
-
-RESTRICT="bindist mirror strip"
-
-QA_PREBUILT="
-	/opt/${PN}/bin/fsnotifier
-	/opt/${PN}/bin/fsnotifier64
-	/opt/${PN}/bin/libdbm64.so
-"
-
-MY_PN="idea"
-S="${WORKDIR}/${MY_PN}IC-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/${MY_PN}/${MY_PN}IC-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/idea* "${S}" || die "Failed to move/rename source dir"
-}
-
-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/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/idea.sh /usr/bin/${PN}
-
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ IDEA Community" "${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/idea-community/metadata.xml b/dev-util/idea-community/metadata.xml
new file mode 100644
index 000000000000..741de41b55e7
--- /dev/null
+++ b/dev-util/idea-community/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>mpagano@gentoo.org</email>
+		<name>Mike Pagano</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>alicef@gentoo.org</email>
+		<name>Ferrazzi Alice</name>
+	</maintainer>
+	<longdescription lang="en">
+	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>