From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A66ED1382C5 for ; Wed, 13 May 2020 10:11:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF278E0A6F; Wed, 13 May 2020 10:11:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D602DE0A6F for ; Wed, 13 May 2020 10:11:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E5933502FA for ; Wed, 13 May 2020 10:11:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63E7B1D6 for ; Wed, 13 May 2020 10:11:02 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1589364658.2c1a12b8c8bec9b0bc4b00e468a0b6da3f55662c.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/pycharm-community/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/pycharm-community/metadata.xml dev-util/pycharm-community/pycharm-community-2020.1.ebuild X-VCS-Directories: dev-util/pycharm-community/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 2c1a12b8c8bec9b0bc4b00e468a0b6da3f55662c X-VCS-Branch: master Date: Wed, 13 May 2020 10:11:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 10ded00c-978b-499d-9d1c-33f7ffecc124 X-Archives-Hash: 4de24d0e09f49cf1aee0b3c2e698898d commit: 2c1a12b8c8bec9b0bc4b00e468a0b6da3f55662c Author: Mikle Kolyada gentoo org> AuthorDate: Wed May 13 10:10:15 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Wed May 13 10:10:58 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1a12b8 dev-util/pycharm-community: allow bundled jdk on demand Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Mikle Kolyada gentoo.org> dev-util/pycharm-community/metadata.xml | 3 +++ .../pycharm-community/pycharm-community-2020.1.ebuild | 15 ++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml index d21de2d9f07..c405595aa1a 100644 --- a/dev-util/pycharm-community/metadata.xml +++ b/dev-util/pycharm-community/metadata.xml @@ -5,4 +5,7 @@ Mikle Kolyada zlogene@gentoo.org + + Use bundled jdk + diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild index 0600c9803a8..f8be402a51b 100644 --- a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild +++ b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild @@ -12,8 +12,9 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz" LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising" 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" @@ -25,16 +26,16 @@ QA_PREBUILT="opt/${PN}/bin/fsnotifier MY_PN=${PN/-community/} -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-community/jbr/bin/ + else + rm -r "${D}"/opt/pycharm-community/jbr/ || die + fi + fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh} dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}