update idea-community

4 files changed, 24 insertions, 112 deletions

diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 5e6b4ed..17898fc 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,7 +1,3 @@
-DIST ideaIC-15.0.6.tar.gz 234630621 SHA256 4238391a3e2ffdc7ada51e850702330ea172c6bf0bb859d2f269e3f2d45e6920 SHA512 9c7adb462199b125e8bf174472832c3c56d2f62b230832e1dfe74404a6db65ada597741d3df462281f133e1d7599e65bf8362be8e7f6459665155bfeaf073138 WHIRLPOOL f5c5b18f4b4f5d974d8466506722b50747554beea2cb0d132b68f3fdd3377346ffd986f5cbfef0381024f6da5e1ee0233645a9c48904dbe7fd5cac911d16653a
-DIST ideaIC-2016.3.1.tar.gz 410563028 SHA256 7bceaf6e4a5adef071b5d7240f218b14bfa87208c61a206b13eac0f067ee996f SHA512 27354517b419eba04d8762c701f978ee9c256d80c553a27a254a77e8f54b5920c57d79772b3cb8f848607e46fee5435528b305aa096219387e7d45fecc974700 WHIRLPOOL 546bedd13cdbb48aaaf734435983ca9b04f1914f442b94328941b9b226b926ee1ccc43725589ce74d98f1e6b15de90cdeee9a9b52ef0f81d2e76840a6f915130
-DIST ideaIC-2016.3.tar.gz 410473013 SHA256 c37dfa09707a894853fb65f3977a07cb5256d43c1698e0e8a4ae508b7a50e2ae SHA512 caa71721ce5d9726979cb2c69eafcba953cd8ee22ea0719b3b9bf472b083ff02d5d5fb701fe07dca5cf71fdb7d343f07885d71366c3a4f7cc99c4f3d1defcb6c WHIRLPOOL cd4b777b9917b542010a6bd5888aa4baf783908c819ee15b443c156ae62ef69cdb3bf9bfd91318260ba21cfb8000233eeacb730a55493f3888f0a7de764cacfe
-EBUILD idea-community-15.0.6.143.2370.31.ebuild 1032 SHA256 7d77870884bb4f9597e704d7e235a70c200f52334199451fa5f0fced3c1bfb3b SHA512 192617dd7a82a04bb36270813da3affccf2aa4ee6af57be9d8f6853238e6f5e78c7a922ae3f7a4ab02b250d006d616f1a34c5a94fa35e058e06684375cdb483f WHIRLPOOL 819e86c346c653adc5768932d39858707b9c1723f545ebf5e2a3740a89fca9d1b4951cbe1a2995132be76506c8ced0004b4c0c6916872fe84460fc57fc02ea23
-EBUILD idea-community-2016.3.0.163.7743.44.ebuild 1677 SHA256 2d3a7a2b9fd652360c16b422efd58859fbb7496ff17b94e5e0577c838069ee57 SHA512 56874ded954a8d2ba6f5f802c14aac104f9801a8e00ad537597ece172257145ec600ff965fe0280831706b42ef7257f264b9eb0bcb69f28b3e14abd0fbde063f WHIRLPOOL fa29cc30bca38f8406013baa08faa719c092d92e1dd0212958705152a5d99c4f464142773e2ccd466484bc10d47ef1bf9814c50203196106286ba407e83418ad
-EBUILD idea-community-2016.3.1.163.9166.29.ebuild 1677 SHA256 a6f986af6a54219a1494a6e225c03342f7ebeb622bdaf7293966bb13bd9c4620 SHA512 c92384adb45bd3b037e5e7019e0070333506ff283243fc52b9b1ca539a78be75e51d7db37d0e4a2ae12fa38b44dc29c1ebf128ba87a122e0f3a6d867b0bea030 WHIRLPOOL fa1279f1b1afb952a6db3e028c954a710aff0ee495b550aa73f89c8cb10143e524ed215cc514f7fdc6c02ba92a30520b8fd2973bc95ead391ac16b26f2a509f1
-MISC metadata.xml 246 SHA256 31de89a294c6ff90d5a88948104aa27a86ea35792c466f20db64ab434c682537 SHA512 cd6648a75839e6059cf877aa79a84600be0a63de66f59efd217ad91bac55a7ed4afd5ce88c90a262b4dd044734403fb90a049b8f19a42289ec3ef1d827b66d77 WHIRLPOOL 7f436435371f655a72f4564d4a14b1fdb1be0a130ca0e130804b17104fe9e2c6da44a3ddef859e41ba4eccadff8dfefddbb04dade3e4200fcc557c2fd7af703e
+DIST ideaIC-181.4668.68.tar.gz 542298503 BLAKE2B befab225db8f41dfdacb1a723c3287fed2ff0b9af580ca4817a99ed8bbd6159db92f73d8ce18dbb5181e71ecf852c25371d4bcfc170d73e5698e5060fab2db0c SHA512 944c0f9b1f020551d1a5e23c83ee5880878f8a19a1f983c05cefbc95ccff15a8bf0ecf03039e69e255c0d1b3d947702ee0d97d2d6fed2d60347f55c7d23cd833
+EBUILD idea-community-2018.1.2.181.4668.68.ebuild 1918 BLAKE2B 266f64778689cc39a9f499dd9d291f35a2b0287d6f043af43c88bf388a7ece04a88f1866f8bd5a904465137f2e5e895d22f3aa7391109d68536794c30537fa77 SHA512 0606ba64c61809ada88cc8e78cb60bad5c3e2ff41e913a0b352d53aa4be7c1347af5188dc2fbe97dcc720e403c80ddede1ffba461c6cb5f7397f1048783a6100
+MISC metadata.xml 246 BLAKE2B fc8d6245f577ed3dc445e459694a18f1d950a722dbb72bfd7508f1ba7c52f264fce2c4eda4b52e238a80f6765243a27d396a749dadbdf6a4b6931c25f8404bfa SHA512 cd6648a75839e6059cf877aa79a84600be0a63de66f59efd217ad91bac55a7ed4afd5ce88c90a262b4dd044734403fb90a049b8f19a42289ec3ef1d827b66d77
diff --git a/dev-util/idea-community/idea-community-15.0.6.143.2370.31.ebuild b/dev-util/idea-community/idea-community-15.0.6.143.2370.31.ebuild
deleted file mode 100644
index 67f3d8a..0000000
--- a/dev-util/idea-community/idea-community-15.0.6.143.2370.31.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-RDEPEND=">=virtual/jdk-1.6"
-
-MY_PN="idea"
-MY_PV="$(get_version_component_range 4-6)"
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-
-DESCRIPTION="IntelliJ IDEA is an intelligent Java IDE (Community Edition)"
-HOMEPAGE="http://jetbrains.com/idea/"
-SRC_URI="http://download.jetbrains.com/${MY_PN}/${MY_PN}IC-$(get_version_component_range 1-3).tar.gz"
-LICENSE="Apache-2.0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${MY_PN}-IC-${MY_PV}"
-
-src_install() {
-	local dir="/opt/${P}"
-	local exe="${PN}-${SLOT}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/${MY_PN}.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
-
-	newicon "bin/${MY_PN}.png" "${exe}.png"
-	make_wrapper "${exe}" "/opt/${P}/bin/${MY_PN}.sh"
-	make_desktop_entry ${exe} "IntelliJ IDEA $(get_version_component_range 1-3)	(Community Edition)" "${exe}" "Development;IDE"
-}
diff --git a/dev-util/idea-community/idea-community-2016.3.0.163.7743.44.ebuild b/dev-util/idea-community/idea-community-2016.3.0.163.7743.44.ebuild
deleted file mode 100644
index adf6372..0000000
--- a/dev-util/idea-community/idea-community-2016.3.0.163.7743.44.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${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}-IC-${MY_PV}"
-else
-	S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
-fi
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-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 $(get_version_component_range 1-2)	(Community Edition)" "${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-community/idea-community-2016.3.1.163.9166.29.ebuild b/dev-util/idea-community/idea-community-2018.1.2.181.4668.68.ebuild
index f57fdc7..4a1f4a7 100644
--- a/dev-util/idea-community/idea-community-2016.3.1.163.9166.29.ebuild
+++ b/dev-util/idea-community/idea-community-2018.1.2.181.4668.68.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 inherit eutils versionator
@@ -19,7 +18,7 @@ then
 else
 	# upstream stable
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
@@ -33,15 +32,21 @@ 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}-IC-${MY_PV}"
-else
-	S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
-fi
+S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
+src_prepare() {
+	if ! use arm; then
+		rm bin/fsnotifier-arm || die
+	fi
+	if ! use custom-jdk; then
+		if [[ -d jre ]]; then
+			rm -r jre || die
+		fi
+	fi
+}
+
 src_install() {
 	local dir="/opt/${PN}-${MY_PV}"
 
@@ -49,9 +54,15 @@ src_install() {
 	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 $(get_version_component_range 1-3)	(Community Edition)" "${PN}" "Development;IDE"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
 
 	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
 	mkdir -p "${D}/etc/sysctl.d/" || die