[gentoo-commits] repo/gentoo:master commit in: dev-util/clion/

[Georgy Yakovlev]

commit:     d516751513b4b24096031672168ee9a996f56678
Author:     Christian Strahl <c.a.strahl <AT> gmail <DOT> com>
AuthorDate: Mon Aug  6 09:11:31 2018 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> 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 @@
 	<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>