commit:     3b957589420f4fbde497189b2fedcdbe9f3a73a3
Author:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Sun Jun 21 16:12:47 2020 +0000
Commit:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Sun Jun 21 16:12:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=3b957589

Update pycharm

Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>

 dev-util/pycharm-professional/Manifest             |  4 ++--
 ...ebuild => pycharm-professional-2020.1.2.ebuild} | 22 ++++++++--------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/dev-util/pycharm-professional/Manifest 
b/dev-util/pycharm-professional/Manifest
index 3a57cd9..9c638ab 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 169 BLAKE2B 
fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e
 SHA512 
a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2020.1.tar.gz 507643980 BLAKE2B 
f0869ebec8ae6396a4ff9579214a913be631d52e67cf12b437800a6f3292c96bef67b8b813bb9d703a2b6893ad27835a6868cce5ac4f3db818bacc2de4aed87c
 SHA512 
23737bdd8bafb57dab794b4c874e6d14bb3b2591706bf13a835b0172fbe914ade932c701a313d982d7c393d02b15629a8273f3be092a92178ed0bfd4eff9baa5
-EBUILD pycharm-professional-2020.1-r1.ebuild 1342 BLAKE2B 
48f867c657e01e265b1c94f565a32cd000112d6d22d7529ed5da959e08a9123828416ea7ac7eb5136b3e3034c96d18e743e095b3c1f690b4a182528f05957b4c
 SHA512 
c050ae0d56e51fb4144fd027e244252250ae15e55aa5ef6fdf154ac92391ac0ca9865d6492043cafdd12fb0ca45d45194dd1dfafd055b0fef7e051086e835a29
+DIST pycharm-professional-2020.1.2.tar.gz 507271542 BLAKE2B 
3422a76c6c9c966a3d5defa796025ad40bae2bbfa3bd2503566d124e6437bbbdd7d45066e69d24584b89d8d032ea8d94173aa1070eacd3fe909e426456b44e91
 SHA512 
2ae316b50e086d3f0497f4a2f95cebfe67f4db00633f9988177f7c3957fd6ff3aea5273961bbd3761fe63a09e13e151c36a7db7bf7f876e27fbf5903f46164c0
+EBUILD pycharm-professional-2020.1.2.ebuild 1357 BLAKE2B 
b8f06bdc4dc28720cc57ba28816a2620e1ed5a074c629754c9e2167bd156417e67927992066849ac72506d242d786b9e4259fd4409de8e95ce5d8deacb74d78a
 SHA512 
47ab4b4fc6f3723b1f96f781000eed81f8b8e3ade754dcccc30419acc26c233fe71c008db6a4fda7eb04725f60f3393393bf5630d94f18b79f01889d763c1a92
 MISC metadata.xml 468 BLAKE2B 
91e16245996e6ff3335065583096fe02b33021bfc467eaeabd4e2b21e0125502cdebc5c1f90565c19919463d4b65868f6c942ce3f79a6c7b3b3d5efbf8d6b5bd
 SHA512 
3de34c877a3730fe244fdbef0d3d10ba20ac3eee7f458163ce693560f05297f90c881bc2ce6b8d047e1d198c1835496bfea217a1c1f8e0cae426e3cd47acd05e

diff --git 
a/dev-util/pycharm-professional/pycharm-professional-2020.1-r1.ebuild 
b/dev-util/pycharm-professional/pycharm-professional-2020.1.2.ebuild
similarity index 85%
rename from dev-util/pycharm-professional/pycharm-professional-2020.1-r1.ebuild
rename to dev-util/pycharm-professional/pycharm-professional-2020.1.2.ebuild
index 635e532..921e9c3 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2020.1-r1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.2.ebuild
@@ -12,9 +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="jbr11"
+IUSE="+bundled-jdk"
 
-RDEPEND=">=virtual/jre-1.8
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
        dev-libs/libdbusmenu
        dev-python/pip"
 
@@ -29,24 +29,18 @@ QA_PREBUILT="opt/${PN}/bin/fsnotifier
 MY_PN=${PN/-professional/}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-src_prepare() {
-       default
-
-       rm -rf jre || die
-       if use !jbr11; then
-               rm -vrf "${S}"/jbr
-       fi
-}
-
 src_install() {
        insinto /opt/${PN}
        doins -r *
 
-       fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-       if use jbr11; then
-               fperms 755 "${dir}/jbr/bin/*"
+       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}

Reply via email to