summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2020-05-13 13:19:43 +0300
committerMikle Kolyada <zlogene@gentoo.org>2020-05-13 13:21:24 +0300
commitc9953ef9dd7623e2df6c819ee61cedf70e74db34 (patch)
tree06a7710b942fe3f3390ca257f8a5917d9ae68b69 /dev-util/pycharm-professional
parentnet-misc/wget: s390 stable wrt bug #720688 (diff)
downloadgentoo-c9953ef9dd7623e2df6c819ee61cedf70e74db34.tar.gz
gentoo-c9953ef9dd7623e2df6c819ee61cedf70e74db34.tar.bz2
gentoo-c9953ef9dd7623e2df6c819ee61cedf70e74db34.zip
dev-util/pycharm-professional: allow bundled JDK on demand
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Diffstat (limited to 'dev-util/pycharm-professional')
-rw-r--r--dev-util/pycharm-professional/metadata.xml3
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild15
2 files changed, 11 insertions, 7 deletions
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.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}