gentoo Easter resync : 12.04.2020

3 files changed, 164 insertions, 13 deletions

diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 14960a99334e..ffe787b684c7 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,6 +1,8 @@
-DIST ideaIC-3.2.193.6015.39.tar.gz 563811740 BLAKE2B 393adfb070e3cc41f290056cd4a55d676726dbf4ebcf2729cb25673a669c5f04185c267e64d687795e2555a543142d78f26c9ac83dab7415f3b9e3aa2136f2de SHA512 b71817d51ddac8f41e65d96ec8138d28d871465c52938f6cec837c9fdf5c16fb48bd0d08d3ee545aa3953516f2a56ee9faee0de3052361ad58685be26a15ee29
+DIST ideaIC-3.3.193.6494.35.tar.gz 563410584 BLAKE2B 765c22e5cf25f8daf465e14cbaca2803a560fe175ce8bd678c9d3890b033b50301aae6ced5c5e2c3a682158c7b5cce3daa38ace25e178a6be49cee5c51b60305 SHA512 c8593434fc230a9e3214cac6782130c42b5a98aadd2d27811be2bec3dae1a311b1af3995739b8eb198e6641974b55cb993b9505496e2688c8a8a67c210e3d9d8
+DIST ideaIC-3.4.193.6911.18.tar.gz 563415699 BLAKE2B d7f76da2251042c2141c39861b9a737cd7350e4140c6d9ff39182b489e5f14b8cdd033f402cecd08ff367e2a171b2137227813e6bf6d120b97cbf81e3eca3684 SHA512 39fb2aca3da78cf8282beae812662d237eba1ea2f55c30db5ebfcadd74af001d8fe07dc5cbb99794c3723487814eb096e5e70c4f654a6dafd0930432dfa86b83
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
-EBUILD idea-community-2019.3.2.193.6015.39.ebuild 4773 BLAKE2B 0ab6ddcee52c45bf03a46cf87750e4806ea7e46d0282aa1633743a6c7050ebb812a81071f6a30800938fcd85f4be427c33e46a1d7ccdea0be045482f4a52cb92 SHA512 f2c1c618f195424680801ddc730661ed821c3d97b29c37b01e6d05384e70b49ac2cbc46bb0e05e47e0d9c1284d93099118a130775a678ebbb2d86fef0b95abbf
+EBUILD idea-community-2019.3.3.193.6494.35.ebuild 4754 BLAKE2B ef634f522764d63b63ab4b8c333fc9bf38b496f9f9ed370a2e4f1c3393acba58888e08e47c4801552d80ded55e50b356c6152fa1bed8248a02895d2003fa24eb SHA512 334e344deb40b90a6ca5789f48fc667930791d3f365a04d0afba8218459ee2f92eaec5131e89b0c443a116a2cc52c7e852c1be9f2ba759a48536aa8e6c34cc9f
+EBUILD idea-community-2019.3.4.193.6911.18.ebuild 4754 BLAKE2B ef634f522764d63b63ab4b8c333fc9bf38b496f9f9ed370a2e4f1c3393acba58888e08e47c4801552d80ded55e50b356c6152fa1bed8248a02895d2003fa24eb SHA512 334e344deb40b90a6ca5789f48fc667930791d3f365a04d0afba8218459ee2f92eaec5131e89b0c443a116a2cc52c7e852c1be9f2ba759a48536aa8e6c34cc9f
 MISC metadata.xml 758 BLAKE2B 2009b0e669ca0b3cdaee71ac45bf1bbddf940ae8130b0b5c275fa825781dd71aa1c522307ee44cbcf75dde0796f6f2f77a7f4226917e5da52020cde563f4951b SHA512 9a2dfb6862b8f49de5680af6a8ee703c0e6687b5cd312cf304a60547075ee9e1f888516e2172ff54172f89524bf5bdc33d53848b6fbdb708bbea320b804de591
diff --git a/dev-util/idea-community/idea-community-2019.3.2.193.6015.39.ebuild b/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild
index b33ce52f9b75..fac1ff804200 100644
--- a/dev-util/idea-community/idea-community-2019.3.2.193.6015.39.ebuild
+++ b/dev-util/idea-community/idea-community-2019.3.3.193.6494.35.ebuild
@@ -61,9 +61,6 @@ QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
 # jbr11 binary doesn't unpack nicely into a single folder
 src_unpack() {
-	echo "S is ${S}"
-	echo "SRC_URI is ${SRC_URI}"
-	echo "unpack ${MY_PN}IC-${PV_STRING}.tar.gz"
 	if use !jbr11 ; then
 		default_src_unpack
 	else
@@ -80,19 +77,25 @@ src_prepare() {
 	else
 		JRE_DIR=jre
 	fi
+
 	if use jbr8; then
-			mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
+	else
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
 	fi
 
-	rm -vf "${S}"/"${JRE_DIR}"/lib/*/libavplugin* || die
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi* || die
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le || die
-	rm -vf "${S}"/bin/libdbm64* || die
+	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*
 
-	if [[ -f "${JRE_DIR}" ]]; then
-		for file in "${S}"/"${JRE_DIR}"/lib/amd64/{libfxplugins.so,libjfxmedia.so}
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
 		do
-			patchelf --set-rpath '$ORIGIN' $file || die
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
 		done
 	fi
 
diff --git a/dev-util/idea-community/idea-community-2019.3.4.193.6911.18.ebuild b/dev-util/idea-community/idea-community-2019.3.4.193.6911.18.ebuild
new file mode 100644
index 000000000000..fac1ff804200
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2019.3.4.193.6911.18.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 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
+# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
+# available separately
+JRE11_BASE="11_0_2"
+JRE11_VER="164"
+JRE_BASE="8u202"
+JRE_VER="1483.37"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
+		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
+		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/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 jbr8? ( GPL-2 )
+	jbr11? ( GPL-2 ) 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"
+
+#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
+#either (or neither) bundled
+#Defaulting to jbr8 to match upstream
+IUSE="+jbr8 -jbr11"
+REQUIRED_USE="jbr8? ( !jbr11 )"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	dev-util/lldb"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+# jbr11 binary doesn't unpack nicely into a single folder
+src_unpack() {
+	if use !jbr11 ; then
+		default_src_unpack
+	else
+		cd "${WORKDIR}"
+		unpack ${MY_PN}IC-${PV_STRING}.tar.gz
+		cd "${S}"
+		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+	fi
+}
+
+src_prepare() {
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	if use jbr8; then
+		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
+	else
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+	fi
+
+	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*
+
+	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.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+
+	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
+	if use jbr8 || use jbr11 ; then
+	if use jbr8; then
+		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
+	else
+		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	fi
+		if [[ -d ${JRE_DIR} ]]; then
+			for jrebin in $JRE_BINARIES; do
+				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+			done
+		fi
+	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
+}