gentoo resync : 28.04.2021

4 files changed, 7 insertions, 279 deletions

diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 3b84dbf3adb4..496c2892e6bf 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,7 +1,5 @@
 AUX idea-community-jdk.patch 485 BLAKE2B 3ccbddf308b1cb1af020086e7568e05b4a60b28d77e995194e622aa229340b82069bcdce0e5f05152ce626cdd574c3d891f494fdead59354223e96b0347036a6 SHA512 156f05a7f78c48e9ef9d0ed991d1fb390c5d40f7b32f41c02f51805fa2a6f523a255576fa4033ec98192f8626edd31d20259b0a37660506331ea8060826ffd4b
 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
-EBUILD idea-community-2020.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
-EBUILD idea-community-2021.3.1.203.6682.168-r1.ebuild 3954 BLAKE2B 0a76c751daec71affcd5b117559798b48862a89e1494cd27b328c27e5cb64fe59cbfc0ca28475e7572f418cf62920aa79d69a29c07f740e05bc031b8e1ec819d SHA512 bc0833aa192e0ca5fdaddbb8a27aaa7bf4fc9fc89cbad122c919c700f57af9f291fe59e5cd7b7a1c46479693922d0015e28e1f85000690d57d5d0af69e00f887
-EBUILD idea-community-2021.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
+EBUILD idea-community-2021.3.1.203.6682.168-r3.ebuild 4051 BLAKE2B 128eb44396642a71f35535a26d1b9e183ed077765ec044eaf22095dd56f2c461be99b3c3a6b037680d0ea3c6d6057013ed9a1c4e6d5204c17e6521fb4a27a209 SHA512 216b53ba4007a6f97ba8291dfc9a3455f1ed17fd4f4dcc4c6d811b09debee6aa2fd6e25c96e7f22dd1586ae304f9f5d18426d196911cf5eb0b8ce0e7497fee25
 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
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
deleted file mode 100644
index 0afe236ed52b..000000000000
--- a/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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
-	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-2021.3.1.203.6682.168-r1.ebuild b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r3.ebuild
index e6baaa247430..9fa39d4d83fb 100644
--- a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
+++ b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r3.ebuild
@@ -36,12 +36,13 @@ LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
 
 DEPEND="
 	|| (
-		~dev-java/openjdk-11.0.9_p11:11
-		~dev-java/openjdk-bin-11.0.9_p11:11
+		>=dev-java/openjdk-11.0.11_p9-r1:11
+		>=dev-java/openjdk-bin-11.0.11_p9-r1:11
 	)"
 RDEPEND="${DEPEND}
 	dev-java/jansi-native
 	dev-libs/libdbusmenu
+	media-libs/harfbuzz
 	=dev-util/lldb-10*"
 
 BDEPEND="dev-util/patchelf"
@@ -130,4 +131,7 @@ src_install() {
 	# 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
+
+	# remove bundled harfbuzz
+	rm -f "${D}"/lib/libharfbuzz.so || die
 }
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
deleted file mode 100644
index 0afe236ed52b..000000000000
--- a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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
-	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
-}