gentoo resync : 14.12.2020

6 files changed, 18 insertions, 179 deletions

diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index f1a0900fd494..9739ee0e8dfc 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,16 +1,10 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2019.3.1.tar.gz 509724729 BLAKE2B cd466d9c2b0f9be8442c719066d5647f0b9631dde38b782d23250207760247380419d7470826da2d5c4203dbca2742aa8fcd1987a4204d229cd700ac6f6a68f2 SHA512 3c3ad0546926dac4a0e336e04a16bb5f630066c7b2abeb16eda698fcc92dd0c165237bb3ad9b6382b38b989e67b8c3a4649bf8361421c7da6916a99eb3ea4633
-DIST pycharm-professional-2019.3.2.tar.gz 513486485 BLAKE2B eba9f0adb8f289f42ee2f50df506dfe628e3b835aedd7a8c0c03da39e5bc5921a6600ea7194c81674a5aad50cbc2f2afb0387dcc88a037e1a92a4fa0f2f3984b SHA512 e3a0e750c821ebd6736e39641d635db1c0a3aa00592d7ede204ce547fc12d69209a253caa4284f76607543f08da594f29ca38c3f8b586848c5b2277ae7227b8a
-DIST pycharm-professional-2019.3.3.tar.gz 513714430 BLAKE2B 7891d5290b87d8f01904860a80f2a5b7e90e41bf894decbdf04f5f322ed269eaf042954ad17656594ee85dc5518cbc69ea4c6b12b9f3febeb068021751fba5d8 SHA512 33f40be3f20370a0a62833510ed9c69b0a022e9298540bea0287038edfd6c8362cee1eb26592279728bf57f41bba2c921400ac56d4b371c8a3881d4f978115a0
-DIST pycharm-professional-2019.3.4.tar.gz 513944449 BLAKE2B 9f925eb48385abb57a833c8bd73307ba593fbea8ceae4df999b6c2a9ec54916e7e16d4ce8ed212842b1fc4f5383fac40fe6cc2ce5e99336852a96a2655c8e358 SHA512 187dd385ec07c908b13060135f1663cb5678ba82d017192ae0a4d2a8bf0f1e0ff51ec52f9b0fdc15d96f42808f801a971391de455afb52ea55cfb5f6d024d813
 DIST pycharm-professional-2020.1.1.tar.gz 507346192 BLAKE2B eb035967475fa1baf7833cf0b4ea18a7870e9ddeb68cef1ed6eaa0690ae21cb2482a61138cfe230928aa41a65e6f78078107d44b6c98b1ace7e6de22af5db555 SHA512 222f2e7284fb77018ace14907da6fbbe58bb8411f71aef9b2875e8c375ea2754a8595bfe9b5847bcfde2f8d59d0480f8fb4acf342231933a58f0f99fafc5a48d
 DIST pycharm-professional-2020.1.3.tar.gz 508036989 BLAKE2B 13bca1d093596bfedcad3c7837ab26c21631d15b5dce9ca62798baab281a7a4736e35fcbd96acc94b8e336119398c82c23583798ad53555eb8f1eac86febf031 SHA512 57a7878d3ee817778c7e1087d97e4d7a615fdd2f987fafecf4c6bcd7e1c0e7c1cb4411283214849cbd76fa92a2b98a074045b52cf1cd306f2e2995ed3b53e0e0
 DIST pycharm-professional-2020.1.tar.gz 507643980 BLAKE2B f0869ebec8ae6396a4ff9579214a913be631d52e67cf12b437800a6f3292c96bef67b8b813bb9d703a2b6893ad27835a6868cce5ac4f3db818bacc2de4aed87c SHA512 23737bdd8bafb57dab794b4c874e6d14bb3b2591706bf13a835b0172fbe914ade932c701a313d982d7c393d02b15629a8273f3be092a92178ed0bfd4eff9baa5
-EBUILD pycharm-professional-2019.3.1.ebuild 1070 BLAKE2B 76b072d78b685590ead13e288e125e6d29feaf090ff6b7f65af5b1b8ba0e9a773ad6a40d3141fa7f6c54a01142b1ba34f8311361b581057a83a04e4fa86c6989 SHA512 b59cbf885667cb316169e3d2e2fad32d97f384715909a994852fb4783c88e83242abea28c75ab32e114f08fbbacd6a06ece1fbe0849310c213ddd399ec174853
-EBUILD pycharm-professional-2019.3.2.ebuild 1072 BLAKE2B 71695bcbc8561ecf5a0e3ee012969443bdc9a595f54e42857908216f14b47007b8f161f123db642a427e54dc5d53cfe3f2e66d1d18fff7767ae94f2998a5829a SHA512 7ad674f1c7077e9ca26cce5005e631d66d689187b78520d28b14b9a13dc1fa4b9749c5857214c12a3110e02c2e63ba17a9f6c2a471ece4773a0159b0e476b7ac
-EBUILD pycharm-professional-2019.3.3.ebuild 1072 BLAKE2B 71695bcbc8561ecf5a0e3ee012969443bdc9a595f54e42857908216f14b47007b8f161f123db642a427e54dc5d53cfe3f2e66d1d18fff7767ae94f2998a5829a SHA512 7ad674f1c7077e9ca26cce5005e631d66d689187b78520d28b14b9a13dc1fa4b9749c5857214c12a3110e02c2e63ba17a9f6c2a471ece4773a0159b0e476b7ac
-EBUILD pycharm-professional-2019.3.4.ebuild 1072 BLAKE2B 71695bcbc8561ecf5a0e3ee012969443bdc9a595f54e42857908216f14b47007b8f161f123db642a427e54dc5d53cfe3f2e66d1d18fff7767ae94f2998a5829a SHA512 7ad674f1c7077e9ca26cce5005e631d66d689187b78520d28b14b9a13dc1fa4b9749c5857214c12a3110e02c2e63ba17a9f6c2a471ece4773a0159b0e476b7ac
+DIST pycharm-professional-2020.3.tar.gz 614570714 BLAKE2B 48ecb93a8db053b2b5983392b6270388fc1bf0ddf18e99453d04f87975ac3b8accfe14895b23db9d0b2eb199c0a64c9b137ea09142fc0cbe0d2ca6196ca2ec55 SHA512 e0c726abddbb98dc5d23043e6e5d2e41a3b813c18352ee3ad9596f0c37bdadfdefba3c74890bb9d2e9c0c8f6114841c2b52c6af2169e021256060452aacb7ec7
 EBUILD pycharm-professional-2020.1.1.ebuild 1202 BLAKE2B c62b786e55539696fd4494546afe2a848c65e0e397709959b316d2092b27c790593d941f542de9c3e198468c3f5727faeb432c56d533a2f94b52c2f39100548a SHA512 12a116cf5b92bd4a4df64a38353f2cb859f80ddacb1007b76adc95b6e92b3a38261aa91b6df6b7883253fff5fd8678cdb7ef31e0d7af9ce9dfd3d2f1aca8ad0f
-EBUILD pycharm-professional-2020.1.3.ebuild 1202 BLAKE2B c62b786e55539696fd4494546afe2a848c65e0e397709959b316d2092b27c790593d941f542de9c3e198468c3f5727faeb432c56d533a2f94b52c2f39100548a SHA512 12a116cf5b92bd4a4df64a38353f2cb859f80ddacb1007b76adc95b6e92b3a38261aa91b6df6b7883253fff5fd8678cdb7ef31e0d7af9ce9dfd3d2f1aca8ad0f
+EBUILD pycharm-professional-2020.1.3.ebuild 1200 BLAKE2B 78916efa1a114fb4ba92eb043c8f69c2e9fded97b6f47d8c71ff2b5ce682a9d25be191c62d9ba0b7abe16e9c2f2daa8bcafc37c98d69447372aea70bc6e820d5 SHA512 57ac46da0be9a950fad9daae363b55af3df23c6dc219d2d7ac53083c998eadc1c184878063a83a9d4741528328c3ffa6912fed70444c035158937066f3c489cb
 EBUILD pycharm-professional-2020.1.ebuild 1202 BLAKE2B c62b786e55539696fd4494546afe2a848c65e0e397709959b316d2092b27c790593d941f542de9c3e198468c3f5727faeb432c56d533a2f94b52c2f39100548a SHA512 12a116cf5b92bd4a4df64a38353f2cb859f80ddacb1007b76adc95b6e92b3a38261aa91b6df6b7883253fff5fd8678cdb7ef31e0d7af9ce9dfd3d2f1aca8ad0f
+EBUILD pycharm-professional-2020.3.ebuild 1339 BLAKE2B 1894f006eeb385ad9afe93e75616ddc1b58a4acd94d3a8219a02f97ce8d56e06461fd962964f42e468827f3fdf92672282b37843d02bd8aa66bcd6a2ae08c398 SHA512 b34418bf4365b0d7f3b5dfc5c68d4d13d2227da3f379aabbc39dfa43f11f44b042fe98ffb80b82373dcaec6100962e0068d37fd82d92d65546a084a7870f8a31
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
deleted file mode 100644
index 678583b314f9..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild
deleted file mode 100644
index 65ce101fe2d0..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild
deleted file mode 100644
index 65ce101fe2d0..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
index 035932264b04..39a685c8d78c 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+bundled-jdk"
 
 RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
index 65ce101fe2d0..c3b7f577705a 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.3.2.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
@@ -12,8 +12,9 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
 
-RDEPEND=">=virtual/jre-1.8
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
 	dev-libs/libdbusmenu
 	dev-python/pip"
 
@@ -24,22 +25,28 @@ QA_PREBUILT="*"
 MY_PN=${PN/-professional/}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
 src_install() {
 	insinto /opt/${PN}
 	doins -r *
 
+	if use bundled-jdk; then
+		fperms -R a+x /opt/pycharm-professional/jbr/bin/
+	else
+		rm -r "${D}"/opt/pycharm-professional/jbr/ || die
+	fi
+
 	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
 
 	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
 	newicon bin/${MY_PN}.png ${PN}.png
 	make_desktop_entry ${PN} ${PN} ${PN}
 
+	local rub
+
+	for rub in aarch64 mips64el ppc64le; do
+		rm -r "${D}"/opt/pycharm-professional/lib/pty4j-native/linux/${rub} || die
+	done
+
 	readme.gentoo_create_doc
 }