[gentoo-commits] repo/user/ssnb:master commit in: dev-util/rubymine/, dev-util/idea-ultimate/

[Samuel Bernardo]

commit:     4f3ba3883bfb4658c46ce66727ab6de8b251e35d
Author:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Wed Apr 29 19:21:46 2020 +0000
Commit:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Wed Apr 29 19:21:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=4f3ba388

Add jbr11 useflag to rubymine and update metadata. Update metadata for idea-ultimate.

Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>

 dev-util/idea-ultimate/Manifest            |  2 +-
 dev-util/idea-ultimate/metadata.xml        | 22 ++++++++++++----------
 dev-util/rubymine/Manifest                 |  4 ++--
 dev-util/rubymine/metadata.xml             |  6 ++++++
 dev-util/rubymine/rubymine-2020.1.0.ebuild | 28 ++++++++++++++--------------
 5 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index fde4459..5fb23e2 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -12,4 +12,4 @@ EBUILD idea-ultimate-2019.3.3.193.6494.35.ebuild 1750 BLAKE2B 62e3e1a0c342e8465a
 EBUILD idea-ultimate-2019.3.4.193.6911.18.ebuild 1750 BLAKE2B 62e3e1a0c342e8465a1af39b6f4180367a5518059b9dee5307eb2050fe2ed07e925e9183e95cada4a8570ddce93e570066857ea128b22ef8add9743db430af71 SHA512 f27985a3075afd4f11111b31d83e01051f66a26d32dca4c382472a6e8d81320dd30d55009b85285df66332d833d9ec8ed47b22020663bde5d53a6f0160ce94e3
 EBUILD idea-ultimate-2020.1.0.201.6668.121.ebuild 4571 BLAKE2B e5379b8e794739e25b86ba16dbd8be51e409a5a261c3a6b83ea6baa80461fd3ba63d1be30292920980f572a1e921a62e4b530e32d0691cbf76ec07082a08bd91 SHA512 427d94a12ca25b3518aa039f9cf6bd84ffe1b65201e2b2f3a72e9ec3fca24522091f9293853cf3c89500f499a0a59f748d87af5d3d30ba2241fdfb9c67ebc402
 MISC ChangeLog 142 BLAKE2B d6bb9a7ff30fcbf78573ea65cf495cdc21393b0e9e546f9b5df7f9b5d358b362e7741509b6625d1dee6ae4f6b7ea33e4a88fc7e6d53b34745c3234c377ba690d SHA512 f66d54089ee757d3bc997f4edba58e6b6b91d47c6fca9f33edf4bfc9e03acabfc7af723c1238c313ccf6cde747c7b91274e67c15abc92da8dd6dd5ac58006b7b
-MISC metadata.xml 594 BLAKE2B 3d60d5f3bccb0290e644b5ff032ca7ac1d7bf18d2f183ff9de638130b9d33582b3c36888a3f318514ab2b1eb5c384ee56db0c1d4bd64ed907db2c6788f3c393c SHA512 2c830e91b8a9f97f8708392469121a4f5309e99cd58138a0d661394a5ca8a7c07ce47bc0cc9516aa1e6b106131b492fbbee6522be419e6ed7690d88cf2510df2
+MISC metadata.xml 786 BLAKE2B 4d178ed573815c59c26f4ca4873250df7da55588762b231f34a69cddbe2844a130fd743fbb796a0c0bf6445405d5034a60eabd59d4eebcc055da86c8a53f6d21 SHA512 13eb523dd3b6fcf90fef0135a27195f8deb7cbd635b74beaa99ab479310fdedb9aca88071c66738cf7b6a22a808ba3e5bbe1a6c6e9b243b0539c8f474dbb7fc6

diff --git a/dev-util/idea-ultimate/metadata.xml b/dev-util/idea-ultimate/metadata.xml
index 92ad3e3..64baf9d 100644
--- a/dev-util/idea-ultimate/metadata.xml
+++ b/dev-util/idea-ultimate/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>samuelbernardo.mail@×××××.com</email>
-	<name>Samuel Bernardo</name>
-	<description>Personal repository</description>
-</maintainer>
-<longdescription lang="en">
+	<maintainer type="person">
+		<email>samuelbernardo.mail@×××××.com</email>
+		<name>Samuel Bernardo</name>
+		<description>Personal repository</description>
+	</maintainer>
+	<longdescription lang="en">
 	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
-</longdescription>
-<use>
-	<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="jbr8">Install and use the Java 8 based version of JetBrains Runtime.</flag>
+		<flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag>
+		<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
+	</use>
 </pkgmetadata>

diff --git a/dev-util/rubymine/Manifest b/dev-util/rubymine/Manifest
index 3af40fd..8474971 100644
--- a/dev-util/rubymine/Manifest
+++ b/dev-util/rubymine/Manifest
@@ -7,5 +7,5 @@ EBUILD rubymine-2019.3.0.ebuild 951 BLAKE2B 2ace3a90eb5c28bcb91b6de75f1955b7992e
 EBUILD rubymine-2019.3.1.ebuild 951 BLAKE2B 4764d6f787179ac00afa68c93b4f58853550572dd2a36090eb69def6e6ce44b8ae467eb3f6865b921184b63e46c877670d78aebfb991c5aa51e2cabe02c4e547 SHA512 8ef72acbf0f590eca47c842f3f008cc9fd16b363491fecfe7c7069325ae2e028b4429712b1274f3afb89820d1c74eafbe137a01c98dfbcc157952861fd7d934c
 EBUILD rubymine-2019.3.3.ebuild 951 BLAKE2B 4764d6f787179ac00afa68c93b4f58853550572dd2a36090eb69def6e6ce44b8ae467eb3f6865b921184b63e46c877670d78aebfb991c5aa51e2cabe02c4e547 SHA512 8ef72acbf0f590eca47c842f3f008cc9fd16b363491fecfe7c7069325ae2e028b4429712b1274f3afb89820d1c74eafbe137a01c98dfbcc157952861fd7d934c
 EBUILD rubymine-2019.3.4.ebuild 951 BLAKE2B 4764d6f787179ac00afa68c93b4f58853550572dd2a36090eb69def6e6ce44b8ae467eb3f6865b921184b63e46c877670d78aebfb991c5aa51e2cabe02c4e547 SHA512 8ef72acbf0f590eca47c842f3f008cc9fd16b363491fecfe7c7069325ae2e028b4429712b1274f3afb89820d1c74eafbe137a01c98dfbcc157952861fd7d934c
-EBUILD rubymine-2020.1.0.ebuild 1459 BLAKE2B a48bb5451859b36dbd63555ade4291e0751aa924d43c9229dabfbb26981760f9aea51ac10c266db7c37edaf26182093ad87fdeac0370950a5c5149ca587a4a6a SHA512 42f33db7e6e1a37c604ef77f53f59b3ffeec70afee14970e1467eecae3196a54ac29c77cca26901b6e0172c54c256bf93aee500b2d6c9aa7c7f13e0840f9b682
-MISC metadata.xml 246 BLAKE2B fc8d6245f577ed3dc445e459694a18f1d950a722dbb72bfd7508f1ba7c52f264fce2c4eda4b52e238a80f6765243a27d396a749dadbdf6a4b6931c25f8404bfa SHA512 cd6648a75839e6059cf877aa79a84600be0a63de66f59efd217ad91bac55a7ed4afd5ce88c90a262b4dd044734403fb90a049b8f19a42289ec3ef1d827b66d77
+EBUILD rubymine-2020.1.0.ebuild 1334 BLAKE2B 09e8431eeacdf761e145e584b293d0a36668833dfa06838833aee1bf0e80e555b1edbb853b01b14dfc837bee64ac296aaad110402076aa5e8359c9170e20402b SHA512 d981f13d375f5ea65c6b820dc378262767b38d4fc5e0fc34304b7b45a1b2965c7293c62781afc7ce3fe1816873008580353963a692266e68530747abc8f24aff
+MISC metadata.xml 491 BLAKE2B dfd8dbb4d40e98d084e529a53498281b0e9cbfda96e1fbb637c61bcb42c74d3fe73b1c7657621af08089d07095097d21894b22a7a04294d176793169319d9a0d SHA512 cace297fb88d0e04b4e8bba58661aa9c56ef15a87b02a92977e33dbeff7e37a28d05eabbe73624ac42b6a5a7f8be738c4d39207856099627ed50668c7d074de6

diff --git a/dev-util/rubymine/metadata.xml b/dev-util/rubymine/metadata.xml
index 2241f06..f6ace43 100644
--- a/dev-util/rubymine/metadata.xml
+++ b/dev-util/rubymine/metadata.xml
@@ -5,4 +5,10 @@
 		<email>samuelbernardo.mail@×××××.com</email>
 		<name>Samuel Bernardo</name>
 	</maintainer>
+	<longdescription lang="en">
+	RubyMine is a cross-platform IDE that supports Ruby, Ruby on Rails and web development.
+	</longdescription>
+	<use>
+		<flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag>
+	</use>
 </pkgmetadata>

diff --git a/dev-util/rubymine/rubymine-2020.1.0.ebuild b/dev-util/rubymine/rubymine-2020.1.0.ebuild
index 5bdd3bd..585cbbf 100644
--- a/dev-util/rubymine/rubymine-2020.1.0.ebuild
+++ b/dev-util/rubymine/rubymine-2020.1.0.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
-inherit eutils versionator
+EAPI=7
+inherit eutils desktop
 
-SLOT="$(get_major_version)"
+SLOT="$(ver_cut 1)"
 RDEPEND=">=virtual/jdk-1.7"
 
 MY_PN="RubyMine"
-MY_PV="$(get_version_component_range 1-2)"
+MY_PV="$(ver_cut 1-2)"
 RESTRICT="strip"
 QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
 
@@ -17,7 +17,7 @@ DESCRIPTION="The most intelligent Ruby and Rails IDE"
 HOMEPAGE="http://jetbrains.com/ruby/"
 SRC_URI="http://download.jetbrains.com/ruby/${MY_PN}-${MY_PV}.tar.gz"
 LICENSE="all-rights-reserved"
-IUSE=""
+IUSE="jbr11"
 KEYWORDS="~amd64 ~x86"
 S=${WORKDIR}/${MY_PN}-${MY_PV}
 
@@ -26,17 +26,14 @@ src_prepare() {
 	rm -vrf "${S}"/lib/libpty/macosx
 	rm -vrf "${S}"/lib/libpty/win
 
+	if use !jbr11; then
+		rm -vrf "${S}"/jbr
+	fi
+
 	# Java config
 	#if use amd64; then local SUFFIX="64"; fi
 	#sed -i 's/lcd/on/' "${S}/bin/${PN}${SUFFIX}.vmoptions"
 	#echo "-Dswing.aatext=true" >> "${S}/bin/${PN}${SUFFIX}.vmoptions"
-	cat << EOF >> "${S}/bin/${PN}-loader.sh"
-#!/bin/sh
-if [ -z \${RUBYMINE_JDK} ]; then
-	export RUBYMINE_JDK="\${JAVA_HOME}"
-fi
-exec "/opt/${P}/bin/${PN}.sh" "\$@"
-EOF
 
 	eapply_user
 }
@@ -47,9 +44,12 @@ src_install() {
 
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}/bin/${PN}.sh" "${dir}/bin/rinspect.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64" "${dir}/bin/${PN}-loader.sh"
+	fperms 755 "${dir}/bin/${PN}.sh" "${dir}/bin/rinspect.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+	if use jbr11; then
+		fperms 755 "${dir}/jbr/bin/*"
+	fi
 
 	newicon "bin/${PN}.png" "${exe}.png"
-	make_wrapper "${exe}" "/opt/${P}/bin/${PN}-loader.sh"
+	make_wrapper "${exe}" "/opt/${P}/bin/${PN}.sh"
 	make_desktop_entry ${exe} "RubyMine ${MY_PV}" "${exe}" "Development;IDE"
 }