Clean old ebuilds and update webstorm

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

14 files changed, 27 insertions, 527 deletions

diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
index b60ad24..183b35a 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -1,26 +1,5 @@
-DIST WebStorm-11.0.3.tar.gz 132305678 SHA256 387d2cf7fdd4ba4e1fb4bb223071d0bac6f5c254e014311cbf62b188448ba76b SHA512 f38ffee436dd3cac6842f3c008acdf47c29e0737373cc8b643316a5f21c9ba76ab01f609d174305ae953895c96288777a01e2e44aaa9b40ea4a5e3dcc3ee75b5 WHIRLPOOL 5d8e8976dfeb8714c35b91141d1d9f207bf6dd3dfbe29451c466e87245c7bf4ecdfbd09bcdf814695d07fe3f98c7ca120ec0f363d29e62c7da764e19dc9e09de
-DIST WebStorm-2016.2.3.tar.gz 215614436 SHA256 edf2cede3e82c38322b62d7896f9f36db626357ab316fc69fa5a3b5bc8ad2011 SHA512 d17af49883278562147e362937274d52b940d0d94b901b2e4438b4af005be78355f2b1c7fa20edb493e23c18dbb8701df11de71be481131586246fcd971fe976 WHIRLPOOL 85df70b41498411989d219a57419027a3930b47634dab9589a2712d91728ec73c3d3aab6be0c67f484efeb5515422a391a8b532859aa6d871a53c3d07275cea0
-DIST WebStorm-2016.2.4.tar.gz 216872227 SHA256 6fe7fe6591260a95a588038838bb1d44e72175118b7a848d588d2ddb09a1c1c0 SHA512 a14fd0d9888e19c39106a7067fa8f875e376e37cafa6116f947fe6949a2cdf1f13e0147a396d71e40082f18f79f1d6150530c9929745968d917ee1b4e06c8c9b WHIRLPOOL 82129b5b472a38ffd72a920e15ab73e317b936ac19d6adef5d54b18b8953ba2090942c54e20e0a9a691698c1c791f71eadec0a6a505edf1eb94ea4a8f19ddcb6
-DIST WebStorm-2016.2.tar.gz 209648032 SHA256 a3453ce89f6dfc55de1723b3e6119a71771a20a8c4ca4da60dcb1fd91e3700d9 SHA512 fe9067d3b2b9ef5468ae821f9a6c5e56442e022bfa6c75966ee46aae80074a1ac9ab914714bc0b42b80aabdaba36f5a037921e3d29f010a23c33d2b386e0c379 WHIRLPOOL 254b0f774e9d065b7a96a858fab67d52134c2cb5c3199be5f3bd22849741f54f30d7daf0fa39cabefb513529e98c8dee5f0076653647a1979a34e79af48cfd48
-DIST WebStorm-2016.3.1.tar.gz 241441390 SHA256 4e25b3046f397097791f7ad7999356ff7881a9fe31ee45d93cdafac44d23ea83 SHA512 dbe21e2a8cc0849c5ca9147457d9abd981efbfe8ae91f02e3c57e06aa30c88b914a9c5012267f8a9723bb732176504cfc11aa4e8a9470a26e8f457e610c3a982 WHIRLPOOL 30e4da3b5d9d508e685355eae227ef0bfc2c65a96cfbae2cd5770138d79a448b0ddb6ea953047a98c7c0f53978b330c46e75f1e54aa1aff3b76ac786241da7c9
-DIST WebStorm-2016.3.4.tar.gz 242042365 SHA256 3c79d6fcfbe38920af44e15440c5034b7642b1de6c5d1cbde6c6deed78da3c5f SHA512 ae1111746073412578891c1477bade8110436c57904522df6a4bc4d9221cc2d1a14ff0185b0a84236ffc0fac957c6fa480043d805d669a84d8896b636e387142 WHIRLPOOL db848924b4484e2204d15ad4d6af7f29b1db94f89608eab837e44580dd0d20f4f7c2042740cce9272fc2db9ef552c3d4b793ecbf6e9c5a75880981e3833ff16d
-DIST WebStorm-2016.3.6.tar.gz 242056395 SHA256 8d216c8e994463d6f5825449af27b37537211bcc3ce6d8cd48e9ff09703f21a3 SHA512 2d904ab47ce3da973a774ae09d4641b853ef614bb8dc32e2a24da4277e8662dc81af627f0e9da38ee3424e1fbe309a6c10204fef558d2be5e6ef17a400f70f9d WHIRLPOOL dd0a2f60575ec0a5f5ba1dc0f63ec8224a72371f06ba00be4615cee5b542e15501d2d8b6f07e9291d209c3195a848c4478d93f93b7916d821b268e82adf8254e
-DIST WebStorm-2017.1.1.tar.gz 251702809 SHA256 5edf5756c882324c2b4c597889431489c48cbcd41f35658398a3f62841b33b89 SHA512 c863a3a7df7ddee9d5bba91a1177dc959800ed621436b1868d4a74bdd1fd2853de971e9a6b56fe6917a412266685992055a32d60c201a04cb38f9207cd8d588d WHIRLPOOL 6f699c03ada2ec15477b384baf9564ecf789cb294602fed95ea66ae5dd22e715d815b7dcb6549aec9d3ebed318e3fc63b3e14e1afb80921200598e198872b568
-DIST WebStorm-2017.1.3.tar.gz 251735231 SHA256 6c5b7ef90cb1906dbe5eda8d4d45a0fed74fab9096a2209ba461081052078b3c SHA512 f89d19f49b5f6fee9c5718b7ee3dc92f2b58978bcadf28273ab29e40ff36480bcea0119d189ae4b41fdd78229b03d18067ad5f8e605af37d5ef24ea3aa3767f5 WHIRLPOOL 2fe56eb48a12509c23a377c4f474316b866b03125d29a55379650f6b343eed1e69d71387dca503f6ea1df89e9b17540060d271e94a9206cd16ac86add9b7fae6
-DIST WebStorm-2017.1.4.tar.gz 251746799 SHA256 f50b5cf70a0566976313c31530c20093ef526746ff4d27ec2e5adbc99138822b SHA512 768b77b054af93613cc892577d63a546066cdd9039aa1f6ae0d11b675ae561b147785580cc335c68c82c421caacc4ae10e267a7d3f6084c03d9a9bf76d6fc93b WHIRLPOOL b833cfd1455207bdf07cb3f7a69f238ad3dea7fea7b3e3fc7dcd60a757d851493f670592b6a792729e9a4b0544d63ca3e85200c155a1f40af55572f1b4d26a80
-DIST WebStorm-2017.2.3.tar.gz 257748632 SHA256 33a51c552c82c35906b8ec02f12c1cd2888ad46247c20bdf8995f3d225d8bb9c SHA512 ad1590aef9390f47726133e61fed07fa23c1fe103415542bf00d8bca04f259103e5f9654549d64533bbc12b955a5b76b572cd80be4e107676a14bb1c8123f32c WHIRLPOOL d388b4e3f5a87654580a5a111b0a2971d581a00904a90ecbf083e5353033d3fb9aaf0c5b2ec3664c1874edca0b261470a8ab19f356cdfee76b414bd9bfc11ad1
-DIST WebStorm-2017.2.5.tar.gz 257640874 SHA256 f66c8e538bf4f04919c77d2138bc72e9391c0b4404917494e7d261241977fa2a SHA512 5e13a990ad7a56eafbd346ecc505380a3957ef67c63b524747f8f1c032d177301d2b61f9451ff7a2bca4f5b50bb3ee598d5e636e2fafcd9271a9da358452660b WHIRLPOOL 0387d61ad0ca57cb537761bcd3b203a3cb3e39d71f11ef833e01626b9f28b08576ef617e8afe5d8c67d7f888ca89282203e528949ae69d2f241cf704f2a2f487
-EBUILD webstorm-11.0.3.ebuild 1025 SHA256 76a7fd244d8657793c1c434f280ea862a1bb3640d1c3d8e2910cb0243dc8980f SHA512 8d481ed223dc6b4359be531c15bb45798ff239a48c3c2e6dfca4683a57b37c08e3a334f846a7e51037e293abdb980a93a4b2bc97528c3e423a6581ab1bf97fc1 WHIRLPOOL ce695e630cb240d4244de0c277b1f4f61f8d29176181b4a80a5ab1a12c793c131611c6b98b15064a540db4a2b4310580cb8ea463fd0cc1099e9074a41d569f65
-EBUILD webstorm-2016.2.162.1121.31.ebuild 993 SHA256 992db7cdbf3bcfc9a88061d989f9d4eb011b2530814837b1b7b9355d1e832b03 SHA512 de2d995ef387944b6d65ea2b1188ee592755893f3a8d107459cd2b41394d30d4a373ef2b2476fc3c3236ddfec268d3566f2109e3964d13634b1feed120f50213 WHIRLPOOL bccaf9f8f111fa52994904266db87c91d8feeb2da9d12910a87faa884db934450e6cc3d7e4c96e33ee358e989d0efbdb77173c74cfe11f789428f8c0d70675ad
-EBUILD webstorm-2016.2.3.162.1812.21.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
-EBUILD webstorm-2016.2.4.162.2228.20.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
-EBUILD webstorm-2016.3.1.163.7743.51.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
-EBUILD webstorm-2016.3.4.163.13906.20.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
-EBUILD webstorm-2016.3.6.163.15188.15.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
-EBUILD webstorm-2017.1.1.171.4073.40.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
-EBUILD webstorm-2017.1.3.171.4424.63.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
-EBUILD webstorm-2017.1.4.171.4694.29.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
-EBUILD webstorm-2017.2.3.172.3968.27.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
-EBUILD webstorm-2017.2.5.172.4343.25.ebuild 1070 SHA256 2a3e48d105898fcf5c7bb15c6e2648a6b3415d470ad6a8414312223501a04f79 SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868 WHIRLPOOL b7ebd1faa9e10d44703ef64862d47084571dc7e66626af8f8434903d0a49a306ac5278f1d3bcc664ff5a06fef57ded025e5e2671513c9097865bc1db743b33aa
+DIST WebStorm-2017.2.5.tar.gz 257640874 BLAKE2B b501a5722082829c053e478b51f19507d47f9874764ea45d26b4343c0aa8631bfc8b33cfb91efce82d41e4eba50fedd53dd4351b67403aaf68000dd22b0836dc SHA512 5e13a990ad7a56eafbd346ecc505380a3957ef67c63b524747f8f1c032d177301d2b61f9451ff7a2bca4f5b50bb3ee598d5e636e2fafcd9271a9da358452660b
 DIST WebStorm-2020.1.1.tar.gz 339941213 BLAKE2B f88ccba4e0766401a994a81daad3d53f5689cfb6eb8b75dd066f8046e8eedb36e5dfb306d03d961daf6dd691b3cced7d587a7306039111d54027c9490d0b02ea SHA512 5e8853ed85704f4a5e230abe37ff5bb4566cc123d800f9a2da1669fa00a1b561586808204eae4a4ec1f08631815321a77fff77ab4536c0a15ee1c3f85ddcd619
-EBUILD webstorm-2020.1.1.ebuild 1150 BLAKE2B 95c2f183de5f5011c4978ae718ef32c8dc095d3fb9067ba74f90f46303109e8e09b3e071d81717861d9a1cdb2389f8f22ca2d6f206458de989a30b8a054bb211 SHA512 820f592e708450d37ae388bb1225e2dd8ab7a051dacbcd715806f88a9457f6100756298251b17bb19ccd7c3bb07c3cd6046bfa337430e202c08b37c84ebd6a80
+EBUILD webstorm-2017.2.5.172.4343.25.ebuild 1070 BLAKE2B 9c202b85862a3c7de6852a7652fcba830a094e67d46d1466e7a2a1aa4ab4626f86ab442288f440bd4dd3fef2137d5ce25cc2436b28b1402c9cea9741da11033f SHA512 433cd702ffeeb93bac6c5760c69c6ed319a38875f45244bf77aee18b440af74b5d3755501b1669bfde53a0a73dbb8e07f1b47c8438d4f4fc2e162ccf441a1868
+EBUILD webstorm-2020.1.1.201.7223.93.ebuild 1212 BLAKE2B 5a0349d11cd5ff5eb726bea223685cbe4dac8c8a25ef908861b630efd10efe21fa9fd4a1b2d3c4ebe02b4ca45835931b42604f924f6d40e4de08ad2a5a2f2d7b SHA512 bd71f2dee9470835a76afe95a231346fc4446e1c785b691fc5f845086eeb1b7c3ea69c1b34b3b0531dd76f328d468547a6dce3a9d28a3f1574d02bf528d7d4ef
+MISC metadata.xml 550 BLAKE2B 5f12e899cd95d70d7996a4af7207770e446cf5c58f68ab6224800d17648af56bb4603b40ed47259f91761e3554b639245253ba2f9f99f7a0b07be8ac2974831c SHA512 f4244aa280955793979e9202751a4ee641c17131c16b842905a32bddd6ae9d8d95a8e3cf3dd86405185e10d58df52bf08500c00ed5a02f727fe66f40a78e760f
diff --git a/dev-util/webstorm/metadata.xml b/dev-util/webstorm/metadata.xml
new file mode 100644
index 0000000..e5eee97
--- /dev/null
+++ b/dev-util/webstorm/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>samuelbernardo.mail@gmail.com</email>
+		<name>Samuel Bernardo</name>
+	</maintainer>
+	<longdescription lang="en">
+	A powerful and intelligent IDE that gives you the best coding assistance for JavaScript, HTML and CSS and a wide range of modern web technologies.
+	</longdescription>
+	<use>
+		<flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/webstorm/webstorm-11.0.3.ebuild b/dev-util/webstorm/webstorm-11.0.3.ebuild
deleted file mode 100644
index f6e347c..0000000
--- a/dev-util/webstorm/webstorm-11.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-EAPI=5
-inherit eutils
-#EAP='-EAP'
-#PVERSION='11'
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-#SRC_URI="https://download.jetbrains.com/webstorm/WebStorm${EAP}-${PVERSION:-${PV}}.tar.gz"
-SRC_URI="https://download.jetbrains.com/webstorm/WebStorm-${PVERSION:-${PV}}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S=${WORKDIR}
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2016.2.162.1121.31.ebuild b/dev-util/webstorm/webstorm-2016.2.162.1121.31.ebuild
deleted file mode 100644
index 0a3c659..0000000
--- a/dev-util/webstorm/webstorm-2016.2.162.1121.31.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 3-5)"
-MY_PV="$(get_version_component_range 1-2)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-KEYWORDS=""
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2016.2.3.162.1812.21.ebuild b/dev-util/webstorm/webstorm-2016.2.3.162.1812.21.ebuild
deleted file mode 100644
index 8b957a3..0000000
--- a/dev-util/webstorm/webstorm-2016.2.3.162.1812.21.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2016.2.4.162.2228.20.ebuild b/dev-util/webstorm/webstorm-2016.2.4.162.2228.20.ebuild
deleted file mode 100644
index 8b957a3..0000000
--- a/dev-util/webstorm/webstorm-2016.2.4.162.2228.20.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2016.3.1.163.7743.51.ebuild b/dev-util/webstorm/webstorm-2016.3.1.163.7743.51.ebuild
deleted file mode 100644
index 8b957a3..0000000
--- a/dev-util/webstorm/webstorm-2016.3.1.163.7743.51.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2016.3.4.163.13906.20.ebuild b/dev-util/webstorm/webstorm-2016.3.4.163.13906.20.ebuild
deleted file mode 100644
index 8b957a3..0000000
--- a/dev-util/webstorm/webstorm-2016.3.4.163.13906.20.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2016.3.6.163.15188.15.ebuild b/dev-util/webstorm/webstorm-2016.3.6.163.15188.15.ebuild
deleted file mode 100644
index 8b957a3..0000000
--- a/dev-util/webstorm/webstorm-2016.3.6.163.15188.15.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2017.1.1.171.4073.40.ebuild b/dev-util/webstorm/webstorm-2017.1.1.171.4073.40.ebuild
deleted file mode 100644
index 8b957a3..0000000
--- a/dev-util/webstorm/webstorm-2017.1.1.171.4073.40.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2017.1.3.171.4424.63.ebuild b/dev-util/webstorm/webstorm-2017.1.3.171.4424.63.ebuild
deleted file mode 100644
index 8b957a3..0000000
--- a/dev-util/webstorm/webstorm-2017.1.3.171.4424.63.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2017.1.4.171.4694.29.ebuild b/dev-util/webstorm/webstorm-2017.1.4.171.4694.29.ebuild
deleted file mode 100644
index 8b957a3..0000000
--- a/dev-util/webstorm/webstorm-2017.1.4.171.4694.29.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2017.2.3.172.3968.27.ebuild b/dev-util/webstorm/webstorm-2017.2.3.172.3968.27.ebuild
deleted file mode 100644
index 8b957a3..0000000
--- a/dev-util/webstorm/webstorm-2017.2.3.172.3968.27.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-EAPI=5
-
-inherit eutils versionator
-
-#EAP='-EAP'
-#PVERSION='11'
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="WebStorm"
-
-HOMEPAGE="http://www.jetbrains.com/webstorm/"
-DESCRIPTION="Most Intelligent WebStorm IDE for develop on js html css, 11 EAP version"
-SRC_URI="https://download.jetbrains.com/webstorm/${MY_PN}-${MY_PV}.tar.gz"
-
-if [[ x${PVERSION} != 'x' ]]; then
-	KEYWORDS="x86 amd64"
-else
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PROGNAME="WebStorm"
-RESTRICT="strip mirror"
-DEPEND=">=virtual/jre-1.6"
-SLOT="0"
-S="${WORKDIR}/${MY_PN}-${PV_STRING}"
-
-src_install() {
-	dodir /opt/${PN}
-
-	cd WebStorm-*/
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/webstorm.sh || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier || die "Chmod failed"
-	fperms a+x /opt/${PN}/bin/fsnotifier64 || die "Chmod failed"
-	dosym /opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-	
-	#mv "bin/webstorm.svg" "bin/${PN}.svg"
-	doicon "bin/${PN}.svg"
-	make_desktop_entry ${PN} "${PROGNAME}" "${PN}"
-}
-pkg_postinst() {
-    elog "Run /usr/bin/${PN}"
-}
-
diff --git a/dev-util/webstorm/webstorm-2020.1.1.ebuild b/dev-util/webstorm/webstorm-2020.1.1.201.7223.93.ebuild
index c144347..0248e93 100644
--- a/dev-util/webstorm/webstorm-2020.1.1.ebuild
+++ b/dev-util/webstorm/webstorm-2020.1.1.201.7223.93.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils readme.gentoo-r1 xdg
+inherit eutils gnome2-utils readme.gentoo-r1 xdg
+
+MY_PV="$(ver_cut 1-3)"
+SRC_VER="$(ver_cut 4-6)"
 
 PROGNAME="WebStorm"
 DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
 HOMEPAGE="http://www.jetbrains.com/webstorm/"
-SRC_URI="http://download.jetbrains.com/webstorm/${PROGNAME}-${PV}.tar.gz"
+SRC_URI="http://download.jetbrains.com/${PN}/${PROGNAME}-${MY_PV}.tar.gz"
 
 PROGNAME="WebStorm"
 LICENSE="IDEA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-SRC_VER="201.7223.93"
+IUSE="-jbr11"
 
 RDEPEND=">=virtual/jre-1.8"
 
@@ -31,7 +34,7 @@ S="${WORKDIR}/${PROGNAME}-${SRC_VER}"
 src_prepare() {
 	default
 
-	rm -rf jre || die
+	use !jbr11 && rm -rf jre || die
 }
 
 src_install() {