diff options
| author |   Christian Strahl <c.a.strahl@gmail.com> | 2018-08-06 11:11:31 +0200 |
|---|---|---|
| committer |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2018-08-06 08:46:37 -0700 |
| commit | d516751513b4b24096031672168ee9a996f56678 (patch) | |
| tree | 60ca4e04d26135a7d1dc5df51c3376047599d139 /dev-util/clion | |
| parent | dev-util/clion: prevent file collisions with other jetbrains products (diff) | |
| download | gentoo-d516751513b4b24096031672168ee9a996f56678.tar.gz gentoo-d516751513b4b24096031672168ee9a996f56678.tar.bz2 gentoo-d516751513b4b24096031672168ee9a996f56678.zip | |
dev-util/clion: add use flag for jdk selection
Diffstat (limited to 'dev-util/clion')
| -rw-r--r-- | dev-util/clion/clion-2018.2.ebuild | 12 | ||||
| -rw-r--r-- | dev-util/clion/metadata.xml | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/dev-util/clion/clion-2018.2.ebuild b/dev-util/clion/clion-2018.2.ebuild index f7113f1c19cb..d000021e40fe 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 4f7225e07bb7..fd24c2d5ef8b 100644 --- a/dev-util/clion/metadata.xml +++ b/dev-util/clion/metadata.xml @@ -12,4 +12,7 @@ <longdescription lang="en"> Fully Integrated C/C++ Development Environment. </longdescription> + <use> + <flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag> + </use> </pkgmetadata> |