1 |
commit: 2c1a12b8c8bec9b0bc4b00e468a0b6da3f55662c |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 13 10:10:15 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 13 10:10:58 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1a12b8 |
7 |
|
8 |
dev-util/pycharm-community: allow bundled jdk on demand |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
dev-util/pycharm-community/metadata.xml | 3 +++ |
14 |
.../pycharm-community/pycharm-community-2020.1.ebuild | 15 ++++++++------- |
15 |
2 files changed, 11 insertions(+), 7 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml |
18 |
index d21de2d9f07..c405595aa1a 100644 |
19 |
--- a/dev-util/pycharm-community/metadata.xml |
20 |
+++ b/dev-util/pycharm-community/metadata.xml |
21 |
@@ -5,4 +5,7 @@ |
22 |
<name>Mikle Kolyada</name> |
23 |
<email>zlogene@g.o</email> |
24 |
</maintainer> |
25 |
+<use> |
26 |
+ <flag name="bundled-jdk">Use bundled jdk</flag> |
27 |
+</use> |
28 |
</pkgmetadata> |
29 |
|
30 |
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild |
31 |
index 0600c9803a8..f8be402a51b 100644 |
32 |
--- a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild |
33 |
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild |
34 |
@@ -12,8 +12,9 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz" |
35 |
LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising" |
36 |
SLOT="0" |
37 |
KEYWORDS="~amd64 ~x86" |
38 |
+IUSE="+bundled-jdk" |
39 |
|
40 |
-RDEPEND=">=virtual/jre-1.8 |
41 |
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 ) |
42 |
dev-libs/libdbusmenu |
43 |
dev-python/pip" |
44 |
|
45 |
@@ -25,16 +26,16 @@ QA_PREBUILT="opt/${PN}/bin/fsnotifier |
46 |
|
47 |
MY_PN=${PN/-community/} |
48 |
|
49 |
-src_prepare() { |
50 |
- default |
51 |
- |
52 |
- rm -rf jre || die |
53 |
-} |
54 |
- |
55 |
src_install() { |
56 |
insinto /opt/${PN} |
57 |
doins -r * |
58 |
|
59 |
+ if use bundled-jdk; then |
60 |
+ fperms -R a+x /opt/pycharm-community/jbr/bin/ |
61 |
+ else |
62 |
+ rm -r "${D}"/opt/pycharm-community/jbr/ || die |
63 |
+ fi |
64 |
+ |
65 |
fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh} |
66 |
|
67 |
dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN} |