17 files changed, 251 insertions, 549 deletions
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.26.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.26.ebuild
index 2efd47edd97f..87d12e868a48 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.26.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.26.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.ta
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/phpstorm/Manifest b/dev-util/phpstorm/Manifest
index 2490808263fa..3cadb2739a80 100644
--- a/dev-util/phpstorm/Manifest
+++ b/dev-util/phpstorm/Manifest
@@ -1,3 +1,2 @@
-DIST PhpStorm-2020.3.2.tar.gz 467272887 BLAKE2B 48cc3b97d94426330185b39152b0d774b8809ad5fbb91602b364a03ce6bc9e139aba9c7bf430232bd9af11bd310318e99777d5daf4dce5b63f9aec4a3531776f SHA512 66eda6e4a0649644b7634f4192429cfe615764e032596442ac6582943c001ffa60ef3036df2597b9332dc5e39818b4da5ee12a9d883416fa7df55cdedb7bb178
-EBUILD phpstorm-2020.3.2.ebuild 1429 BLAKE2B 438267ff9630661d0c2a8d3527d50cee4daa50de92001c587aa8839522132db96db27c99a502c4a341ddd59e4f7d8ba52cc9b121f88e2ff4daa37898e15ccf92 SHA512 1af726888da46aa631685b8535b5d0dba7ed8f130bb792d1b87c6290bdef024e44f3aafdad172ce90403ca0a3a767692b9e8e096d9f9a3ff8e626bf438483e7a
-EBUILD phpstorm-9999.ebuild 1429 BLAKE2B 438267ff9630661d0c2a8d3527d50cee4daa50de92001c587aa8839522132db96db27c99a502c4a341ddd59e4f7d8ba52cc9b121f88e2ff4daa37898e15ccf92 SHA512 1af726888da46aa631685b8535b5d0dba7ed8f130bb792d1b87c6290bdef024e44f3aafdad172ce90403ca0a3a767692b9e8e096d9f9a3ff8e626bf438483e7a
+DIST PhpStorm-2020.3.3.tar.gz 467769238 BLAKE2B b4f404f14e06f7d0520304775e2398ca39c2948538f2cbaa678e0283d13e44588e791ff108a5cefc1ac3ab87711e6a1b7549c614a07b472f5162899c31f22ae9 SHA512 feac704824a5522424ed6275fc9051e6c1fbd13de68ff81dbbb651f37b61bcd56c6403874f77032ef06c9c01794b66a94b11a432bbead6740ad86f38ad2e27bd
+EBUILD phpstorm-2020.3.3.ebuild 1530 BLAKE2B c269f4ae77d86d02872795674189ef8dbf998c763893d000c58f05f46432ee0ec9359e25373745132a72a2c4c70494ac38a38737ed578c3fa08a631f3a8db099 SHA512 12b40d29189bd839d665234d83f439cfecfa5b5f2db0ed9c0579c584c9063b42ec011b12eb40a56bc70f0eb0a575c5bfaa8da4599b846aaee2a072eb5b4703b8
diff --git a/dev-util/phpstorm/phpstorm-2020.3.2.ebuild b/dev-util/phpstorm/phpstorm-2020.3.2.ebuild
deleted file mode 100644
index 0a96b46aff7b..000000000000
--- a/dev-util/phpstorm/phpstorm-2020.3.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/webide/PhpStorm-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/PhpStorm* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,phpstorm.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/phpstorm.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "PhpStorm" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/phpstorm/phpstorm-2020.3.3.ebuild b/dev-util/phpstorm/phpstorm-2020.3.3.ebuild
new file mode 100644
index 000000000000..2907603ee0d8
--- /dev/null
+++ b/dev-util/phpstorm/phpstorm-2020.3.3.ebuild
@@ -0,0 +1,58 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development."
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/webide/PhpStorm-${PV}.tar.gz"
+
+LICENSE="
+	|| ( jetbrains_business-3.1 jetbrains_individual-4.1 jetbrains_education-3.2 jetbrains_classroom-4.1 jetbrains_open_source-4.1 )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL CDDL-1.1 codehaus CPL-1.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC LGPL-2.1 LGPL-3 MIT MPL-1.1 MPL-2.0 OFL trilead-ssh yFiles yourkit W3C ZLIB
+"
+KEYWORDS="amd64"
+
+SLOT="0"
+
+BDEPEND="
+	app-arch/tar
+"
+
+RDEPEND="
+	virtual/jdk
+"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/PhpStorm* "${S}" || die "Failed to move/rename source dir"
+}
+
+src_prepare() {
+	default
+
+	# Remove any bundled Java
+	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
+}
+
+src_install() {
+
+	insinto "/opt/${PN}"
+	doins -r *
+
+	fperms 755 /opt/${PN}/bin/{format.sh,phpstorm.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+
+	dosym ../../opt/${PN}/bin/phpstorm.sh /usr/bin/${PN}
+
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "PhpStorm" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/phpstorm/phpstorm-9999.ebuild b/dev-util/phpstorm/phpstorm-9999.ebuild
deleted file mode 100644
index 0a96b46aff7b..000000000000
--- a/dev-util/phpstorm/phpstorm-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/webide/PhpStorm-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/PhpStorm* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,phpstorm.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/phpstorm.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "PhpStorm" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/rider/Manifest b/dev-util/rider/Manifest
index d7418b84b155..718375018ccb 100644
--- a/dev-util/rider/Manifest
+++ b/dev-util/rider/Manifest
@@ -1,3 +1,2 @@
-DIST JetBrains.Rider-2020.3.2.tar.gz 916913040 BLAKE2B 4115812941ec0a195fd846bef66fd195a407a5ba3ec1d8de1a73e195d4f44e24ecb00dc90a9368cff81a07e61d1b4e046728ae2eb31255a32706fdb6cedd6626 SHA512 cc8982933a75780ad7102f9d68984b3bd8a737a35a6aa16d241d8f569ef6989db68abf0225049d58b86dcc311de0be6f5b9a56119f8da7e2600f339177548be9
-EBUILD rider-2020.3.2.ebuild 1402 BLAKE2B 9150adb19362be19a89bbbf841f2d5bd31f2cd72af4db5a852f9561f564ffba02be2a24359d31980ac54ada933ef3ae046381623364848f3a0d1bd1726c108cb SHA512 0501988759b4b96f86725063074971e836221adafd37d46282942082d31d0ba137e818e4ce7e1552c1796ea1f23f526b1a50be7d0e827a8a151e6f76511d6c22
-EBUILD rider-9999.ebuild 1402 BLAKE2B 9150adb19362be19a89bbbf841f2d5bd31f2cd72af4db5a852f9561f564ffba02be2a24359d31980ac54ada933ef3ae046381623364848f3a0d1bd1726c108cb SHA512 0501988759b4b96f86725063074971e836221adafd37d46282942082d31d0ba137e818e4ce7e1552c1796ea1f23f526b1a50be7d0e827a8a151e6f76511d6c22
+DIST JetBrains.Rider-2020.3.4.tar.gz 917759161 BLAKE2B 6ad61c36cec5f2c645dc3b7b79f143919b631ef3b93c5c68ac2f03abf0e49ae6a9fe897788ec917e46b8d1d6138cf588c17c098fd241b9207a315f672d531dd3 SHA512 9267c721d47731bd5297b904a85fe40be419349c340e633f6b83ee6219c14134eaff541ecdb1faf082c5134a68f7a561ada4eb9925e82cf33e89c8e698ced7e3
+EBUILD rider-2020.3.4.ebuild 1503 BLAKE2B 2f1b99dea9b086e2097c98c01749fb6e8aabf49835734656e2105a8869355c66e75600e6882d556fa59ce2384ed4dd640ed9d92d248f91a8e5be0334b8219d84 SHA512 8d7c06fc3ec0c134b5f6a29165d7a20bb1200adee116693746d66398e684dbf089a63bde4fe6adf450c890a9d7a0cea25def8faacb5fed4394872192357ec989
diff --git a/dev-util/rider/rider-2020.3.2.ebuild b/dev-util/rider/rider-2020.3.2.ebuild
deleted file mode 100644
index af1fadbe222b..000000000000
--- a/dev-util/rider/rider-2020.3.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="Cross-platform .NET IDE"
-HOMEPAGE="https://www.jetbrains.com/rider"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/rider/JetBrains.Rider-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/JetBrains* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,rider.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/rider.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "Rider" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/rider/rider-2020.3.4.ebuild b/dev-util/rider/rider-2020.3.4.ebuild
new file mode 100644
index 000000000000..14ecbe78779b
--- /dev/null
+++ b/dev-util/rider/rider-2020.3.4.ebuild
@@ -0,0 +1,58 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="Cross-platform .NET IDE"
+HOMEPAGE="https://www.jetbrains.com/rider"
+SRC_URI="https://download.jetbrains.com/rider/JetBrains.Rider-${PV}.tar.gz"
+
+LICENSE="
+	|| ( jetbrains_business-3.1 jetbrains_individual-4.1 jetbrains_education-3.2 jetbrains_classroom-4.1 jetbrains_open_source-4.1 )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL CDDL-1.1 codehaus CPL-1.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC LGPL-2.1 LGPL-3 MIT MPL-1.1 MPL-2.0 OFL trilead-ssh yFiles yourkit W3C ZLIB
+"
+KEYWORDS="amd64"
+
+SLOT="0"
+
+BDEPEND="
+	app-arch/tar
+"
+
+RDEPEND="
+	virtual/jdk
+"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/JetBrains* "${S}" || die "Failed to move/rename source dir"
+}
+
+src_prepare() {
+	default
+
+	# Remove any bundled Java
+	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
+}
+
+src_install() {
+
+	insinto "/opt/${PN}"
+	doins -r *
+
+	fperms 755 /opt/${PN}/bin/{format.sh,rider.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+
+	dosym ../../opt/${PN}/bin/rider.sh /usr/bin/${PN}
+
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "Rider" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/rider/rider-9999.ebuild b/dev-util/rider/rider-9999.ebuild
deleted file mode 100644
index af1fadbe222b..000000000000
--- a/dev-util/rider/rider-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="Cross-platform .NET IDE"
-HOMEPAGE="https://www.jetbrains.com/rider"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/rider/JetBrains.Rider-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/JetBrains* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,rider.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/rider.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "Rider" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/rubymine/Manifest b/dev-util/rubymine/Manifest
index c4e677e7e75d..bb98ba2062f3 100644
--- a/dev-util/rubymine/Manifest
+++ b/dev-util/rubymine/Manifest
@@ -1,3 +1,2 @@
-DIST RubyMine-2020.3.2.tar.gz 447053533 BLAKE2B dbdd6af0887a7ef375a8fec91769781ad53f72b21c349167fc76fb6da2119f2bed19061d9b8567e14a9471f48fc087fc04a394eb749e49b8dee3321b8aeab15b SHA512 c156a26e5c5fd2f0f7127e4aa2c5be510f0d12988fdbf0793a65f0062124c277e9d14930099572eba35eb62f592272cff8c228249166dfea2ed48a948998e042
-EBUILD rubymine-2020.3.2.ebuild 1422 BLAKE2B d8d9441298eb8336bea3bb93491e934dd36da19430d06982190584e31e8f32d8938dba99511a2df4b6f6498f2c7551a06d4a87ce757d39674911fa0b89a8b37b SHA512 11ba02a4365999df411785004c190058546d80e17e4185c46d3c1420b5909ab8e4c3be5a73f5959b7825f171b537b40cfccf326c0039f3ce99a41c84f42654f4
-EBUILD rubymine-9999.ebuild 1422 BLAKE2B d8d9441298eb8336bea3bb93491e934dd36da19430d06982190584e31e8f32d8938dba99511a2df4b6f6498f2c7551a06d4a87ce757d39674911fa0b89a8b37b SHA512 11ba02a4365999df411785004c190058546d80e17e4185c46d3c1420b5909ab8e4c3be5a73f5959b7825f171b537b40cfccf326c0039f3ce99a41c84f42654f4
+DIST RubyMine-2020.3.3.tar.gz 447551057 BLAKE2B a032ce20d44993a41a4f65f2da48b8a328dfee6920ea248a9237ecb3a2479dbbd76f245a6c1f0a1a100ac1b4f121201f50b66ab38830e57c2ab268f4b1e0a61c SHA512 b71535ed85017dbc592718f99dfe50f42acc6e4397e0e809bcd7f7c567872c65b5d7d3170ca1f26fbe5681ae9acf9a771d1ff9e27cda7aa2694f264c44f3e7ad
+EBUILD rubymine-2020.3.3.ebuild 1523 BLAKE2B b095e3e30da4306a7d986a1c90f11729c4f48498b910c7d922ec87208f0cea53a310cc11dc84651766d9ce4f00ccef975fb63fab02a97098c56e7326f72cc3d7 SHA512 6e57b2519ac42f44837308faaf32e40f095350f4b28a6595ace366c928e928e0c32bd79ba03ef34a554ec54138a8c3899aea621608934faaa81a96c4e58d49df
diff --git a/dev-util/rubymine/rubymine-2020.3.2.ebuild b/dev-util/rubymine/rubymine-2020.3.2.ebuild
deleted file mode 100644
index 0bef06469d83..000000000000
--- a/dev-util/rubymine/rubymine-2020.3.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The most intelligent Ruby and Rails IDE."
-HOMEPAGE="https://www.jetbrains.com/rubymine"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror splitdebug strip"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/ruby/RubyMine-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/RubyMine* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,rubymine.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/rubymine.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "RubyMine" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/rubymine/rubymine-2020.3.3.ebuild b/dev-util/rubymine/rubymine-2020.3.3.ebuild
new file mode 100644
index 000000000000..f6ce4efc75df
--- /dev/null
+++ b/dev-util/rubymine/rubymine-2020.3.3.ebuild
@@ -0,0 +1,58 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="The most intelligent Ruby and Rails IDE."
+HOMEPAGE="https://www.jetbrains.com/rubymine"
+SRC_URI="https://download.jetbrains.com/ruby/RubyMine-${PV}.tar.gz"
+
+LICENSE="
+	|| ( jetbrains_business-3.1 jetbrains_individual-4.1 jetbrains_education-3.2 jetbrains_classroom-4.1 jetbrains_open_source-4.1 )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL CDDL-1.1 codehaus CPL-1.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC LGPL-2.1 LGPL-3 MIT MPL-1.1 MPL-2.0 OFL trilead-ssh yFiles yourkit W3C ZLIB
+"
+KEYWORDS="amd64"
+
+SLOT="0"
+
+BDEPEND="
+	app-arch/tar
+"
+
+RDEPEND="
+	virtual/jdk
+"
+
+RESTRICT="bindist mirror splitdebug strip"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/RubyMine* "${S}" || die "Failed to move/rename source dir"
+}
+
+src_prepare() {
+	default
+
+	# Remove any bundled Java
+	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
+}
+
+src_install() {
+
+	insinto "/opt/${PN}"
+	doins -r *
+
+	fperms 755 /opt/${PN}/bin/{format.sh,rubymine.sh,printenv.py,restart.py,fsnotifier{,64}}
+
+	dosym ../../opt/${PN}/bin/rubymine.sh /usr/bin/${PN}
+
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "RubyMine" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/rubymine/rubymine-9999.ebuild b/dev-util/rubymine/rubymine-9999.ebuild
deleted file mode 100644
index 0bef06469d83..000000000000
--- a/dev-util/rubymine/rubymine-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The most intelligent Ruby and Rails IDE."
-HOMEPAGE="https://www.jetbrains.com/rubymine"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror splitdebug strip"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/ruby/RubyMine-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/RubyMine* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,rubymine.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/rubymine.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "RubyMine" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
index 78f6dfb8bf41..197531f9ecf2 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -1,3 +1,2 @@
-DIST WebStorm-2020.3.2.tar.gz 442114041 BLAKE2B 58613ac5df18fd7c29591482aa69e36ccf64debb6c9f36d1138251d06fca577fb7cfe63018addf46fac5895f4952c1435f77fa5024ee33551c0962872f2591f3 SHA512 d71b7d2a76f664d07810c2fa889a56fa8b8df6fe357ea3c979c882255cf7ae02a8e7b7f75afdfa990efea9e791b9a677f1c58ff37b0306c48c83d7830a6f41a3
-EBUILD webstorm-2020.3.2.ebuild 1428 BLAKE2B d9618e50b4a47d76033fb8921f5538a24e3b637a9a84b70224e573c6a2d7b4a879cd7cb689f3b8ce03ddc100512101af825d339f1b77a13560672815f28b73f2 SHA512 67deb75809e3af206c0d2da151db49198ae38b01e6d5a183cfff4fd41fe5676addc0e87bbcdf2973b9eb0ebc4c5fa62641e8719fdeafd1a71e1093df1e1629e1
-EBUILD webstorm-9999.ebuild 1428 BLAKE2B d9618e50b4a47d76033fb8921f5538a24e3b637a9a84b70224e573c6a2d7b4a879cd7cb689f3b8ce03ddc100512101af825d339f1b77a13560672815f28b73f2 SHA512 67deb75809e3af206c0d2da151db49198ae38b01e6d5a183cfff4fd41fe5676addc0e87bbcdf2973b9eb0ebc4c5fa62641e8719fdeafd1a71e1093df1e1629e1
+DIST WebStorm-2021.1.tar.gz 488033050 BLAKE2B 027e97a2ee7d9ed6f2e3504e536aa5692e07010a18604021608d560399b61481c0fdf1b30a464d177bad98ff17cf680c26e145b68891f62b5c2644161f308556 SHA512 1a80d4dd867e9ecc3231105c124ecc2a8f382cdc663a8ff369587cfae05bd15d88e6d7b6031ba88fb2caa5a41142ad3d6935137d412ad0282a88e5c431e09655
+EBUILD webstorm-2021.1.ebuild 1653 BLAKE2B 79c29f5a37c0f94fad1d5aceae05a1e343ef074e447dfb72c30df0ce2211e034eb4d42d3a0568b67a5bf9584b38b5afbb61ae3fdb796fcc141bb7389b4ce0151 SHA512 ab4931344890413864b6c4fa86261742146dfbe2c852d39387999aa2bb0fa9c112c9f8175d8f8fdd8601868d60567c85fd57ed64626fb537ac9377c73f00e093
diff --git a/dev-util/webstorm/webstorm-2020.3.2.ebuild b/dev-util/webstorm/webstorm-2020.3.2.ebuild
deleted file mode 100644
index 182fedac2e8f..000000000000
--- a/dev-util/webstorm/webstorm-2020.3.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/webstorm/WebStorm-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/WebStorm* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,webstorm.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "WebStorm" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/webstorm/webstorm-2021.1.ebuild b/dev-util/webstorm/webstorm-2021.1.ebuild
new file mode 100644
index 000000000000..08ef9b7df867
--- /dev/null
+++ b/dev-util/webstorm/webstorm-2021.1.ebuild
@@ -0,0 +1,68 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development."
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/webstorm/WebStorm-${PV}.tar.gz"
+
+LICENSE="
+	|| ( jetbrains_business-3.1 jetbrains_individual-4.1 jetbrains_education-3.2 jetbrains_classroom-4.1 jetbrains_open_source-4.1 )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL CDDL-1.1 codehaus CPL-1.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC LGPL-2.1 LGPL-3 MIT MPL-1.1 MPL-2.0 OFL trilead-ssh yFiles yourkit W3C ZLIB
+"
+KEYWORDS="amd64"
+
+SLOT="0"
+
+BDEPEND="
+	app-arch/tar
+"
+
+RDEPEND="
+	virtual/jdk
+"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}/${PN}-${PV}"
+
+src_unpack() {
+	default
+	mv "${WORKDIR}"/WebStorm* "${S}" || die "Failed to move/rename source dir"
+}
+
+src_prepare() {
+	default
+
+	# Remove any bundled Java
+	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
+}
+
+src_install() {
+
+	insinto "/opt/${PN}"
+	doins -r *
+
+	fperms 755 /opt/${PN}/bin/{format.sh,webstorm.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+
+	dosym ../../opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
+
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "WebStorm" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/webstorm/webstorm-9999.ebuild b/dev-util/webstorm/webstorm-9999.ebuild
deleted file mode 100644
index 182fedac2e8f..000000000000
--- a/dev-util/webstorm/webstorm-9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
-	app-arch/tar
-"
-
-RDEPEND="
-	virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-if [[ ${PV} != 9999 ]]; then
-        SRC_URI="https://download.jetbrains.com/webstorm/WebStorm-${PV}.tar.gz"
-        KEYWORDS="*"
-fi
-
-S="${WORKDIR}/${PN}-${PV}"
-
-src_unpack() {
-        default
-        mv "${WORKDIR}"/WebStorm* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
-        default
-
-	# Remove any bundled Java
-	rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
-	insinto "/opt/${PN}"
-	doins -r *
-
-	fperms 755 /opt/${PN}/bin/{format.sh,webstorm.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	dosym ../../opt/${PN}/bin/webstorm.sh /usr/bin/${PN}
-
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "WebStorm" "${PN}" "Development;Programming;IDE;"
-
-        # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-        mkdir -p "${D}/etc/sysctl.d/" || die
-        echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}