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 70890138335 for ; Mon, 6 Aug 2018 15:47:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1AFD9E03EC; Mon, 6 Aug 2018 15:47:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D93E6E0809 for ; Mon, 6 Aug 2018 15:47:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 9A7D0335CF8 for ; Mon, 6 Aug 2018 15:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D41B4397 for ; Mon, 6 Aug 2018 15:47:21 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1533570397.d516751513b4b24096031672168ee9a996f56678.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/clion/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/clion/clion-2018.2.ebuild dev-util/clion/metadata.xml X-VCS-Directories: dev-util/clion/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: d516751513b4b24096031672168ee9a996f56678 X-VCS-Branch: master Date: Mon, 6 Aug 2018 15:47:21 +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-Archives-Salt: eada5951-1de5-49a6-adf5-238330f82af7 X-Archives-Hash: b6abb49eb377dec4f02f02ff52aee0e6 commit: d516751513b4b24096031672168ee9a996f56678 Author: Christian Strahl gmail com> AuthorDate: Mon Aug 6 09:11:31 2018 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Aug 6 15:46:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5167515 dev-util/clion: add use flag for jdk selection dev-util/clion/clion-2018.2.ebuild | 12 +++++++++++- dev-util/clion/metadata.xml | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dev-util/clion/clion-2018.2.ebuild b/dev-util/clion/clion-2018.2.ebuild index f7113f1c19c..d000021e40f 100644 --- a/dev-util/clion/clion-2018.2.ebuild +++ b/dev-util/clion/clion-2018.2.ebuild @@ -14,12 +14,14 @@ LICENSE="IDEA SLOT="0" KEYWORDS="~amd64 ~x86" RESTRICT="splitdebug" +IUSE="-custom-jdk" # RDEPENDS may cause false positives in repoman. # clion requires cmake and gdb at runtime to build and debug C/C++ projects RDEPEND=" sys-devel/gdb - dev-util/cmake" + dev-util/cmake + !custom-jdk? ( virtual/jdk )" QA_PREBUILT="opt/${P}/*" @@ -40,6 +42,8 @@ src_prepare() { use ppc || remove_me+=( plugins/tfsIntegration/lib/native/linux/ppc ) use x86 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86 ) + use custom-jdk || remove_me+=( jre64 ) + rm -rv "${remove_me[@]}" || die } @@ -50,6 +54,12 @@ src_install() { doins -r * fperms 755 "${dir}"/bin/{clion.sh,fsnotifier{,64},clang/linux/clang{d,-tidy}} + if use custom-jdk; then + if [[ -d jre64 ]]; then + fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200} + fi + fi + make_wrapper "${PN}" "${dir}/bin/${PN}.sh" newicon "bin/${PN}.svg" "${PN}.svg" make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;" diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml index 4f7225e07bb..fd24c2d5ef8 100644 --- a/dev-util/clion/metadata.xml +++ b/dev-util/clion/metadata.xml @@ -12,4 +12,7 @@ Fully Integrated C/C++ Development Environment. + + Install and use IntelliJ's custom JRE. +