dev-util/idea-ultimate: bump

updated to EAPI 6
src_uri differ with the custom_jdk use flag

Package-Manager: Portage-2.3.13, Repoman-2.3.3

3 files changed, 103 insertions, 4 deletions

diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 601081ae28d1..c81d7a28a3fd 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1 +1,4 @@
-DIST ideaIU-172.3757.52.tar.gz 625753104 BLAKE2B 5b29df72b66451efc79586d3f61b0efe8c4ab87dfb23a133213f4046eedaf01bcf8f2ea7975d407649bf30ec9155225c75c1cca4165c0c68835a1b306d14cabf SHA512 dd730a34f141f345f0af8fb7ee32c1e7a98ec54dcb5df5a644b49e94b7a6d2eb8b6a134ad3d77010e408299b71137b8bd578d3563200762144a747747bf28c0f
+DIST ideaIU-173.3942.27-no-jdk.tar.gz 562044023 BLAKE2B 57da196682db817b175158b9c9913502490c2a692153e5e5b8a4449958c5613469a0060f1260095e9fb70ca54b5adaf59494cd9c0f6b0cb0b9f7c25cc4571335 SHA512 9cc7e687bef5d213f37e2e24aa2464e0d3dc9a40cb683d1d8fd1438efc6ca988134509a96f558ec87960e950336e062d5161ef6cb491f9c1c572ba077dd0a990
+DIST ideaIU-173.3942.27.tar.gz 635548505 BLAKE2B e123d731b3516dee3342310b3204dce2247430e81240e4dc729b23146887fef552001bee9aad7528d46c0717654507f16b505f76baf8407609cb9cca7aa9d773 SHA512 1f3586bc2082feec5b986298334445c7b91318f6d5f3d71fe6bfbb1546a63bb33e2bc978ef5fc4438e13d2a3d1dd5abc96fdd4ea5659f64563afbdd3410df8b4
+DIST ideaIU-173.4127.17-no-jdk.tar.gz 562765679 BLAKE2B 7d287c2723646b4fa541c314099cee96242c058cd67811ec1633737ce33e90678504d0d0b9af1cf1279dbf7281fb87ec9c2723bdb926d554f5a1f0793e13867c SHA512 a3c0afa388705158f431064223f42a7b0daacaa928ef9bc68df1cd5ace542f22c3648620d56478896f663688ea1bf773dc04d8d0ab962d195ace7b057708a272
+DIST ideaIU-173.4127.17.tar.gz 636265697 BLAKE2B b01efe844375b009c03474df362d2a208008a47e14696e816ded1573f591a777e23db393838c8592277d68817b3d7ebd714bb79445cd0cf0653da3d575af5bf2 SHA512 e05dd3986f77d39bb48f12ac6af5ab76d9c67b3502772c2bc16c16f922c90a3e6b8adb24537eb37defea2e3488968a6dff343eeabf4c6c78740895c8ec7c93fd
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
index 088e87ce25bb..6a53389fc5c9 100644
--- a/dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils versionator
 
 SLOT="0"
@@ -14,11 +14,17 @@ 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"
+	SRC_URI="
+	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
+	custom-jdk? ( https://download-cf.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 -> ${MY_PN}IU-${PV_STRING}.tar.gz"
+	SRC_URI="
+	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
+	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz )
+	"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
@@ -37,6 +43,7 @@ S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
 src_prepare() {
+	eapply_user
 	if ! use amd64; then
 		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
 	fi
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
new file mode 100644
index 000000000000..6a53389fc5c9
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="
+	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
+	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
+	"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="
+	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
+	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.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:*"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+src_prepare() {
+	eapply_user
+	if ! use amd64; then
+		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
+	fi
+	if ! use arm; then
+		rm bin/fsnotifier-arm || die
+		rm -r plugins/tfsIntegration/lib/native/linux/arm || die
+	fi
+	if ! use ppc; then
+		rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
+	fi
+	if ! use x86; then
+		rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
+	fi
+	if ! use custom-jdk; then
+		if [[ -d jre ]]; then
+			rm -r jre || die
+		fi
+	fi
+	rm -r plugins/tfsIntegration/lib/native/solaris || die
+	rm -r plugins/tfsIntegration/lib/native/hpux || die
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+	if use custom-jdk; then
+		if [[ -d jre ]]; then
+		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+		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
+}