gentoo resync : 14.05.2020

4 files changed, 74 insertions, 9 deletions

diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index d60bc3ba87c9..039ab8016c61 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -3,10 +3,12 @@ DIST pycharm-professional-2019.3.1.tar.gz 509724729 BLAKE2B cd466d9c2b0f9be8442c
 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.tar.gz 507643980 BLAKE2B f0869ebec8ae6396a4ff9579214a913be631d52e67cf12b437800a6f3292c96bef67b8b813bb9d703a2b6893ad27835a6868cce5ac4f3db818bacc2de4aed87c SHA512 23737bdd8bafb57dab794b4c874e6d14bb3b2591706bf13a835b0172fbe914ade932c701a313d982d7c393d02b15629a8273f3be092a92178ed0bfd4eff9baa5
 EBUILD pycharm-professional-2019.3.1.ebuild 1225 BLAKE2B f391b217ab5e079cea973682a259b5c9e2a538f81536c6d52134b6316239e11bee5badf789db2850c6241b448691c8101b44d5d1b562c8c27e2cc67902b8b203 SHA512 5fa13adbab2a9e321d955dd66fd3788a3a27dcb40a8214ebb100d6fc71abc357cbd1c10b0dd5468dbfef5a4c19c61779fd9e1e26e9c6face057e25d9ffedcc0b
 EBUILD pycharm-professional-2019.3.2.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
 EBUILD pycharm-professional-2019.3.3.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
 EBUILD pycharm-professional-2019.3.4.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
-EBUILD pycharm-professional-2020.1.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
-MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
+EBUILD pycharm-professional-2020.1.1.ebuild 1357 BLAKE2B b8f06bdc4dc28720cc57ba28816a2620e1ed5a074c629754c9e2167bd156417e67927992066849ac72506d242d786b9e4259fd4409de8e95ce5d8deacb74d78a SHA512 47ab4b4fc6f3723b1f96f781000eed81f8b8e3ade754dcccc30419acc26c233fe71c008db6a4fda7eb04725f60f3393393bf5630d94f18b79f01889d763c1a92
+EBUILD pycharm-professional-2020.1.ebuild 1357 BLAKE2B b8f06bdc4dc28720cc57ba28816a2620e1ed5a074c629754c9e2167bd156417e67927992066849ac72506d242d786b9e4259fd4409de8e95ce5d8deacb74d78a SHA512 47ab4b4fc6f3723b1f96f781000eed81f8b8e3ade754dcccc30419acc26c233fe71c008db6a4fda7eb04725f60f3393393bf5630d94f18b79f01889d763c1a92
+MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-professional/metadata.xml b/dev-util/pycharm-professional/metadata.xml
index d21de2d9f07b..c405595aa1a2 100644
--- a/dev-util/pycharm-professional/metadata.xml
+++ b/dev-util/pycharm-professional/metadata.xml
@@ -5,4 +5,7 @@
 	<name>Mikle Kolyada</name>
 	<email>zlogene@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name="bundled-jdk">Use bundled jdk</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
new file mode 100644
index 000000000000..921e9c358e61
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
@@ -0,0 +1,59 @@
+# 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"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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}
+
+	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.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
index bb09db041ff9..921e9c358e61 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.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"
 
@@ -28,16 +29,16 @@ QA_PREBUILT="opt/${PN}/bin/fsnotifier
 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}