9 files changed, 37 insertions, 734 deletions
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index cbacc3c..bc2784f 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,21 +1,8 @@
-DIST ideaIU-1.0.201.6668.121.tar.gz 664320358 BLAKE2B 5f9b9b083252ace2533f44c3ea8fd26aa04321aeb576939fd18263c29772f434f6ce4624187085a27c4ae275993124113b4a6806619b432a6f785e9928742e5a SHA512 c8212f544e060d5fe36e89c8af0abc25add9d9df1a8445da6517aa4496db762195aaa1e8a1f2ddd503e0b80d5da7a74e817853372d31d961faced46d74668c22
-DIST ideaIU-2.3.202.6397.94.tar.gz 656860633 BLAKE2B f582c4feeef183100d861feb1636c9973e05238173fd0a3b00b38d5b0eaf4f1f6ac7119895980714b45fe9c43c626aad56c183069e8e90a30ab9699bbec1beb3 SHA512 2c1ccadd2517723957b7c77df89220e3bfce2a2e8d472275abf1945f7dac1fe03150280595d2722f0f03f34628702934f3b8f32e927686dbc679367c79d256f5
-DIST ideaIU-2019.3.1.tar.gz 809193649 BLAKE2B 3e61fa4efe2c9b7a9229455711d30e0dac382c4857ebe2fd0208389b5aab24ead10f49460e621077c06af8398ab129b1b4220174caa260c7ab321ef6ce52f555 SHA512 258269a8a317ca252c26ec25dbd1122254985e9402389429d5c5cf3fd29b04716d5744f2798d96297b1bf1f479c67adc479224b841b2c81b5364561c34870837
-DIST ideaIU-2019.3.3.tar.gz 812882348 BLAKE2B 402158c4586d87b84ccfaaa03abdb7e3e843d278b89d9be0982e436beb23f6b4f4da635edac99801cb6b8b611ae6dd926ad41ad2d62d1e2037dfabb50190e13a SHA512 54872dfa2de8a50d1727556f96220ad04a4b8504549e54fb670e8f6c85f42ff519702c63a554cb35c805549e26635f5da27ccbbfa090f1f6c9c3f3258c36a048
-DIST ideaIU-2019.3.4.tar.gz 813068241 BLAKE2B d80c5c0faec4d53a5443aec430e11c2a6661b7aa3955cdb65dd460cdb8fec3f4cf6bc0effec477c32c4bd3949780407599515838dba3b00dda1af5c7975515a5 SHA512 0b2862df695a0d44470bcf6f1ac962c47b1d0433088de5e15503b1dc7622262bac1c7958fef2aa9feb063018d5ff9b109f845143a21fd741b35605c2ec418f8b
-DIST ideaIU-2019.3.tar.gz 795790818 BLAKE2B 05396e642597b1f6c1341e2f3b4d02acc6fcf2254b93a00ae43c9be1afaef39db42bf894141bc9adc846ea7e8260a777c60563f928f2b73ddcb4d8f3e74c4ef2 SHA512 638f4a29720fc8b21593106295576c1a7db8fe67ad4eca5d8f98b1220264b074227f058af56225f10a13fb537a11ce12d415d463fba7891eba8138c6e9fb78e0
-DIST ideaIU-202.7660.26.tar.gz 660682655 BLAKE2B 7c052121176593cce3c635f6da37dda09caf0e55c787176392a53839913b49133d6adeeaf057e43ddc3bd9aab904e2dc0894930ad75e0bd8bc9a1d0483be36f8 SHA512 e6355cf946804f2443c3fd1462eb887f26486e59e2c083d24a96e26440578a536dab0d298c5c5f21444a96b52aaad21e87e461f3819653a4bf113d088e3c17ac
-DIST ideaIU-211.6693.111.tar.gz 775964421 BLAKE2B b5e9e75cde9e74d46247be72ae9663b0f40cf4a0333c81534ba40a8ce327d92f44438c692e5c4c77ec578389434b7d9ccb7a675f1f5e5612a0cabdf21db2b3ea SHA512 48bcb62b9cbcf87b62f83179b8ed3a5dc9d99e72edff3b128f2fd33007cd2dc96d56fb1322870a215bce666dc639d3a699361ccaf58053b99b333eff306bbf2c
+DIST ideaIU-232.9559.62.tar.gz 1153009058 BLAKE2B 2dc3b8c8ae8b636118d3d386b39163d46f4a652dae13f497f0f76504a26c6c65210e6695bd75951c49706d3a9bbd42b4edd19e8d9ce73a25c2fd1b684563daaf SHA512 c3e3027fb0239b5ebde4c9ff60e19082e212d9098948df352b26b2ef39cb6a4a97e51421f56a82f3019d80a712a14006dbe3bbde1605900c5d62410c3b2f824c
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
+DIST jbr-17.0.8-linux-x64-b1000.22.tar.gz 74121324 BLAKE2B 92f20f7d75c673a3890902543e20a7a157308118c46bce122f5d94c096b14bd5896ac5bc25a797ba359e07ad2d26363359c5da455986b4b975d133dee8f2427e SHA512 7ba1423f3854a2ac0a98198c12084fd9ab798a8fd9e5c8e0eb84700431d7f8e01dc8f1652637c4d11b586c86dc08011da886c197291bab3a02101ce1802e8f44
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
-EBUILD idea-ultimate-2019.3.0.193.5233.102.ebuild 1750 BLAKE2B 6cd705ca9a833d8d758a22b55871680a6b4fc17a480618cc73fb7759bba05518ef869c40ff722a84a36de9bef8d58e9f449468b8dd8a658836b6203581824ff4 SHA512 1f7653a9fef35b124b67de029e7675b65291bb8cd07d9cc23503d32479461970c1f666d5be371732bb65c2cbcac1ecf9d9771ee0f10687e6f94a6a8824985bce
-EBUILD idea-ultimate-2019.3.1.193.5662.53.ebuild 1750 BLAKE2B 62e3e1a0c342e8465a1af39b6f4180367a5518059b9dee5307eb2050fe2ed07e925e9183e95cada4a8570ddce93e570066857ea128b22ef8add9743db430af71 SHA512 f27985a3075afd4f11111b31d83e01051f66a26d32dca4c382472a6e8d81320dd30d55009b85285df66332d833d9ec8ed47b22020663bde5d53a6f0160ce94e3
-EBUILD idea-ultimate-2019.3.3.193.6494.35.ebuild 1750 BLAKE2B 62e3e1a0c342e8465a1af39b6f4180367a5518059b9dee5307eb2050fe2ed07e925e9183e95cada4a8570ddce93e570066857ea128b22ef8add9743db430af71 SHA512 f27985a3075afd4f11111b31d83e01051f66a26d32dca4c382472a6e8d81320dd30d55009b85285df66332d833d9ec8ed47b22020663bde5d53a6f0160ce94e3
-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
-EBUILD idea-ultimate-2020.2.3.202.6397.94.ebuild 4571 BLAKE2B e5379b8e794739e25b86ba16dbd8be51e409a5a261c3a6b83ea6baa80461fd3ba63d1be30292920980f572a1e921a62e4b530e32d0691cbf76ec07082a08bd91 SHA512 427d94a12ca25b3518aa039f9cf6bd84ffe1b65201e2b2f3a72e9ec3fca24522091f9293853cf3c89500f499a0a59f748d87af5d3d30ba2241fdfb9c67ebc402
-EBUILD idea-ultimate-2020.2.3.202.7660.26.ebuild 4571 BLAKE2B 716008b3ed86ba32395628544118884aa1544bba00d943a5a2a2a109f8d726b9731dbd75571e4e46e4e63602e2a482d327f9f853c74c438e7013a3679c4c2d9b SHA512 4481dd6abbec9a402b8723d70d9bf9c03e976fe332c428829c4c4bdbddc55ef27a9112e6690dcd3dde52457ff8658943c0cef5b4c512561b35ecdaf929e4ebb8
-EBUILD idea-ultimate-2021.1.0.211.6693.111.ebuild 4571 BLAKE2B c9dce20b4b8ae59e2d6338e69bb366d6567da24e42234fb9a2157b90bc50502fc6f2b7431715eae9edc38228a42b89230c3a331e730164d2c0cce9bfa82765ee SHA512 2b164a775e704c4c3214816b7d176d3add91e46bc1a417755dd55e269e1c01fcda65127a41b84d43eaa03504d743a5a2fbe8e1354f4f2986b9aef83260bd7d53
+EBUILD idea-ultimate-2023.2.1.232.9559.62.ebuild 5147 BLAKE2B 41a11662c670f2d9b2f8340bdacae27e4afefebd8947b7eea53df8e30386b743430a3eea02356fee75f13239b830edc6c336c00e9d37a00f71687516f121183f SHA512 24f76b1835e290dddc9ac21ab1f44fc22c1e2b2bce6b63ffcbefa1e828b394e858faf09e70e3fcba03bb98115514f5a7f9567eff9a56d03caba432ff97855727
 MISC ChangeLog 142 BLAKE2B d6bb9a7ff30fcbf78573ea65cf495cdc21393b0e9e546f9b5df7f9b5d358b362e7741509b6625d1dee6ae4f6b7ea33e4a88fc7e6d53b34745c3234c377ba690d SHA512 f66d54089ee757d3bc997f4edba58e6b6b91d47c6fca9f33edf4bfc9e03acabfc7af723c1238c313ccf6cde747c7b91274e67c15abc92da8dd6dd5ac58006b7b
 MISC metadata.xml 786 BLAKE2B 4d178ed573815c59c26f4ca4873250df7da55588762b231f34a69cddbe2844a130fd743fbb796a0c0bf6445405d5034a60eabd59d4eebcc055da86c8a53f6d21 SHA512 13eb523dd3b6fcf90fef0135a27195f8deb7cbd635b74beaa99ab479310fdedb9aca88071c66738cf7b6a22a808ba3e5bbe1a6c6e9b243b0539c8f474dbb7fc6
diff --git a/dev-util/idea-ultimate/idea-ultimate-2019.3.0.193.5233.102.ebuild b/dev-util/idea-ultimate/idea-ultimate-2019.3.0.193.5233.102.ebuild
deleted file mode 100644
index 324a46d..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-2019.3.0.193.5233.102.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-2)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-if [[ "${PV_STRING}x" = "x" ]]
-then
-	S="${WORKDIR}/${MY_PN}-IU-${MY_PV}"
-else
-	S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
-fi
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use custom-jdk; then
-		if [[ -d jre64 ]]; then
-			rm -r jre64 || die
-		fi
-	fi
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;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
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-2019.3.1.193.5662.53.ebuild b/dev-util/idea-ultimate/idea-ultimate-2019.3.1.193.5662.53.ebuild
deleted file mode 100644
index c99dba8..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-2019.3.1.193.5662.53.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-if [[ "${PV_STRING}x" = "x" ]]
-then
-	S="${WORKDIR}/${MY_PN}-IU-${MY_PV}"
-else
-	S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
-fi
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use custom-jdk; then
-		if [[ -d jre64 ]]; then
-			rm -r jre64 || die
-		fi
-	fi
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;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
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-2019.3.3.193.6494.35.ebuild b/dev-util/idea-ultimate/idea-ultimate-2019.3.3.193.6494.35.ebuild
deleted file mode 100644
index c99dba8..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-2019.3.3.193.6494.35.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-if [[ "${PV_STRING}x" = "x" ]]
-then
-	S="${WORKDIR}/${MY_PN}-IU-${MY_PV}"
-else
-	S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
-fi
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use custom-jdk; then
-		if [[ -d jre64 ]]; then
-			rm -r jre64 || die
-		fi
-	fi
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;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
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-2019.3.4.193.6911.18.ebuild b/dev-util/idea-ultimate/idea-ultimate-2019.3.4.193.6911.18.ebuild
deleted file mode 100644
index c99dba8..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-2019.3.4.193.6911.18.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-if [[ "${PV_STRING}x" = "x" ]]
-then
-	S="${WORKDIR}/${MY_PN}-IU-${MY_PV}"
-else
-	S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
-fi
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use custom-jdk; then
-		if [[ -d jre64 ]]; then
-			rm -r jre64 || die
-		fi
-	fi
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;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
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-2020.1.0.201.6668.121.ebuild b/dev-util/idea-ultimate/idea-ultimate-2020.1.0.201.6668.121.ebuild
deleted file mode 100644
index 74f8fd4..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-2020.1.0.201.6668.121.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-2)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	dev-util/lldb"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IU-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
-	if use !jbr11 ; then
-		default_src_unpack
-	else
-		cd "${WORKDIR}"
-		unpack ${MY_PN}IU-${PV_STRING}.tar.gz
-		cd "${S}"
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;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
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-2020.2.3.202.6397.94.ebuild b/dev-util/idea-ultimate/idea-ultimate-2020.2.3.202.6397.94.ebuild
deleted file mode 100644
index 74f8fd4..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-2020.2.3.202.6397.94.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-2)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	dev-util/lldb"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IU-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
-	if use !jbr11 ; then
-		default_src_unpack
-	else
-		cd "${WORKDIR}"
-		unpack ${MY_PN}IU-${PV_STRING}.tar.gz
-		cd "${S}"
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;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
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-2021.1.0.211.6693.111.ebuild b/dev-util/idea-ultimate/idea-ultimate-2021.1.0.211.6693.111.ebuild
deleted file mode 100644
index 9f9b21f..0000000
--- a/dev-util/idea-ultimate/idea-ultimate-2021.1.0.211.6693.111.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 4-6)"
-MY_PV="$(ver_cut 1-2)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	dev-util/lldb"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IU-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
-	if use !jbr11 ; then
-		default_src_unpack
-	else
-		cd "${WORKDIR}"
-		unpack ${MY_PN}IU-${PV_STRING}.tar.gz
-		cd "${S}"
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;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
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-2020.2.3.202.7660.26.ebuild b/dev-util/idea-ultimate/idea-ultimate-2023.2.1.232.9559.62.ebuild
index 4610e85..c49f77e 100644
--- a/dev-util/idea-ultimate/idea-ultimate-2020.2.3.202.7660.26.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2023.2.1.232.9559.62.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit eutils desktop
+EAPI=8
+inherit desktop
 
 SLOT="0"
 PV_STRING="$(ver_cut 4-6)"
@@ -11,6 +11,8 @@ MY_PN="idea"
 # Using the most recent Jetbrains Runtime binaries available at the time of writing
 # As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
 # available separately
+JRE17_BASE="17.0.8"
+JRE17_VER="1000.22"
 JRE11_BASE="11_0_2"
 JRE11_VER="164"
 JRE_BASE="8u202"
@@ -25,10 +27,11 @@ then
 else
 	# upstream stable
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz
 		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
 		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )
+		jbr17? ( amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbr-${JRE17_BASE}-linux-x64-b${JRE17_VER}.tar.gz -> jbr-${JRE17_BASE}-linux-x64-b${JRE17_VER}.tar.gz ) )"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
@@ -40,8 +43,10 @@ LICENSE="IDEA
 #Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
 #either (or neither) bundled
 #Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
+IUSE="-jbr8 -jbr11 -jbr17"
+REQUIRED_USE="jbr8? ( !jbr11 !jbr17 )
+              jbr11? ( !jbr8 !jbr17 )
+	      jbr17? ( !jbr8 !jbr11 )"
 
 DEPEND="!dev-util/${PN}:14
 	!dev-util/${PN}:15"
@@ -56,15 +61,27 @@ S="${WORKDIR}/${MY_PN}-IU-$(ver_cut 4-6)"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
+
+jbr_unpack() {
+	cd "${WORKDIR}"
+	unpack ${MY_PN}IU-${PV_STRING}.tar.gz
+	cd "${S}"
+	mkdir jre64 && cd jre64 || die "Unable to create jre64 directory"
+}
+
 # jbr11 binary doesn't unpack nicely into a single folder
 src_unpack() {
-	if use !jbr11 ; then
-		default_src_unpack
+	if use jbr8 ; then
+		jbr_unpack
+		unpack jbr-${JRE8_BASE}-linux-x64-b${JRE8_VER}.tar.gz
+	elif use jbr11; then
+		jbr_unpack
+		unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+	elif use jbr17; then
+		jbr_unpack
+		unpack jbr-${JRE17_BASE}-linux-x64-b${JRE17_VER}.tar.gz
 	else
-		cd "${WORKDIR}"
-		unpack ${MY_PN}IU-${PV_STRING}.tar.gz
-		cd "${S}"
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+		default_src_unpack
 	fi
 }
 
@@ -75,11 +92,11 @@ src_prepare() {
 		JRE_DIR=jre
 	fi
 
-	if use jbr8; then
+	if use jbr8 || use jbr11 || use jbr17; then
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+	else
 		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
 		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
 	fi
 
 	rm -vf ${PLUGIN_DIR}/libavplugin*
@@ -120,7 +137,7 @@ src_install() {
 	else
 		JRE_DIR=jre
 	fi
-	if use jbr8 || use jbr11 ; then
+	if use jbr8 || use jbr11 || use jbr17 ; then
 	if use jbr8; then
 		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
 	else